diff --git a/mvvm/CMakeLists.txt b/mvvm/CMakeLists.txt
index a40946aed1bd7743b38c75ab816b9ac79939e78b..bfdc830db7fb73e260c07c20ac728e6970e55cac 100644
--- a/mvvm/CMakeLists.txt
+++ b/mvvm/CMakeLists.txt
@@ -11,7 +11,13 @@ option(MVVM_BUILD_EXAMPLES "Build user examples" ON)
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake/modules)
 include(configuration)
 
-add_subdirectory(source)
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+
+add_subdirectory(source/libmvvm_model)
+add_subdirectory(source/libmvvm_viewmodel)
+add_subdirectory(source/libmvvm_view)
+
 add_subdirectory(tests)
 
 include(installation)
diff --git a/mvvm/source/CMakeLists.txt b/mvvm/source/CMakeLists.txt
deleted file mode 100644
index 6c3c77195b1a3a207245871edd52b760ac8443e0..0000000000000000000000000000000000000000
--- a/mvvm/source/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# -----------------------------------------------------------------------------
-# Entry point for all project libraries
-# -----------------------------------------------------------------------------
-
-set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
-
-add_subdirectory(libmvvm_model)
-add_subdirectory(libmvvm_viewmodel)
-add_subdirectory(libmvvm_view)