diff --git a/src/server/shared/Config/CMakeLists.txt b/src/server/shared/Configuration/CMakeLists.txt
similarity index 100%
rename from src/server/shared/Config/CMakeLists.txt
rename to src/server/shared/Configuration/CMakeLists.txt
diff --git a/src/server/shared/Config/Config.cpp b/src/server/shared/Configuration/Config.cpp
similarity index 100%
rename from src/server/shared/Config/Config.cpp
rename to src/server/shared/Configuration/Config.cpp
diff --git a/src/server/shared/Config/Config.h b/src/server/shared/Configuration/Config.h
similarity index 100%
rename from src/server/shared/Config/Config.h
rename to src/server/shared/Configuration/Config.h
diff --git a/src/server/shared/Config/ConfigEnv.h b/src/server/shared/Configuration/ConfigEnv.h
similarity index 100%
rename from src/server/shared/Config/ConfigEnv.h
rename to src/server/shared/Configuration/ConfigEnv.h
diff --git a/src/server/shared/Config/ConfigLibrary.vcproj b/src/server/shared/Configuration/ConfigLibrary.vcproj
similarity index 100%
rename from src/server/shared/Config/ConfigLibrary.vcproj
rename to src/server/shared/Configuration/ConfigLibrary.vcproj
diff --git a/src/server/shared/Config/dotconfpp/dotconfpp.cpp b/src/server/shared/Configuration/dotconfpp/dotconfpp.cpp
similarity index 100%
rename from src/server/shared/Config/dotconfpp/dotconfpp.cpp
rename to src/server/shared/Configuration/dotconfpp/dotconfpp.cpp
diff --git a/src/server/shared/Config/dotconfpp/dotconfpp.h b/src/server/shared/Configuration/dotconfpp/dotconfpp.h
similarity index 100%
rename from src/server/shared/Config/dotconfpp/dotconfpp.h
rename to src/server/shared/Configuration/dotconfpp/dotconfpp.h
diff --git a/src/server/shared/Config/dotconfpp/mempool.cpp b/src/server/shared/Configuration/dotconfpp/mempool.cpp
similarity index 100%
rename from src/server/shared/Config/dotconfpp/mempool.cpp
rename to src/server/shared/Configuration/dotconfpp/mempool.cpp
diff --git a/src/server/shared/Config/dotconfpp/mempool.h b/src/server/shared/Configuration/dotconfpp/mempool.h
similarity index 100%
rename from src/server/shared/Config/dotconfpp/mempool.h
rename to src/server/shared/Configuration/dotconfpp/mempool.h
diff --git a/src/server/shared/Auth/AuthCrypt.cpp b/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
similarity index 100%
rename from src/server/shared/Auth/AuthCrypt.cpp
rename to src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
diff --git a/src/server/shared/Auth/AuthCrypt.h b/src/server/shared/Cryptography/Authentication/AuthCrypt.h
similarity index 100%
rename from src/server/shared/Auth/AuthCrypt.h
rename to src/server/shared/Cryptography/Authentication/AuthCrypt.h
diff --git a/src/server/shared/Auth/BigNumber.cpp b/src/server/shared/Cryptography/BigNumber.cpp
similarity index 100%
rename from src/server/shared/Auth/BigNumber.cpp
rename to src/server/shared/Cryptography/BigNumber.cpp
diff --git a/src/server/shared/Auth/BigNumber.h b/src/server/shared/Cryptography/BigNumber.h
similarity index 100%
rename from src/server/shared/Auth/BigNumber.h
rename to src/server/shared/Cryptography/BigNumber.h
diff --git a/src/server/shared/Auth/CMakeLists.txt b/src/server/shared/Cryptography/CMakeLists.txt
similarity index 100%
rename from src/server/shared/Auth/CMakeLists.txt
rename to src/server/shared/Cryptography/CMakeLists.txt
diff --git a/src/server/shared/Auth/Hmac.cpp b/src/server/shared/Cryptography/Hmac.cpp
similarity index 100%
rename from src/server/shared/Auth/Hmac.cpp
rename to src/server/shared/Cryptography/Hmac.cpp
diff --git a/src/server/shared/Auth/Hmac.h b/src/server/shared/Cryptography/Hmac.h
similarity index 100%
rename from src/server/shared/Auth/Hmac.h
rename to src/server/shared/Cryptography/Hmac.h
diff --git a/src/server/shared/Auth/SARC4.cpp b/src/server/shared/Cryptography/SARC4.cpp
similarity index 100%
rename from src/server/shared/Auth/SARC4.cpp
rename to src/server/shared/Cryptography/SARC4.cpp
diff --git a/src/server/shared/Auth/SARC4.h b/src/server/shared/Cryptography/SARC4.h
similarity index 100%
rename from src/server/shared/Auth/SARC4.h
rename to src/server/shared/Cryptography/SARC4.h
diff --git a/src/server/shared/Auth/Sha1.cpp b/src/server/shared/Cryptography/Sha1.cpp
similarity index 100%
rename from src/server/shared/Auth/Sha1.cpp
rename to src/server/shared/Cryptography/Sha1.cpp
diff --git a/src/server/shared/Auth/Sha1.h b/src/server/shared/Cryptography/Sha1.h
similarity index 100%
rename from src/server/shared/Auth/Sha1.h
rename to src/server/shared/Cryptography/Sha1.h
diff --git a/src/server/shared/Auth/md5.c b/src/server/shared/Cryptography/md5.c
similarity index 100%
rename from src/server/shared/Auth/md5.c
rename to src/server/shared/Cryptography/md5.c
diff --git a/src/server/shared/Auth/md5.h b/src/server/shared/Cryptography/md5.h
similarity index 100%
rename from src/server/shared/Auth/md5.h
rename to src/server/shared/Cryptography/md5.h
diff --git a/src/server/shared/Database/DBCFileLoader.cpp b/src/server/shared/DataStores/DBCFileLoader.cpp
similarity index 100%
rename from src/server/shared/Database/DBCFileLoader.cpp
rename to src/server/shared/DataStores/DBCFileLoader.cpp
diff --git a/src/server/shared/Database/DBCFileLoader.h b/src/server/shared/DataStores/DBCFileLoader.h
similarity index 100%
rename from src/server/shared/Database/DBCFileLoader.h
rename to src/server/shared/DataStores/DBCFileLoader.h
diff --git a/src/server/shared/Database/DBCStore.h b/src/server/shared/DataStores/DBCStore.h
similarity index 100%
rename from src/server/shared/Database/DBCStore.h
rename to src/server/shared/DataStores/DBCStore.h
diff --git a/src/server/shared/Errors.h b/src/server/shared/Debugging/Errors.h
similarity index 100%
rename from src/server/shared/Errors.h
rename to src/server/shared/Debugging/Errors.h
diff --git a/src/server/shared/MemoryLeaks.cpp b/src/server/shared/Debugging/MemoryLeaks.cpp
similarity index 100%
rename from src/server/shared/MemoryLeaks.cpp
rename to src/server/shared/Debugging/MemoryLeaks.cpp
diff --git a/src/server/shared/MemoryLeaks.h b/src/server/shared/Debugging/MemoryLeaks.h
similarity index 100%
rename from src/server/shared/MemoryLeaks.h
rename to src/server/shared/Debugging/MemoryLeaks.h
diff --git a/src/server/shared/WheatyExceptionReport.cpp b/src/server/shared/Debugging/WheatyExceptionReport.cpp
similarity index 100%
rename from src/server/shared/WheatyExceptionReport.cpp
rename to src/server/shared/Debugging/WheatyExceptionReport.cpp
diff --git a/src/server/shared/WheatyExceptionReport.h b/src/server/shared/Debugging/WheatyExceptionReport.h
similarity index 100%
rename from src/server/shared/WheatyExceptionReport.h
rename to src/server/shared/Debugging/WheatyExceptionReport.h
diff --git a/src/server/shared/Log.cpp b/src/server/shared/Logging/Log.cpp
similarity index 100%
rename from src/server/shared/Log.cpp
rename to src/server/shared/Logging/Log.cpp
diff --git a/src/server/shared/Log.h b/src/server/shared/Logging/Log.h
similarity index 100%
rename from src/server/shared/Log.h
rename to src/server/shared/Logging/Log.h
diff --git a/src/server/shared/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h
similarity index 100%
rename from src/server/shared/ByteBuffer.h
rename to src/server/shared/Packets/ByteBuffer.h
diff --git a/src/server/shared/WorldPacket.h b/src/server/shared/Packets/WorldPacket.h
similarity index 100%
rename from src/server/shared/WorldPacket.h
rename to src/server/shared/Packets/WorldPacket.h
diff --git a/src/server/shared/DelayExecutor.cpp b/src/server/shared/Threading/DelayExecutor.cpp
similarity index 100%
rename from src/server/shared/DelayExecutor.cpp
rename to src/server/shared/Threading/DelayExecutor.cpp
diff --git a/src/server/shared/DelayExecutor.h b/src/server/shared/Threading/DelayExecutor.h
similarity index 100%
rename from src/server/shared/DelayExecutor.h
rename to src/server/shared/Threading/DelayExecutor.h
diff --git a/src/server/shared/LockedQueue.h b/src/server/shared/Threading/LockedQueue.h
similarity index 100%
rename from src/server/shared/LockedQueue.h
rename to src/server/shared/Threading/LockedQueue.h
diff --git a/src/server/shared/Threading.cpp b/src/server/shared/Threading/Threading.cpp
similarity index 100%
rename from src/server/shared/Threading.cpp
rename to src/server/shared/Threading/Threading.cpp
diff --git a/src/server/shared/Threading.h b/src/server/shared/Threading/Threading.h
similarity index 100%
rename from src/server/shared/Threading.h
rename to src/server/shared/Threading/Threading.h
diff --git a/src/server/shared/ProgressBar.cpp b/src/server/shared/Utilities/ProgressBar.cpp
similarity index 100%
rename from src/server/shared/ProgressBar.cpp
rename to src/server/shared/Utilities/ProgressBar.cpp
diff --git a/src/server/shared/ProgressBar.h b/src/server/shared/Utilities/ProgressBar.h
similarity index 100%
rename from src/server/shared/ProgressBar.h
rename to src/server/shared/Utilities/ProgressBar.h
diff --git a/src/server/shared/ServiceWin32.cpp b/src/server/shared/Utilities/ServiceWin32.cpp
similarity index 100%
rename from src/server/shared/ServiceWin32.cpp
rename to src/server/shared/Utilities/ServiceWin32.cpp
diff --git a/src/server/shared/ServiceWin32.h b/src/server/shared/Utilities/ServiceWin32.h
similarity index 100%
rename from src/server/shared/ServiceWin32.h
rename to src/server/shared/Utilities/ServiceWin32.h
diff --git a/src/server/shared/SignalHandler.h b/src/server/shared/Utilities/SignalHandler.h
similarity index 100%
rename from src/server/shared/SignalHandler.h
rename to src/server/shared/Utilities/SignalHandler.h
diff --git a/src/server/shared/Timer.h b/src/server/shared/Utilities/Timer.h
similarity index 100%
rename from src/server/shared/Timer.h
rename to src/server/shared/Utilities/Timer.h
diff --git a/src/server/shared/Util.cpp b/src/server/shared/Utilities/Util.cpp
similarity index 100%
rename from src/server/shared/Util.cpp
rename to src/server/shared/Utilities/Util.cpp
diff --git a/src/server/shared/Util.h b/src/server/shared/Utilities/Util.h
similarity index 100%
rename from src/server/shared/Util.h
rename to src/server/shared/Utilities/Util.h