diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
index 42904cb2..22d393a1 100644
--- a/engine/CMakeLists.txt
+++ b/engine/CMakeLists.txt
@@ -1,2 +1,3 @@
 
+add_subdirectory(server)
 add_subdirectory(shared)
diff --git a/engine/server/CMakeLists.txt b/engine/server/CMakeLists.txt
new file mode 100644
index 00000000..09869e54
--- /dev/null
+++ b/engine/server/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+add_subdirectory(application)
diff --git a/engine/server/application/CMakeLists.txt b/engine/server/application/CMakeLists.txt
new file mode 100644
index 00000000..b71b6369
--- /dev/null
+++ b/engine/server/application/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+add_subdirectory(LoginServer)
diff --git a/engine/server/application/LoginServer/src/CMakeLists.txt b/engine/server/application/LoginServer/src/CMakeLists.txt
index 969b6216..8544a480 100644
--- a/engine/server/application/LoginServer/src/CMakeLists.txt
+++ b/engine/server/application/LoginServer/src/CMakeLists.txt
@@ -1,9 +1,97 @@
 
-
-add_subdirectory(shared)
+set(SHARED_SOURCES
+    shared/CentralServerConnection.cpp
+    shared/CentralServerConnection.h
+    shared/ClientConnection.cpp
+    shared/ClientConnection.h
+    shared/ConfigLoginServer.cpp
+    shared/ConfigLoginServer.h
+    shared/ConsoleCommandParser.cpp
+    shared/ConsoleCommandParser.h
+    shared/ConsoleCommandParserLoginServer.cpp
+    shared/ConsoleCommandParserLoginServer.h
+    shared/ConsoleManager.cpp
+    shared/ConsoleManager.h
+    shared/CSToolConnection.cpp
+    shared/CSToolConnection.h
+    shared/DatabaseConnection.cpp
+    shared/DatabaseConnection.h
+    shared/FirstLoginServer.h
+    shared/LoginServer.cpp
+    shared/LoginServer.h
+    shared/LoginServerRemoteDebugConnection.cpp
+    shared/LoginServerRemoteDebugConnection.h
+    shared/LoginServerRemoteDebugSetup.cpp
+    shared/LoginServerRemoteDebugSetup.h
+    shared/PingConnection.cpp
+    shared/PingConnection.h
+    shared/PurgeManager.cpp
+    shared/PurgeManager.h
+    shared/SessionApiClient.cpp
+    shared/SessionApiClient.h
+    shared/TaskChangeStationId.cpp
+    shared/TaskChangeStationId.h
+    shared/TaskClaimRewards.cpp
+    shared/TaskClaimRewards.h
+    shared/TaskCreateCharacter.cpp
+    shared/TaskCreateCharacter.h
+    shared/TaskDeleteCharacter.cpp
+    shared/TaskDeleteCharacter.h
+    shared/TaskEnableCharacter.cpp
+    shared/TaskEnableCharacter.h
+    shared/TaskGetAccountForPurge.cpp
+    shared/TaskGetAccountForPurge.h
+    shared/TaskGetAvatarList.cpp
+    shared/TaskGetAvatarList.h
+    shared/TaskGetCharactersForDelete.cpp
+    shared/TaskGetCharactersForDelete.h
+    shared/TaskGetClusterList.cpp
+    shared/TaskGetClusterList.h
+    shared/TaskGetValidationData.cpp
+    shared/TaskGetValidationData.h
+    shared/TaskRegisterNewCluster.cpp
+    shared/TaskRegisterNewCluster.h
+    shared/TaskRenameCharacter.cpp
+    shared/TaskRenameCharacter.h
+    shared/TaskRestoreCharacter.cpp
+    shared/TaskRestoreCharacter.h
+    shared/TaskSetPurgeStatus.cpp
+    shared/TaskSetPurgeStatus.h
+    shared/TaskToggleCharacterDisable.cpp
+    shared/TaskToggleCharacterDisable.h
+    shared/TaskToggleCompletedTutorial.cpp
+    shared/TaskToggleCompletedTutorial.h
+    shared/TaskUpdatePurgeAccountList.cpp
+    shared/TaskUpdatePurgeAccountList.h
+    shared/TaskUpgradeAccount.cpp
+    shared/TaskUpgradeAccount.h
+)
 
 if(WIN32)
-	add_subdirectory(win32)
+	set(PLATFORM_SOURCES
+		win32/FirstLoginServer.cpp
+		win32/WinMain.cpp
+	)
+
+	include_directories(${CMAKE_CURRENT_SOURCE_DIR}/win32)
 else()
