diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52eb8bc3c5..60ecbaf8cd 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,7 +87,9 @@ add_library(wildmeshing_toolkit)
 add_library(wmtk::toolkit ALIAS wildmeshing_toolkit)
 add_subdirectory(src)
 
-
+# Group source files for IDEs
+file(GLOB_RECURSE WMTK_FILES_FOR_SOURCE_GROUP "src/wmtk/*.cpp" "src/wmtk/*.h" "src/wmtk/*.hpp")
+source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}/src/wmtk" PREFIX "wmtk" FILES ${WMTK_FILES_FOR_SOURCE_GROUP})
 
 
 # Compile definitions
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 4c6a614906..ff133bf698 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -11,5 +11,5 @@ target_include_directories(wildmeshing_components PUBLIC ${CMAKE_CURRENT_SOURCE_
 add_subdirectory(wmtk_components)
 
 # Group source files for IDEs
-file(GLOB_RECURSE COMPONENTS_FILES_FOR_SOURCE_GROUP "cpp" "*/h" "*/hpp")
+file(GLOB_RECURSE COMPONENTS_FILES_FOR_SOURCE_GROUP "*.cpp" "*.h" "*.hpp")
 source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}/wmtk_components" PREFIX "components" FILES ${COMPONENTS_FILES_FOR_SOURCE_GROUP})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 49a3451748..5e0efb9d3c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,3 @@
 # Include headers
 target_include_directories(wildmeshing_toolkit PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 add_subdirectory(wmtk)
-
-# Group source files for IDEs
-file(GLOB_RECURSE WMTK_FILES_FOR_SOURCE_GROUP "*.cpp" "*.h" "*.hpp")
-source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}/wmtk" PREFIX "wmtk" FILES ${WMTK_FILES_FOR_SOURCE_GROUP})