diff --git a/CMakeLists.txt b/CMakeLists.txt
index bef5ef6af3..d240a156b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,24 +68,24 @@ endif()
 # command line build options
 # use it that way cmake .. -DBUILD_APPS=ON -DBUILD_SAMPLES=ON
 # --------------------------------------------------------
-option(HAS_HDF5                                "Platform supports HDF5 library"                                   OFF)
-option(HAS_QT5                                 "Platform supports Qt 5 library"                                   OFF)
+option(HAS_HDF5                                "Platform supports HDF5 library"                                    ON)
+option(HAS_QT5                                 "Platform supports Qt 5 library"                                    ON)
 option(HAS_CURL                                "Build with CURL (i.e. upload support in the recorder app)"         ON)
 option(HAS_CAPNPROTO                           "Platform supports Cap'n Proto library"                            OFF)
 option(HAS_FLATBUFFERS                         "Platform supports flatbuffers library"                            OFF)
-option(HAS_FTXUI                               "Platform supports FTXUI library. Requires C++17 and up."          OFF)
+option(HAS_FTXUI                               "Platform supports FTXUI library. Requires C++17 and up."           ON)
 
 option(BUILD_DOCS                              "Build the eCAL documentation"                                     OFF)
-option(BUILD_APPS                              "Build the eCAL applications"                                      OFF)
-option(BUILD_SAMPLES                           "Build the eCAL samples"                                           OFF)
-option(BUILD_TIME                              "Build the eCAL time interfaces"                                   OFF)
+option(BUILD_APPS                              "Build the eCAL applications"                                       ON)
+option(BUILD_SAMPLES                           "Build the eCAL samples"                                            ON)
+option(BUILD_TIME                              "Build the eCAL time interfaces"                                    ON)
 option(BUILD_PY_BINDING                        "Build eCAL python binding"                                        OFF)
 option(BUILD_STANDALONE_PY_WHEEL               "Build eCAL python binding as standalone wheel"                    OFF)
 option(BUILD_CSHARP_BINDING                    "Build eCAL C# binding"                                            OFF)
 option(BUILD_ECAL_TESTS                        "Build the eCAL google tests"                                      OFF)
 
 option(ECAL_INCLUDE_PY_SAMPLES                 "Include python language sample projects into CMake"               OFF)
-option(ECAL_INSTALL_SAMPLE_SOURCES             "Install the sources of eCAL samples"                              OFF)
+option(ECAL_INSTALL_SAMPLE_SOURCES             "Install the sources of eCAL samples"                               ON)
 
 option(ECAL_JOIN_MULTICAST_TWICE               "Specific Multicast Network Bug Workaround"                        OFF)
 option(ECAL_NPCAP_SUPPORT                      "Enable the eCAL Npcap Receiver (i.e. the Win10 performance fix)"  OFF)
@@ -112,7 +112,7 @@ if(WIN32)
   option(ECAL_THIRDPARTY_BUILD_PROTOBUF        "Build protobuf with eCAL"                                          ON)
   option(ECAL_THIRDPARTY_BUILD_YAML-CPP        "Build yaml-cpp with eCAL"                                          ON)
   option(ECAL_THIRDPARTY_BUILD_CURL            "Build CURL with eCAL"                                              ON)
-  option(ECAL_THIRDPARTY_BUILD_HDF5            "Build HDF5 with eCAL"                                             OFF)
+  option(ECAL_THIRDPARTY_BUILD_HDF5            "Build HDF5 with eCAL"                                              ON)
   cmake_dependent_option(ECAL_THIRDPARTY_BUILD_QWT "Build qwt::qwt with eCAL"                                      ON  "HAS_QT5" OFF)
 else()
   option(ECAL_THIRDPARTY_BUILD_PROTOBUF        "Build protobuf with eCAL"                                         OFF)
diff --git a/ecal/core/CMakeLists.txt b/ecal/core/CMakeLists.txt
index 0273432c21..45fcb0563c 100644
--- a/ecal/core/CMakeLists.txt
+++ b/ecal/core/CMakeLists.txt
@@ -278,6 +278,16 @@ set(ecal_service_src
     src/service/ecal_service_singleton_manager.h
 )
 
+######################################
+# time
+######################################
+set(ecal_time_src
+    src/time/ecal_time.cpp
+    src/time/ecal_timegate.cpp
+    src/time/ecal_timegate.h
+    src/time/ecal_timer.cpp
+)
+
 ######################################
 # util
 ######################################
@@ -305,9 +315,6 @@ set(ecal_cmn_src
     src/ecal_global_accessors.cpp
     src/ecal_globals.cpp
     src/ecal_process.cpp
-    src/ecal_time.cpp
-    src/ecal_timegate.cpp
-    src/ecal_timer.cpp
     src/ecal_util.cpp
     src/ecalc.cpp
     src/ecal_def.h
@@ -316,7 +323,6 @@ set(ecal_cmn_src
     src/ecal_global_accessors.h
     src/ecal_globals.h
     src/ecal_sample_to_topicinfo.h
-    src/ecal_timegate.h
     src/topic2mcast.h
 )
 if (WIN32)
@@ -454,6 +460,7 @@ ecal_add_ecal_shared_library(${PROJECT_NAME}
     ${ecal_readwrite_udp_src}
     ${ecal_registration_src}   
     ${ecal_service_src}
+    ${ecal_time_src}
     ${ecal_util_src}
     ${ecal_cmn_src}
     ${ecal_header_public}
@@ -571,6 +578,7 @@ if(NOT ${CMAKE_VERSION} VERSION_LESS "3.8.0")
     ${ecal_readwrite_udp_src} 
     ${ecal_registration_src}   
     ${ecal_service_src}
+    ${ecal_time_src}
     ${ecal_util_src}
     ${ecal_cmn_src}
     ${ecal_c_src}
diff --git a/ecal/core/src/ecal_globals.h b/ecal/core/src/ecal_globals.h
index 4801a30965..21a5ecf107 100644
--- a/ecal/core/src/ecal_globals.h
+++ b/ecal/core/src/ecal_globals.h
@@ -27,7 +27,7 @@
 #include "registration/ecal_registration_provider.h"
 #include "registration/ecal_registration_receiver.h"
 #include "ecal_descgate.h"
-#include "ecal_timegate.h"
+#include "time/ecal_timegate.h"
 #include "logging/ecal_log_impl.h"
 #include "monitoring/ecal_monitoring_def.h"
 #include "pubsub/ecal_pubgate.h"
diff --git a/ecal/core/src/ecal_time.cpp b/ecal/core/src/time/ecal_time.cpp
similarity index 100%
rename from ecal/core/src/ecal_time.cpp
rename to ecal/core/src/time/ecal_time.cpp
diff --git a/ecal/core/src/ecal_timegate.cpp b/ecal/core/src/time/ecal_timegate.cpp
similarity index 100%
rename from ecal/core/src/ecal_timegate.cpp
rename to ecal/core/src/time/ecal_timegate.cpp
diff --git a/ecal/core/src/ecal_timegate.h b/ecal/core/src/time/ecal_timegate.h
similarity index 100%
rename from ecal/core/src/ecal_timegate.h
rename to ecal/core/src/time/ecal_timegate.h
diff --git a/ecal/core/src/ecal_timer.cpp b/ecal/core/src/time/ecal_timer.cpp
similarity index 100%
rename from ecal/core/src/ecal_timer.cpp
rename to ecal/core/src/time/ecal_timer.cpp