3 files changed, 27 insertions, 29 deletions
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 5e0a2f40adf..a9ecb23e72b 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -13,22 +13,22 @@ add_subdirectory(Utilities)
 ########### next target ###############
 
 SET(shared_STAT_SRCS
-   ByteBuffer.h
+   Debugging/Errors.h
+   Logging/Log.cpp
+   Logging/Log.h
+   Packets/ByteBuffer.h
+   Packets/WorldPacket.h
+   Threading/DelayExecutor.cpp
+   Threading/DelayExecutor.h
+   Threading/Threading.cpp
+   Utilities/ProgressBar.cpp
+   Utilities/ProgressBar.h
+   Utilities/SignalHandler.h
+   Utilities/Timer.h
+   Utilities/Util.cpp
+   Utilities/Util.h
    Common.cpp
    Common.h
-   DelayExecutor.cpp
-   DelayExecutor.h
-   Errors.h
-   Log.cpp
-   Log.h
-   ProgressBar.cpp
-   ProgressBar.h
-   SignalHandler.h
-   Threading.cpp
-   Timer.h
-   Util.cpp
-   Util.h
-   WorldPacket.h
    SystemConfig.h
 )
 
diff --git a/src/server/shared/Cryptography/CMakeLists.txt b/src/server/shared/Cryptography/CMakeLists.txt
index 6e5d10d40e5..cdd9ece3fa0 100644
--- a/src/server/shared/Cryptography/CMakeLists.txt
+++ b/src/server/shared/Cryptography/CMakeLists.txt
@@ -2,25 +2,24 @@
 ########### next target ###############
 
 SET(trinityauth_STAT_SRCS
-   AuthCrypt.cpp
-   AuthCrypt.h
+   Authentication/AuthCrypt.cpp
+   Authentication/AuthCrypt.h
    BigNumber.cpp
    BigNumber.h
-   Hmac.cpp
-   Hmac.h
-   Sha1.cpp
-   Sha1.h
-   md5.c
-   md5.h
-   SARC4.cpp
-   SARC4.h
+   HMACSHA1.cpp
+   HMACSHA1.h
+   SHA1.cpp
+   SHA1.h
+   MD5.c
+   MD5.h
+   ARC4.cpp
+   ARC4.h
 )
 
 include_directories(
   ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/src/server/shared
-  ${CMAKE_SOURCE_DIR}/src/server/framework
   ${MYSQL_INCLUDE_DIR}
 )
 
diff --git a/src/server/shared/Database/CMakeLists.txt b/src/server/shared/Database/CMakeLists.txt
index e30c8ae3ca2..cfe36b8c7d3 100644
--- a/src/server/shared/Database/CMakeLists.txt
+++ b/src/server/shared/Database/CMakeLists.txt
@@ -1,7 +1,7 @@
 SET(trinitydatabase_STAT_SRCS
-    DBCFileLoader.cpp
-    DBCFileLoader.h
-    DBCStore.h
+    ../DataStores/DBCFileLoader.cpp
+    ../DataStores/DBCFileLoader.h
+    ../DataStores/DBCStore.h
     Database.cpp
     Database.h
     DatabaseEnv.h   
@@ -23,7 +23,6 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Database
-  ${CMAKE_SOURCE_DIR}/src/server/framework
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
   ${MYSQL_INCLUDE_DIR}
 )