diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bd174ba8735..b0531d9ab6d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,2 @@
-add_subdirectory(framework)
-add_subdirectory(game)
-if (DO_SCRIPTS)
-   add_subdirectory(scripts)
-endif (DO_SCRIPTS)
-add_subdirectory(shared)
-add_subdirectory(trinitycore)
-add_subdirectory(trinityrealm)
+add_subdirectory(server)
+
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
new file mode 100644
index 00000000000..39a96cf1f3c
--- /dev/null
+++ b/src/server/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_subdirectory(framework)
+add_subdirectory(game)
+if (DO_SCRIPTS)
+   add_subdirectory(scripts)
+endif (DO_SCRIPTS)
+add_subdirectory(shared)
+add_subdirectory(worldserver)
+add_subdirectory(authserver)