diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8cedc60..496bcc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,16 @@
 cmake_minimum_required(VERSION 3.20)
 project(Structive LANGUAGES CXX)
+if (CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
+    set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+    set(CMAKE_FOLDER "Structive")
+endif ()
 include(CTest)
-add_subdirectory(core)
-add_subdirectory(extensions)
+get_property(_targets DIRECTORY PROPERTY BUILDSYSTEM_TARGETS)
+foreach (_target IN LISTS _targets)
+    get_target_property(_folder "${_target}" FOLDER)
+    if (_folder STREQUAL "CTestDashboardTargets")
+        set_property(TARGET "${_target}" PROPERTY FOLDER "Structive/CTest")
+    endif ()
+endforeach ()
+include(${CMAKE_CURRENT_LIST_DIR}/core/main.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/extensions/main.cmake)
\ No newline at end of file
diff --git a/core/CMakeLists.txt b/core/main.cmake
similarity index 100%
rename from core/CMakeLists.txt
rename to core/main.cmake
diff --git a/extensions/CMakeLists.txt b/extensions/main.cmake
similarity index 100%
rename from extensions/CMakeLists.txt
rename to extensions/main.cmake