diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8470bbbf4..03e375fea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,8 @@ project(EQEmu
 	LANGUAGES CXX 
 )
 
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
 #explicitly set CMP0167 for Find Boost
 if(POLICY CMP0167)
   cmake_policy(SET CMP0167 NEW)
diff --git a/client_files/export/CMakeLists.txt b/client_files/export/CMakeLists.txt
index c35a22efe..3ed494936 100644
--- a/client_files/export/CMakeLists.txt
+++ b/client_files/export/CMakeLists.txt
@@ -14,3 +14,4 @@ install(TARGETS export_client_files RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/
 target_link_libraries(export_client_files common)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+set_property(TARGET export_client_files PROPERTY FOLDER executables/tools)
diff --git a/client_files/import/CMakeLists.txt b/client_files/import/CMakeLists.txt
index af7f4da0c..491d0cde9 100644
--- a/client_files/import/CMakeLists.txt
+++ b/client_files/import/CMakeLists.txt
@@ -14,3 +14,4 @@ install(TARGETS import_client_files RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/
 target_link_libraries(import_client_files common)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+set_property(TARGET import_client_files PROPERTY FOLDER executables/tools)
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 8c6562614..23fbcff69 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -819,4 +819,5 @@ if(EQEMU_BUILD_PCH)
     set_source_files_properties("patches/sod.cpp" "patches/sof.cpp" "patches/rof.cpp" "patches/rof2.cpp" "patches/uf.cpp" PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
 endif()
 
-set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
\ No newline at end of file
+set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+set_property(TARGET common PROPERTY FOLDER libraries)
diff --git a/eqlaunch/CMakeLists.txt b/eqlaunch/CMakeLists.txt
index beafeb7f0..048335c73 100644
--- a/eqlaunch/CMakeLists.txt
+++ b/eqlaunch/CMakeLists.txt
@@ -18,3 +18,4 @@ install(TARGETS eqlaunch RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 target_link_libraries(eqlaunch common)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+set_property(TARGET eqlaunch PROPERTY FOLDER executables/tools)
diff --git a/libs/luabind/CMakeLists.txt b/libs/luabind/CMakeLists.txt
index ef93f9a03..e871cdf14 100644
--- a/libs/luabind/CMakeLists.txt
+++ b/libs/luabind/CMakeLists.txt
@@ -33,3 +33,4 @@ if(MSVC)
 endif()
 
 set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+set_property(TARGET luabind PROPERTY FOLDER contrib)
diff --git a/loginserver/CMakeLists.txt b/loginserver/CMakeLists.txt
index ca89bd357..013c64d5f 100644
--- a/loginserver/CMakeLists.txt
+++ b/loginserver/CMakeLists.txt
@@ -35,3 +35,4 @@ install(TARGETS loginserver RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 target_link_libraries(loginserver common)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+set_property(TARGET loginserver PROPERTY FOLDER executables/servers)
diff --git a/queryserv/CMakeLists.txt b/queryserv/CMakeLists.txt
index 39dc0b048..968a3f6f0 100644
--- a/queryserv/CMakeLists.txt
+++ b/queryserv/CMakeLists.txt
@@ -28,3 +28,4 @@ add_definitions(-DQSERV)
 target_link_libraries(queryserv common)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+set_property(TARGET queryserv PROPERTY FOLDER executables/servers)
diff --git a/shared_memory/CMakeLists.txt b/shared_memory/CMakeLists.txt
index 099d27b5b..4ef414693 100644
--- a/shared_memory/CMakeLists.txt
+++ b/shared_memory/CMakeLists.txt
@@ -18,3 +18,4 @@ install(TARGETS shared_memory RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 target_link_libraries(shared_memory common)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+set_property(TARGET shared_memory PROPERTY FOLDER executables/servers)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7fa45d2fc..b81c6e0b2 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -46,3 +46,4 @@ if(UNIX)
 endif()
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+set_property(TARGET tests PROPERTY FOLDER executables/tests)
diff --git a/ucs/CMakeLists.txt b/ucs/CMakeLists.txt
index 188b79a93..73a78abb8 100644
--- a/ucs/CMakeLists.txt
+++ b/ucs/CMakeLists.txt
@@ -26,3 +26,4 @@ add_definitions(-DUCS)
 target_link_libraries(ucs common)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+set_property(TARGET ucs PROPERTY FOLDER executables/servers)
diff --git a/world/CMakeLists.txt b/world/CMakeLists.txt
index 9a3931ebb..1e44afc59 100644
--- a/world/CMakeLists.txt
+++ b/world/CMakeLists.txt
@@ -103,4 +103,5 @@ endif()
 
 install(TARGETS world RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
\ No newline at end of file
+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+set_property(TARGET world PROPERTY FOLDER executables/servers)
diff --git a/zone/CMakeLists.txt b/zone/CMakeLists.txt
index acd2142b9..9d8b90cab 100644
--- a/zone/CMakeLists.txt
+++ b/zone/CMakeLists.txt
@@ -266,6 +266,8 @@ set(lua_sources
 )
 
 add_library(lua_zone STATIC ${lua_sources})
+
+set_property(TARGET lua_zone PROPERTY FOLDER libraries)
 set_target_properties(lua_zone PROPERTIES UNITY_BUILD ON UNITY_BUILD_BATCH_SIZE 8)
 
 set(perl_sources
@@ -296,6 +298,7 @@ set(perl_sources
 )
 
 add_library(perl_zone STATIC ${perl_sources})
+set_property(TARGET perl_zone PROPERTY FOLDER libraries)
 set_target_properties(perl_zone PROPERTIES UNITY_BUILD ON UNITY_BUILD_BATCH_SIZE 8)
 
 set(gm_command_sources
@@ -662,6 +665,7 @@ source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "Source Files" FILES ${gm
 add_library(gm_commands_zone STATIC ${gm_command_sources})
 target_link_libraries(gm_commands_zone PRIVATE common)
 set_target_properties(gm_commands_zone PROPERTIES UNITY_BUILD ON UNITY_BUILD_BATCH_SIZE 32)
+set_property(TARGET gm_commands_zone PROPERTY FOLDER libraries)
 
 add_executable(zone ${zone_sources} ${zone_headers})
 
@@ -701,4 +705,5 @@ if(EQEMU_BUILD_PERL)
     target_link_libraries(zone PRIVATE perl_zone)
 endif()
 
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
\ No newline at end of file
+SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+set_property(TARGET zone PROPERTY FOLDER executables/servers)