-	add_subdirectory(linux)
-endif()
\ No newline at end of file
+	set(PLATFORM_SOURCES 
+		linux/main.cpp
+	)
+
+	include_directories(${CMAKE_CURRENT_SOURCE_DIR}/linux)
+endif()
+
+include_directories(
+	${CMAKE_CURRENT_SOURCE_DIR}/shared
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedDebug/include/public
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundation/include/public
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundationTypes/include/public
+	${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMemoryManager/include/public
+	${SWG_EXTERNALS_SOURCE_DIR}/ours/library/archive/include
+)
+
+add_executable(LoginServer
+	${SHARED_SOURCES}
+	${PLATFORM_SOURCES}
+)
diff --git a/engine/server/application/LoginServer/src/linux/CMakeLists.txt b/engine/server/application/LoginServer/src/linux/CMakeLists.txt
deleted file mode 100644
index 977a8464..00000000
--- a/engine/server/application/LoginServer/src/linux/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-add_executable(LoginServer
-	main.cpp
-)
-
-target_link_libraries(LoginServer
-	LoginServershared
-)
\ No newline at end of file
diff --git a/engine/server/application/LoginServer/src/shared/CMakeLists.txt b/engine/server/application/LoginServer/src/shared/CMakeLists.txt
deleted file mode 100644
index 40dfed4f..00000000
--- a/engine/server/application/LoginServer/src/shared/CMakeLists.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-
-add_library(LoginServershared
-    CentralServerConnection.cpp
-    CentralServerConnection.h
-    ClientConnection.cpp
-    ClientConnection.h
-    ConfigLoginServer.cpp
-    ConfigLoginServer.h
-    ConsoleCommandParser.cpp
-    ConsoleCommandParser.h
-    ConsoleCommandParserLoginServer.cpp
-    ConsoleCommandParserLoginServer.h
-    ConsoleManager.cpp
-    ConsoleManager.h
-    CSToolConnection.cpp
-    CSToolConnection.h
-    DatabaseConnection.cpp
-    DatabaseConnection.h
-    FirstLoginServer.h
-    LoginServer.cpp
-    LoginServer.h
-    LoginServerRemoteDebugConnection.cpp
-    LoginServerRemoteDebugConnection.h
-    LoginServerRemoteDebugSetup.cpp
-    LoginServerRemoteDebugSetup.h
-    PingConnection.cpp
-    PingConnection.h
-    PurgeManager.cpp
-    PurgeManager.h
-    SessionApiClient.cpp
-    SessionApiClient.h
-    TaskChangeStationId.cpp
-    TaskChangeStationId.h
-    TaskClaimRewards.cpp
-    TaskClaimRewards.h
-    TaskCreateCharacter.cpp
-    TaskCreateCharacter.h
-    TaskDeleteCharacter.cpp
-    TaskDeleteCharacter.h
-    TaskEnableCharacter.cpp
-    TaskEnableCharacter.h
-    TaskGetAccountForPurge.cpp
-    TaskGetAccountForPurge.h
-    TaskGetAvatarList.cpp
-    TaskGetAvatarList.h
-    TaskGetCharactersForDelete.cpp
-    TaskGetCharactersForDelete.h
-    TaskGetClusterList.cpp
-    TaskGetClusterList.h
-    TaskGetValidationData.cpp
-    TaskGetValidationData.h
-    TaskRegisterNewCluster.cpp
-    TaskRegisterNewCluster.h
-    TaskRenameCharacter.cpp
-    TaskRenameCharacter.h
-    TaskRestoreCharacter.cpp
-    TaskRestoreCharacter.h
-    TaskSetPurgeStatus.cpp
-    TaskSetPurgeStatus.h
-    TaskToggleCharacterDisable.cpp
-    TaskToggleCharacterDisable.h
-    TaskToggleCompletedTutorial.cpp
-    TaskToggleCompletedTutorial.h
-    TaskUpdatePurgeAccountList.cpp
-    TaskUpdatePurgeAccountList.h
-    TaskUpgradeAccount.cpp
-    TaskUpgradeAccount.h
-)
diff --git a/engine/server/application/LoginServer/src/win32/CMakeLists.txt b/engine/server/application/LoginServer/src/win32/CMakeLists.txt
deleted file mode 100644
index 36a35ab6..00000000
--- a/engine/server/application/LoginServer/src/win32/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-add_executable(LoginServer
-	WinMain.cpp
-)
-
-target_link_libraries(LoginServer
-	LoginServershared
-)
\ No newline at end of file