diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02e43e14..c4556641 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,7 @@ momo_add_subdirectory_and_get_targets("src" OWN_TARGETS)
 
 ##########################################
 
-momo_targets_set_folder("External Dependencies" ${EXTERNAL_TARGETS})
+momo_targets_set_folder("dependencies" ${EXTERNAL_TARGETS})
 
 momo_targets_exclude_from_all(${EXTERNAL_TARGETS})
 momo_targets_disable_warnings(${EXTERNAL_TARGETS})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 68319445..72d8caa8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,13 +4,17 @@ add_subdirectory(gdb-stub)
 add_subdirectory(unicorn-emulator)
 add_subdirectory(windows-emulator)
 add_subdirectory(windows-gdb-stub)
+
 if (NOT MOMO_BUILD_AS_LIBRARY)
     add_subdirectory(analyzer)
     add_subdirectory(fuzzing-engine)
     add_subdirectory(fuzzer)
     add_subdirectory(windows-emulator-test)
     if(WIN32)
-        add_subdirectory(tools)
-        add_subdirectory(samples)
+        momo_add_subdirectory_and_get_targets("tools" TOOL_TARGETS)
+        momo_targets_set_folder("tools" ${TOOL_TARGETS})
+
+        momo_add_subdirectory_and_get_targets("samples" SAMPLE_TARGETS)
+        momo_targets_set_folder("samples" ${SAMPLE_TARGETS})
     endif()
 endif()
diff --git a/src/windows-emulator-test/CMakeLists.txt b/src/windows-emulator-test/CMakeLists.txt
index 0bffacc1..5f755e01 100644
--- a/src/windows-emulator-test/CMakeLists.txt
+++ b/src/windows-emulator-test/CMakeLists.txt
@@ -21,4 +21,6 @@ endif()
 
 add_test(NAME windows-emulator-test
          COMMAND windows-emulator-test
-         WORKING_DIRECTORY "$<TARGET_FILE_DIR:windows-emulator-test>")
\ No newline at end of file
+         WORKING_DIRECTORY "$<TARGET_FILE_DIR:windows-emulator-test>")
+
+momo_targets_set_folder("tests" windows-emulator-test)
\ No newline at end of file