diff --git a/src/core/AutoPtr.h b/src/common/AutoPtr.h similarity index 100% rename from src/core/AutoPtr.h rename to src/common/AutoPtr.h diff --git a/src/core/CMakeLists.txt b/src/common/CMakeLists.txt similarity index 100% rename from src/core/CMakeLists.txt rename to src/common/CMakeLists.txt diff --git a/src/libraries/collision/BoundingIntervalHierarchy.cpp b/src/common/Collision/BoundingIntervalHierarchy.cpp similarity index 100% rename from src/libraries/collision/BoundingIntervalHierarchy.cpp rename to src/common/Collision/BoundingIntervalHierarchy.cpp diff --git a/src/libraries/collision/BoundingIntervalHierarchy.h b/src/common/Collision/BoundingIntervalHierarchy.h similarity index 100% rename from src/libraries/collision/BoundingIntervalHierarchy.h rename to src/common/Collision/BoundingIntervalHierarchy.h diff --git a/src/libraries/collision/BoundingIntervalHierarchyWrapper.h b/src/common/Collision/BoundingIntervalHierarchyWrapper.h similarity index 100% rename from src/libraries/collision/BoundingIntervalHierarchyWrapper.h rename to src/common/Collision/BoundingIntervalHierarchyWrapper.h diff --git a/src/libraries/collision/CMakeLists.txt b/src/common/Collision/CMakeLists.txt similarity index 100% rename from src/libraries/collision/CMakeLists.txt rename to src/common/Collision/CMakeLists.txt diff --git a/src/libraries/collision/DynamicTree.cpp b/src/common/Collision/DynamicTree.cpp similarity index 100% rename from src/libraries/collision/DynamicTree.cpp rename to src/common/Collision/DynamicTree.cpp diff --git a/src/libraries/collision/DynamicTree.h b/src/common/Collision/DynamicTree.h similarity index 100% rename from src/libraries/collision/DynamicTree.h rename to src/common/Collision/DynamicTree.h diff --git a/src/libraries/collision/Management/IMMAPManager.h b/src/common/Collision/Management/IMMAPManager.h similarity index 100% rename from src/libraries/collision/Management/IMMAPManager.h rename to src/common/Collision/Management/IMMAPManager.h diff --git a/src/libraries/collision/Management/IVMapManager.h b/src/common/Collision/Management/IVMapManager.h similarity index 100% rename from src/libraries/collision/Management/IVMapManager.h rename to src/common/Collision/Management/IVMapManager.h diff --git a/src/libraries/collision/Management/MMapFactory.cpp b/src/common/Collision/Management/MMapFactory.cpp similarity index 100% rename from src/libraries/collision/Management/MMapFactory.cpp rename to src/common/Collision/Management/MMapFactory.cpp diff --git a/src/libraries/collision/Management/MMapFactory.h b/src/common/Collision/Management/MMapFactory.h similarity index 100% rename from src/libraries/collision/Management/MMapFactory.h rename to src/common/Collision/Management/MMapFactory.h diff --git a/src/libraries/collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp similarity index 100% rename from src/libraries/collision/Management/MMapManager.cpp rename to src/common/Collision/Management/MMapManager.cpp diff --git a/src/libraries/collision/Management/MMapManager.h b/src/common/Collision/Management/MMapManager.h similarity index 100% rename from src/libraries/collision/Management/MMapManager.h rename to src/common/Collision/Management/MMapManager.h diff --git a/src/libraries/collision/Management/VMapFactory.cpp b/src/common/Collision/Management/VMapFactory.cpp similarity index 100% rename from src/libraries/collision/Management/VMapFactory.cpp rename to src/common/Collision/Management/VMapFactory.cpp diff --git a/src/libraries/collision/Management/VMapFactory.h b/src/common/Collision/Management/VMapFactory.h similarity index 100% rename from src/libraries/collision/Management/VMapFactory.h rename to src/common/Collision/Management/VMapFactory.h diff --git a/src/libraries/collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp similarity index 100% rename from src/libraries/collision/Management/VMapManager2.cpp rename to src/common/Collision/Management/VMapManager2.cpp diff --git a/src/libraries/collision/Management/VMapManager2.h b/src/common/Collision/Management/VMapManager2.h similarity index 100% rename from src/libraries/collision/Management/VMapManager2.h rename to src/common/Collision/Management/VMapManager2.h diff --git a/src/libraries/collision/Maps/MapTree.cpp b/src/common/Collision/Maps/MapTree.cpp similarity index 100% rename from src/libraries/collision/Maps/MapTree.cpp rename to src/common/Collision/Maps/MapTree.cpp diff --git a/src/libraries/collision/Maps/MapTree.h b/src/common/Collision/Maps/MapTree.h similarity index 100% rename from src/libraries/collision/Maps/MapTree.h rename to src/common/Collision/Maps/MapTree.h diff --git a/src/libraries/collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp similarity index 100% rename from src/libraries/collision/Maps/TileAssembler.cpp rename to src/common/Collision/Maps/TileAssembler.cpp diff --git a/src/libraries/collision/Maps/TileAssembler.h b/src/common/Collision/Maps/TileAssembler.h similarity index 100% rename from src/libraries/collision/Maps/TileAssembler.h rename to src/common/Collision/Maps/TileAssembler.h diff --git a/src/libraries/collision/Models/GameObjectModel.cpp b/src/common/Collision/Models/GameObjectModel.cpp similarity index 100% rename from src/libraries/collision/Models/GameObjectModel.cpp rename to src/common/Collision/Models/GameObjectModel.cpp diff --git a/src/libraries/collision/Models/GameObjectModel.h b/src/common/Collision/Models/GameObjectModel.h similarity index 100% rename from src/libraries/collision/Models/GameObjectModel.h rename to src/common/Collision/Models/GameObjectModel.h diff --git a/src/libraries/collision/Models/ModelInstance.cpp b/src/common/Collision/Models/ModelInstance.cpp similarity index 100% rename from src/libraries/collision/Models/ModelInstance.cpp rename to src/common/Collision/Models/ModelInstance.cpp diff --git a/src/libraries/collision/Models/ModelInstance.h b/src/common/Collision/Models/ModelInstance.h similarity index 100% rename from src/libraries/collision/Models/ModelInstance.h rename to src/common/Collision/Models/ModelInstance.h diff --git a/src/libraries/collision/Models/WorldModel.cpp b/src/common/Collision/Models/WorldModel.cpp similarity index 100% rename from src/libraries/collision/Models/WorldModel.cpp rename to src/common/Collision/Models/WorldModel.cpp diff --git a/src/libraries/collision/Models/WorldModel.h b/src/common/Collision/Models/WorldModel.h similarity index 100% rename from src/libraries/collision/Models/WorldModel.h rename to src/common/Collision/Models/WorldModel.h diff --git a/src/libraries/collision/PrecompiledHeaders/collisionPCH.cpp b/src/common/Collision/PrecompiledHeaders/collisionPCH.cpp similarity index 100% rename from src/libraries/collision/PrecompiledHeaders/collisionPCH.cpp rename to src/common/Collision/PrecompiledHeaders/collisionPCH.cpp diff --git a/src/libraries/collision/PrecompiledHeaders/collisionPCH.h b/src/common/Collision/PrecompiledHeaders/collisionPCH.h similarity index 100% rename from src/libraries/collision/PrecompiledHeaders/collisionPCH.h rename to src/common/Collision/PrecompiledHeaders/collisionPCH.h diff --git a/src/libraries/collision/RegularGrid.h b/src/common/Collision/RegularGrid.h similarity index 100% rename from src/libraries/collision/RegularGrid.h rename to src/common/Collision/RegularGrid.h diff --git a/src/libraries/collision/VMapDefinitions.h b/src/common/Collision/VMapDefinitions.h similarity index 100% rename from src/libraries/collision/VMapDefinitions.h rename to src/common/Collision/VMapDefinitions.h diff --git a/src/libraries/collision/VMapTools.h b/src/common/Collision/VMapTools.h similarity index 100% rename from src/libraries/collision/VMapTools.h rename to src/common/Collision/VMapTools.h diff --git a/src/core/Common.cpp b/src/common/Common.cpp similarity index 100% rename from src/core/Common.cpp rename to src/common/Common.cpp diff --git a/src/core/Common.h b/src/common/Common.h similarity index 100% rename from src/core/Common.h rename to src/common/Common.h diff --git a/src/core/CompilerDefs.h b/src/common/CompilerDefs.h similarity index 100% rename from src/core/CompilerDefs.h rename to src/common/CompilerDefs.h diff --git a/src/core/Configuration/Config.cpp b/src/common/Configuration/Config.cpp similarity index 100% rename from src/core/Configuration/Config.cpp rename to src/common/Configuration/Config.cpp diff --git a/src/core/Configuration/Config.h b/src/common/Configuration/Config.h similarity index 100% rename from src/core/Configuration/Config.h rename to src/common/Configuration/Config.h diff --git a/src/core/Containers.h b/src/common/Containers.h similarity index 100% rename from src/core/Containers.h rename to src/common/Containers.h diff --git a/src/core/Cryptography/ARC4.cpp b/src/common/Cryptography/ARC4.cpp similarity index 100% rename from src/core/Cryptography/ARC4.cpp rename to src/common/Cryptography/ARC4.cpp diff --git a/src/core/Cryptography/ARC4.h b/src/common/Cryptography/ARC4.h similarity index 100% rename from src/core/Cryptography/ARC4.h rename to src/common/Cryptography/ARC4.h diff --git a/src/core/Cryptography/Authentication/AuthCrypt.cpp b/src/common/Cryptography/Authentication/AuthCrypt.cpp similarity index 100% rename from src/core/Cryptography/Authentication/AuthCrypt.cpp rename to src/common/Cryptography/Authentication/AuthCrypt.cpp diff --git a/src/core/Cryptography/Authentication/AuthCrypt.h b/src/common/Cryptography/Authentication/AuthCrypt.h similarity index 100% rename from src/core/Cryptography/Authentication/AuthCrypt.h rename to src/common/Cryptography/Authentication/AuthCrypt.h diff --git a/src/core/Cryptography/BigNumber.cpp b/src/common/Cryptography/BigNumber.cpp similarity index 100% rename from src/core/Cryptography/BigNumber.cpp rename to src/common/Cryptography/BigNumber.cpp diff --git a/src/core/Cryptography/BigNumber.h b/src/common/Cryptography/BigNumber.h similarity index 100% rename from src/core/Cryptography/BigNumber.h rename to src/common/Cryptography/BigNumber.h diff --git a/src/core/Cryptography/HMACSHA1.cpp b/src/common/Cryptography/HMACSHA1.cpp similarity index 100% rename from src/core/Cryptography/HMACSHA1.cpp rename to src/common/Cryptography/HMACSHA1.cpp diff --git a/src/core/Cryptography/HMACSHA1.h b/src/common/Cryptography/HMACSHA1.h similarity index 100% rename from src/core/Cryptography/HMACSHA1.h rename to src/common/Cryptography/HMACSHA1.h diff --git a/src/core/Cryptography/OpenSSLCrypto.cpp b/src/common/Cryptography/OpenSSLCrypto.cpp similarity index 100% rename from src/core/Cryptography/OpenSSLCrypto.cpp rename to src/common/Cryptography/OpenSSLCrypto.cpp diff --git a/src/core/Cryptography/OpenSSLCrypto.h b/src/common/Cryptography/OpenSSLCrypto.h similarity index 100% rename from src/core/Cryptography/OpenSSLCrypto.h rename to src/common/Cryptography/OpenSSLCrypto.h diff --git a/src/core/Cryptography/SHA1.cpp b/src/common/Cryptography/SHA1.cpp similarity index 100% rename from src/core/Cryptography/SHA1.cpp rename to src/common/Cryptography/SHA1.cpp diff --git a/src/core/Cryptography/SHA1.h b/src/common/Cryptography/SHA1.h similarity index 100% rename from src/core/Cryptography/SHA1.h rename to src/common/Cryptography/SHA1.h diff --git a/src/core/Cryptography/WardenKeyGeneration.h b/src/common/Cryptography/WardenKeyGeneration.h similarity index 100% rename from src/core/Cryptography/WardenKeyGeneration.h rename to src/common/Cryptography/WardenKeyGeneration.h diff --git a/src/core/DataStores/DBCFileLoader.cpp b/src/common/DataStores/DBCFileLoader.cpp similarity index 100% rename from src/core/DataStores/DBCFileLoader.cpp rename to src/common/DataStores/DBCFileLoader.cpp diff --git a/src/core/DataStores/DBCFileLoader.h b/src/common/DataStores/DBCFileLoader.h similarity index 100% rename from src/core/DataStores/DBCFileLoader.h rename to src/common/DataStores/DBCFileLoader.h diff --git a/src/core/DataStores/DBCStore.h b/src/common/DataStores/DBCStore.h similarity index 100% rename from src/core/DataStores/DBCStore.h rename to src/common/DataStores/DBCStore.h diff --git a/src/core/Database/AdhocStatement.cpp b/src/common/Database/AdhocStatement.cpp similarity index 100% rename from src/core/Database/AdhocStatement.cpp rename to src/common/Database/AdhocStatement.cpp diff --git a/src/core/Database/AdhocStatement.h b/src/common/Database/AdhocStatement.h similarity index 100% rename from src/core/Database/AdhocStatement.h rename to src/common/Database/AdhocStatement.h diff --git a/src/core/Database/DatabaseEnv.h b/src/common/Database/DatabaseEnv.h similarity index 100% rename from src/core/Database/DatabaseEnv.h rename to src/common/Database/DatabaseEnv.h diff --git a/src/core/Database/DatabaseWorker.cpp b/src/common/Database/DatabaseWorker.cpp similarity index 100% rename from src/core/Database/DatabaseWorker.cpp rename to src/common/Database/DatabaseWorker.cpp diff --git a/src/core/Database/DatabaseWorker.h b/src/common/Database/DatabaseWorker.h similarity index 100% rename from src/core/Database/DatabaseWorker.h rename to src/common/Database/DatabaseWorker.h diff --git a/src/core/Database/DatabaseWorkerPool.h b/src/common/Database/DatabaseWorkerPool.h similarity index 100% rename from src/core/Database/DatabaseWorkerPool.h rename to src/common/Database/DatabaseWorkerPool.h diff --git a/src/core/Database/Field.cpp b/src/common/Database/Field.cpp similarity index 100% rename from src/core/Database/Field.cpp rename to src/common/Database/Field.cpp diff --git a/src/core/Database/Field.h b/src/common/Database/Field.h similarity index 100% rename from src/core/Database/Field.h rename to src/common/Database/Field.h diff --git a/src/core/Database/Implementation/CharacterDatabase.cpp b/src/common/Database/Implementation/CharacterDatabase.cpp similarity index 100% rename from src/core/Database/Implementation/CharacterDatabase.cpp rename to src/common/Database/Implementation/CharacterDatabase.cpp diff --git a/src/core/Database/Implementation/CharacterDatabase.h b/src/common/Database/Implementation/CharacterDatabase.h similarity index 100% rename from src/core/Database/Implementation/CharacterDatabase.h rename to src/common/Database/Implementation/CharacterDatabase.h diff --git a/src/core/Database/Implementation/LoginDatabase.cpp b/src/common/Database/Implementation/LoginDatabase.cpp similarity index 100% rename from src/core/Database/Implementation/LoginDatabase.cpp rename to src/common/Database/Implementation/LoginDatabase.cpp diff --git a/src/core/Database/Implementation/LoginDatabase.h b/src/common/Database/Implementation/LoginDatabase.h similarity index 100% rename from src/core/Database/Implementation/LoginDatabase.h rename to src/common/Database/Implementation/LoginDatabase.h diff --git a/src/core/Database/Implementation/WorldDatabase.cpp b/src/common/Database/Implementation/WorldDatabase.cpp similarity index 100% rename from src/core/Database/Implementation/WorldDatabase.cpp rename to src/common/Database/Implementation/WorldDatabase.cpp diff --git a/src/core/Database/Implementation/WorldDatabase.h b/src/common/Database/Implementation/WorldDatabase.h similarity index 100% rename from src/core/Database/Implementation/WorldDatabase.h rename to src/common/Database/Implementation/WorldDatabase.h diff --git a/src/core/Database/MySQLConnection.cpp b/src/common/Database/MySQLConnection.cpp similarity index 100% rename from src/core/Database/MySQLConnection.cpp rename to src/common/Database/MySQLConnection.cpp diff --git a/src/core/Database/MySQLConnection.h b/src/common/Database/MySQLConnection.h similarity index 100% rename from src/core/Database/MySQLConnection.h rename to src/common/Database/MySQLConnection.h diff --git a/src/core/Database/MySQLThreading.h b/src/common/Database/MySQLThreading.h similarity index 100% rename from src/core/Database/MySQLThreading.h rename to src/common/Database/MySQLThreading.h diff --git a/src/core/Database/PreparedStatement.cpp b/src/common/Database/PreparedStatement.cpp similarity index 100% rename from src/core/Database/PreparedStatement.cpp rename to src/common/Database/PreparedStatement.cpp diff --git a/src/core/Database/PreparedStatement.h b/src/common/Database/PreparedStatement.h similarity index 100% rename from src/core/Database/PreparedStatement.h rename to src/common/Database/PreparedStatement.h diff --git a/src/core/Database/QueryHolder.cpp b/src/common/Database/QueryHolder.cpp similarity index 100% rename from src/core/Database/QueryHolder.cpp rename to src/common/Database/QueryHolder.cpp diff --git a/src/core/Database/QueryHolder.h b/src/common/Database/QueryHolder.h similarity index 100% rename from src/core/Database/QueryHolder.h rename to src/common/Database/QueryHolder.h diff --git a/src/core/Database/QueryResult.cpp b/src/common/Database/QueryResult.cpp similarity index 100% rename from src/core/Database/QueryResult.cpp rename to src/common/Database/QueryResult.cpp diff --git a/src/core/Database/QueryResult.h b/src/common/Database/QueryResult.h similarity index 100% rename from src/core/Database/QueryResult.h rename to src/common/Database/QueryResult.h diff --git a/src/core/Database/SQLOperation.h b/src/common/Database/SQLOperation.h similarity index 100% rename from src/core/Database/SQLOperation.h rename to src/common/Database/SQLOperation.h diff --git a/src/core/Database/Transaction.cpp b/src/common/Database/Transaction.cpp similarity index 100% rename from src/core/Database/Transaction.cpp rename to src/common/Database/Transaction.cpp diff --git a/src/core/Database/Transaction.h b/src/common/Database/Transaction.h similarity index 100% rename from src/core/Database/Transaction.h rename to src/common/Database/Transaction.h diff --git a/src/core/Debugging/Errors.cpp b/src/common/Debugging/Errors.cpp similarity index 100% rename from src/core/Debugging/Errors.cpp rename to src/common/Debugging/Errors.cpp diff --git a/src/core/Debugging/Errors.h b/src/common/Debugging/Errors.h similarity index 100% rename from src/core/Debugging/Errors.h rename to src/common/Debugging/Errors.h diff --git a/src/core/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp similarity index 100% rename from src/core/Debugging/WheatyExceptionReport.cpp rename to src/common/Debugging/WheatyExceptionReport.cpp diff --git a/src/core/Debugging/WheatyExceptionReport.h b/src/common/Debugging/WheatyExceptionReport.h similarity index 100% rename from src/core/Debugging/WheatyExceptionReport.h rename to src/common/Debugging/WheatyExceptionReport.h diff --git a/src/core/Define.h b/src/common/Define.h similarity index 100% rename from src/core/Define.h rename to src/common/Define.h diff --git a/src/core/Dynamic/FactoryHolder.h b/src/common/Dynamic/FactoryHolder.h similarity index 100% rename from src/core/Dynamic/FactoryHolder.h rename to src/common/Dynamic/FactoryHolder.h diff --git a/src/core/Dynamic/HashNamespace.h b/src/common/Dynamic/HashNamespace.h similarity index 100% rename from src/core/Dynamic/HashNamespace.h rename to src/common/Dynamic/HashNamespace.h diff --git a/src/core/Dynamic/LinkedList.h b/src/common/Dynamic/LinkedList.h similarity index 100% rename from src/core/Dynamic/LinkedList.h rename to src/common/Dynamic/LinkedList.h diff --git a/src/core/Dynamic/LinkedReference/RefManager.h b/src/common/Dynamic/LinkedReference/RefManager.h similarity index 100% rename from src/core/Dynamic/LinkedReference/RefManager.h rename to src/common/Dynamic/LinkedReference/RefManager.h diff --git a/src/core/Dynamic/LinkedReference/Reference.h b/src/common/Dynamic/LinkedReference/Reference.h similarity index 100% rename from src/core/Dynamic/LinkedReference/Reference.h rename to src/common/Dynamic/LinkedReference/Reference.h diff --git a/src/core/Dynamic/ObjectRegistry.h b/src/common/Dynamic/ObjectRegistry.h similarity index 100% rename from src/core/Dynamic/ObjectRegistry.h rename to src/common/Dynamic/ObjectRegistry.h diff --git a/src/core/Dynamic/TypeContainer.h b/src/common/Dynamic/TypeContainer.h similarity index 100% rename from src/core/Dynamic/TypeContainer.h rename to src/common/Dynamic/TypeContainer.h diff --git a/src/core/Dynamic/TypeContainerFunctions.h b/src/common/Dynamic/TypeContainerFunctions.h similarity index 100% rename from src/core/Dynamic/TypeContainerFunctions.h rename to src/common/Dynamic/TypeContainerFunctions.h diff --git a/src/core/Dynamic/TypeContainerFunctionsPtr.h b/src/common/Dynamic/TypeContainerFunctionsPtr.h similarity index 100% rename from src/core/Dynamic/TypeContainerFunctionsPtr.h rename to src/common/Dynamic/TypeContainerFunctionsPtr.h diff --git a/src/core/Dynamic/TypeContainerVisitor.h b/src/common/Dynamic/TypeContainerVisitor.h similarity index 100% rename from src/core/Dynamic/TypeContainerVisitor.h rename to src/common/Dynamic/TypeContainerVisitor.h diff --git a/src/core/Dynamic/TypeList.h b/src/common/Dynamic/TypeList.h similarity index 100% rename from src/core/Dynamic/TypeList.h rename to src/common/Dynamic/TypeList.h diff --git a/src/core/Dynamic/UnorderedMap.h b/src/common/Dynamic/UnorderedMap.h similarity index 100% rename from src/core/Dynamic/UnorderedMap.h rename to src/common/Dynamic/UnorderedMap.h diff --git a/src/core/Dynamic/UnorderedSet.h b/src/common/Dynamic/UnorderedSet.h similarity index 100% rename from src/core/Dynamic/UnorderedSet.h rename to src/common/Dynamic/UnorderedSet.h diff --git a/src/core/Logging/Log.cpp b/src/common/Logging/Log.cpp similarity index 100% rename from src/core/Logging/Log.cpp rename to src/common/Logging/Log.cpp diff --git a/src/core/Logging/Log.h b/src/common/Logging/Log.h similarity index 100% rename from src/core/Logging/Log.h rename to src/common/Logging/Log.h diff --git a/src/core/Packets/ByteBuffer.cpp b/src/common/Packets/ByteBuffer.cpp similarity index 100% rename from src/core/Packets/ByteBuffer.cpp rename to src/common/Packets/ByteBuffer.cpp diff --git a/src/core/Packets/ByteBuffer.h b/src/common/Packets/ByteBuffer.h similarity index 100% rename from src/core/Packets/ByteBuffer.h rename to src/common/Packets/ByteBuffer.h diff --git a/src/core/Packets/WorldPacket.h b/src/common/Packets/WorldPacket.h similarity index 100% rename from src/core/Packets/WorldPacket.h rename to src/common/Packets/WorldPacket.h diff --git a/src/core/PrecompiledHeaders/sharedPCH.cpp b/src/common/PrecompiledHeaders/sharedPCH.cpp similarity index 100% rename from src/core/PrecompiledHeaders/sharedPCH.cpp rename to src/common/PrecompiledHeaders/sharedPCH.cpp diff --git a/src/core/PrecompiledHeaders/sharedPCH.h b/src/common/PrecompiledHeaders/sharedPCH.h similarity index 100% rename from src/core/PrecompiledHeaders/sharedPCH.h rename to src/common/PrecompiledHeaders/sharedPCH.h diff --git a/src/core/SystemConfig.h b/src/common/SystemConfig.h similarity index 100% rename from src/core/SystemConfig.h rename to src/common/SystemConfig.h diff --git a/src/core/Threading/Callback.h b/src/common/Threading/Callback.h similarity index 100% rename from src/core/Threading/Callback.h rename to src/common/Threading/Callback.h diff --git a/src/core/Threading/DelayExecutor.cpp b/src/common/Threading/DelayExecutor.cpp similarity index 100% rename from src/core/Threading/DelayExecutor.cpp rename to src/common/Threading/DelayExecutor.cpp diff --git a/src/core/Threading/DelayExecutor.h b/src/common/Threading/DelayExecutor.h similarity index 100% rename from src/core/Threading/DelayExecutor.h rename to src/common/Threading/DelayExecutor.h diff --git a/src/core/Threading/LockedQueue.h b/src/common/Threading/LockedQueue.h similarity index 100% rename from src/core/Threading/LockedQueue.h rename to src/common/Threading/LockedQueue.h diff --git a/src/core/Threading/Threading.cpp b/src/common/Threading/Threading.cpp similarity index 100% rename from src/core/Threading/Threading.cpp rename to src/common/Threading/Threading.cpp diff --git a/src/core/Threading/Threading.h b/src/common/Threading/Threading.h similarity index 100% rename from src/core/Threading/Threading.h rename to src/common/Threading/Threading.h diff --git a/src/core/Utilities/ByteConverter.h b/src/common/Utilities/ByteConverter.h similarity index 100% rename from src/core/Utilities/ByteConverter.h rename to src/common/Utilities/ByteConverter.h diff --git a/src/core/Utilities/EventProcessor.cpp b/src/common/Utilities/EventProcessor.cpp similarity index 100% rename from src/core/Utilities/EventProcessor.cpp rename to src/common/Utilities/EventProcessor.cpp diff --git a/src/core/Utilities/EventProcessor.h b/src/common/Utilities/EventProcessor.h similarity index 100% rename from src/core/Utilities/EventProcessor.h rename to src/common/Utilities/EventProcessor.h diff --git a/src/core/Utilities/ServiceWin32.cpp b/src/common/Utilities/ServiceWin32.cpp similarity index 100% rename from src/core/Utilities/ServiceWin32.cpp rename to src/common/Utilities/ServiceWin32.cpp diff --git a/src/core/Utilities/ServiceWin32.h b/src/common/Utilities/ServiceWin32.h similarity index 100% rename from src/core/Utilities/ServiceWin32.h rename to src/common/Utilities/ServiceWin32.h diff --git a/src/core/Utilities/SignalHandler.h b/src/common/Utilities/SignalHandler.h similarity index 100% rename from src/core/Utilities/SignalHandler.h rename to src/common/Utilities/SignalHandler.h diff --git a/src/core/Utilities/Timer.h b/src/common/Utilities/Timer.h similarity index 100% rename from src/core/Utilities/Timer.h rename to src/common/Utilities/Timer.h diff --git a/src/core/Utilities/Util.cpp b/src/common/Utilities/Util.cpp similarity index 100% rename from src/core/Utilities/Util.cpp rename to src/common/Utilities/Util.cpp diff --git a/src/core/Utilities/Util.h b/src/common/Utilities/Util.h similarity index 100% rename from src/core/Utilities/Util.h rename to src/common/Utilities/Util.h diff --git a/src/core/cmake/compiler/clang/settings.cmake b/src/common/cmake/compiler/clang/settings.cmake similarity index 100% rename from src/core/cmake/compiler/clang/settings.cmake rename to src/common/cmake/compiler/clang/settings.cmake diff --git a/src/core/cmake/compiler/gcc/settings.cmake b/src/common/cmake/compiler/gcc/settings.cmake similarity index 100% rename from src/core/cmake/compiler/gcc/settings.cmake rename to src/common/cmake/compiler/gcc/settings.cmake diff --git a/src/core/cmake/compiler/icc/settings.cmake b/src/common/cmake/compiler/icc/settings.cmake similarity index 100% rename from src/core/cmake/compiler/icc/settings.cmake rename to src/common/cmake/compiler/icc/settings.cmake diff --git a/src/core/cmake/compiler/mingw/settings.cmake b/src/common/cmake/compiler/mingw/settings.cmake similarity index 100% rename from src/core/cmake/compiler/mingw/settings.cmake rename to src/common/cmake/compiler/mingw/settings.cmake diff --git a/src/core/cmake/compiler/msvc/settings.cmake b/src/common/cmake/compiler/msvc/settings.cmake similarity index 100% rename from src/core/cmake/compiler/msvc/settings.cmake rename to src/common/cmake/compiler/msvc/settings.cmake diff --git a/src/core/cmake/macros/CheckBuildDir.cmake b/src/common/cmake/macros/CheckBuildDir.cmake similarity index 100% rename from src/core/cmake/macros/CheckBuildDir.cmake rename to src/common/cmake/macros/CheckBuildDir.cmake diff --git a/src/core/cmake/macros/CheckPlatform.cmake b/src/common/cmake/macros/CheckPlatform.cmake similarity index 100% rename from src/core/cmake/macros/CheckPlatform.cmake rename to src/common/cmake/macros/CheckPlatform.cmake diff --git a/src/core/cmake/macros/EnsureVersion.cmake b/src/common/cmake/macros/EnsureVersion.cmake similarity index 100% rename from src/core/cmake/macros/EnsureVersion.cmake rename to src/common/cmake/macros/EnsureVersion.cmake diff --git a/src/core/cmake/macros/FindACE.cmake b/src/common/cmake/macros/FindACE.cmake similarity index 100% rename from src/core/cmake/macros/FindACE.cmake rename to src/common/cmake/macros/FindACE.cmake diff --git a/src/core/cmake/macros/FindGit.cmake b/src/common/cmake/macros/FindGit.cmake similarity index 100% rename from src/core/cmake/macros/FindGit.cmake rename to src/common/cmake/macros/FindGit.cmake diff --git a/src/core/cmake/macros/FindGperftools.cmake b/src/common/cmake/macros/FindGperftools.cmake similarity index 100% rename from src/core/cmake/macros/FindGperftools.cmake rename to src/common/cmake/macros/FindGperftools.cmake diff --git a/src/core/cmake/macros/FindMySQL.cmake b/src/common/cmake/macros/FindMySQL.cmake similarity index 100% rename from src/core/cmake/macros/FindMySQL.cmake rename to src/common/cmake/macros/FindMySQL.cmake diff --git a/src/core/cmake/macros/FindOpenSSL.cmake b/src/common/cmake/macros/FindOpenSSL.cmake similarity index 100% rename from src/core/cmake/macros/FindOpenSSL.cmake rename to src/common/cmake/macros/FindOpenSSL.cmake diff --git a/src/core/cmake/macros/FindPCHSupport.cmake b/src/common/cmake/macros/FindPCHSupport.cmake similarity index 100% rename from src/core/cmake/macros/FindPCHSupport.cmake rename to src/common/cmake/macros/FindPCHSupport.cmake diff --git a/src/core/cmake/macros/FindReadline.cmake b/src/common/cmake/macros/FindReadline.cmake similarity index 100% rename from src/core/cmake/macros/FindReadline.cmake rename to src/common/cmake/macros/FindReadline.cmake diff --git a/src/core/cmake/platform/after_platform.cmake b/src/common/cmake/platform/after_platform.cmake similarity index 100% rename from src/core/cmake/platform/after_platform.cmake rename to src/common/cmake/platform/after_platform.cmake diff --git a/src/core/cmake/platform/cmake_uninstall.in.cmake b/src/common/cmake/platform/cmake_uninstall.in.cmake similarity index 100% rename from src/core/cmake/platform/cmake_uninstall.in.cmake rename to src/common/cmake/platform/cmake_uninstall.in.cmake diff --git a/src/core/cmake/platform/settings.cmake b/src/common/cmake/platform/settings.cmake similarity index 100% rename from src/core/cmake/platform/settings.cmake rename to src/common/cmake/platform/settings.cmake diff --git a/src/core/cmake/platform/unix/settings.cmake b/src/common/cmake/platform/unix/settings.cmake similarity index 100% rename from src/core/cmake/platform/unix/settings.cmake rename to src/common/cmake/platform/unix/settings.cmake diff --git a/src/core/cmake/platform/win/settings.cmake b/src/common/cmake/platform/win/settings.cmake similarity index 100% rename from src/core/cmake/platform/win/settings.cmake rename to src/common/cmake/platform/win/settings.cmake diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt deleted file mode 100644 index 5320f4a9e..000000000 --- a/src/framework/CMakeLists.txt +++ /dev/null @@ -1,65 +0,0 @@ -if( USE_COREPCH ) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) -endif() - -file(GLOB_RECURSE sources_Addons Addons/*.cpp Addons/*.h) -file(GLOB sources_localdir *.cpp *.h) - -# Build gamefw sourcelist -# - -if (USE_COREPCH) - set(gamefw_STAT_PCH_HDR PrecompiledHeaders/gamefwPCH.h) - set(gamefw_STAT_PCH_SRC PrecompiledHeaders/gamefwPCH.cpp) -endif() - -set(gamefw_STAT_SRCS - ${gamefw_STAT_SRCS} - ${sources_Addons} - ${sources_localdir} -) - -include_directories( - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour - ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Recast - ${CMAKE_SOURCE_DIR}/deps/g3dlite/include - ${CMAKE_SOURCE_DIR}/deps/SFMT - ${CMAKE_SOURCE_DIR}/deps/zlib - ${CMAKE_SOURCE_DIR}/src/libraries/collision/ - ${CMAKE_SOURCE_DIR}/src/libraries/collision/Management - ${CMAKE_SOURCE_DIR}/src/libraries/collision/Models - ${CMAKE_SOURCE_DIR}/src/libraries/collision/Maps - ${CMAKE_SOURCE_DIR}/src/core - ${CMAKE_SOURCE_DIR}/src/core/Configuration - ${CMAKE_SOURCE_DIR}/src/core/Cryptography - ${CMAKE_SOURCE_DIR}/src/core/Cryptography/Authentication - ${CMAKE_SOURCE_DIR}/src/core/Database - ${CMAKE_SOURCE_DIR}/src/core/DataStores - ${CMAKE_SOURCE_DIR}/src/core/Debugging - ${CMAKE_SOURCE_DIR}/src/core/Dynamic/LinkedReference - ${CMAKE_SOURCE_DIR}/src/core/Dynamic - ${CMAKE_SOURCE_DIR}/src/core/Logging - ${CMAKE_SOURCE_DIR}/src/core/Packets - ${CMAKE_SOURCE_DIR}/src/core/Threading - ${CMAKE_SOURCE_DIR}/src/core/Utilities - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/Addons - ${ACE_INCLUDE_DIR} - ${MYSQL_INCLUDE_DIR} - ${OPENSSL_INCLUDE_DIR} -) - -add_library(gamefw STATIC - ${gamefw_STAT_SRCS} - ${gamefw_STAT_PCH_SRC} -) - -target_link_libraries(gamefw - ${ACE_LIBRARY} -) - -# Generate precompiled header -if (USE_COREPCH) - add_cxx_pch(gamefw ${gamefw_STAT_PCH_HDR} ${gamefw_STAT_PCH_SRC}) -endif () diff --git a/src/framework/PrecompiledHeaders/gamefwPCH.cpp b/src/framework/PrecompiledHeaders/gamefwPCH.cpp deleted file mode 100644 index 7b1c00bd6..000000000 --- a/src/framework/PrecompiledHeaders/gamefwPCH.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "gamefwPCH.h" diff --git a/src/framework/PrecompiledHeaders/gamefwPCH.h b/src/framework/PrecompiledHeaders/gamefwPCH.h deleted file mode 100644 index 6c1fefefb..000000000 --- a/src/framework/PrecompiledHeaders/gamefwPCH.h +++ /dev/null @@ -1,3 +0,0 @@ -//add here most rarely modified headers to speed up debug build compilation - - diff --git a/src/authserver/Authentication/AuthCodes.cpp b/src/server/authserver/Authentication/AuthCodes.cpp similarity index 100% rename from src/authserver/Authentication/AuthCodes.cpp rename to src/server/authserver/Authentication/AuthCodes.cpp diff --git a/src/authserver/Authentication/AuthCodes.h b/src/server/authserver/Authentication/AuthCodes.h similarity index 100% rename from src/authserver/Authentication/AuthCodes.h rename to src/server/authserver/Authentication/AuthCodes.h diff --git a/src/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt similarity index 100% rename from src/authserver/CMakeLists.txt rename to src/server/authserver/CMakeLists.txt diff --git a/src/authserver/Main.cpp b/src/server/authserver/Main.cpp similarity index 100% rename from src/authserver/Main.cpp rename to src/server/authserver/Main.cpp diff --git a/src/authserver/PrecompiledHeaders/authPCH.cpp b/src/server/authserver/PrecompiledHeaders/authPCH.cpp similarity index 100% rename from src/authserver/PrecompiledHeaders/authPCH.cpp rename to src/server/authserver/PrecompiledHeaders/authPCH.cpp diff --git a/src/authserver/PrecompiledHeaders/authPCH.h b/src/server/authserver/PrecompiledHeaders/authPCH.h similarity index 100% rename from src/authserver/PrecompiledHeaders/authPCH.h rename to src/server/authserver/PrecompiledHeaders/authPCH.h diff --git a/src/authserver/Realms/RealmList.cpp b/src/server/authserver/Realms/RealmList.cpp similarity index 100% rename from src/authserver/Realms/RealmList.cpp rename to src/server/authserver/Realms/RealmList.cpp diff --git a/src/authserver/Realms/RealmList.h b/src/server/authserver/Realms/RealmList.h similarity index 100% rename from src/authserver/Realms/RealmList.h rename to src/server/authserver/Realms/RealmList.h diff --git a/src/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp similarity index 100% rename from src/authserver/Server/AuthSocket.cpp rename to src/server/authserver/Server/AuthSocket.cpp diff --git a/src/authserver/Server/AuthSocket.h b/src/server/authserver/Server/AuthSocket.h similarity index 100% rename from src/authserver/Server/AuthSocket.h rename to src/server/authserver/Server/AuthSocket.h diff --git a/src/authserver/Server/RealmAcceptor.h b/src/server/authserver/Server/RealmAcceptor.h similarity index 100% rename from src/authserver/Server/RealmAcceptor.h rename to src/server/authserver/Server/RealmAcceptor.h diff --git a/src/authserver/Server/RealmSocket.cpp b/src/server/authserver/Server/RealmSocket.cpp similarity index 100% rename from src/authserver/Server/RealmSocket.cpp rename to src/server/authserver/Server/RealmSocket.cpp diff --git a/src/authserver/Server/RealmSocket.h b/src/server/authserver/Server/RealmSocket.h similarity index 100% rename from src/authserver/Server/RealmSocket.h rename to src/server/authserver/Server/RealmSocket.h diff --git a/src/authserver/authserver.conf.dist b/src/server/authserver/authserver.conf.dist similarity index 100% rename from src/authserver/authserver.conf.dist rename to src/server/authserver/authserver.conf.dist diff --git a/src/authserver/authserver.ico b/src/server/authserver/authserver.ico similarity index 100% rename from src/authserver/authserver.ico rename to src/server/authserver/authserver.ico diff --git a/src/authserver/authserver.rc b/src/server/authserver/authserver.rc similarity index 100% rename from src/authserver/authserver.rc rename to src/server/authserver/authserver.rc diff --git a/src/authserver/resource.h b/src/server/authserver/resource.h similarity index 100% rename from src/authserver/resource.h rename to src/server/authserver/resource.h diff --git a/src/game/AI/CoreAI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp similarity index 100% rename from src/game/AI/CoreAI/CombatAI.cpp rename to src/server/game/AI/CoreAI/CombatAI.cpp diff --git a/src/game/AI/CoreAI/CombatAI.h b/src/server/game/AI/CoreAI/CombatAI.h similarity index 100% rename from src/game/AI/CoreAI/CombatAI.h rename to src/server/game/AI/CoreAI/CombatAI.h diff --git a/src/game/AI/CoreAI/GameObjectAI.cpp b/src/server/game/AI/CoreAI/GameObjectAI.cpp similarity index 100% rename from src/game/AI/CoreAI/GameObjectAI.cpp rename to src/server/game/AI/CoreAI/GameObjectAI.cpp diff --git a/src/game/AI/CoreAI/GameObjectAI.h b/src/server/game/AI/CoreAI/GameObjectAI.h similarity index 100% rename from src/game/AI/CoreAI/GameObjectAI.h rename to src/server/game/AI/CoreAI/GameObjectAI.h diff --git a/src/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp similarity index 100% rename from src/game/AI/CoreAI/GuardAI.cpp rename to src/server/game/AI/CoreAI/GuardAI.cpp diff --git a/src/game/AI/CoreAI/GuardAI.h b/src/server/game/AI/CoreAI/GuardAI.h similarity index 100% rename from src/game/AI/CoreAI/GuardAI.h rename to src/server/game/AI/CoreAI/GuardAI.h diff --git a/src/game/AI/CoreAI/PassiveAI.cpp b/src/server/game/AI/CoreAI/PassiveAI.cpp similarity index 100% rename from src/game/AI/CoreAI/PassiveAI.cpp rename to src/server/game/AI/CoreAI/PassiveAI.cpp diff --git a/src/game/AI/CoreAI/PassiveAI.h b/src/server/game/AI/CoreAI/PassiveAI.h similarity index 100% rename from src/game/AI/CoreAI/PassiveAI.h rename to src/server/game/AI/CoreAI/PassiveAI.h diff --git a/src/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp similarity index 100% rename from src/game/AI/CoreAI/PetAI.cpp rename to src/server/game/AI/CoreAI/PetAI.cpp diff --git a/src/game/AI/CoreAI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h similarity index 100% rename from src/game/AI/CoreAI/PetAI.h rename to src/server/game/AI/CoreAI/PetAI.h diff --git a/src/game/AI/CoreAI/ReactorAI.cpp b/src/server/game/AI/CoreAI/ReactorAI.cpp similarity index 100% rename from src/game/AI/CoreAI/ReactorAI.cpp rename to src/server/game/AI/CoreAI/ReactorAI.cpp diff --git a/src/game/AI/CoreAI/ReactorAI.h b/src/server/game/AI/CoreAI/ReactorAI.h similarity index 100% rename from src/game/AI/CoreAI/ReactorAI.h rename to src/server/game/AI/CoreAI/ReactorAI.h diff --git a/src/game/AI/CoreAI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp similarity index 100% rename from src/game/AI/CoreAI/TotemAI.cpp rename to src/server/game/AI/CoreAI/TotemAI.cpp diff --git a/src/game/AI/CoreAI/TotemAI.h b/src/server/game/AI/CoreAI/TotemAI.h similarity index 100% rename from src/game/AI/CoreAI/TotemAI.h rename to src/server/game/AI/CoreAI/TotemAI.h diff --git a/src/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp similarity index 100% rename from src/game/AI/CoreAI/UnitAI.cpp rename to src/server/game/AI/CoreAI/UnitAI.cpp diff --git a/src/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h similarity index 100% rename from src/game/AI/CoreAI/UnitAI.h rename to src/server/game/AI/CoreAI/UnitAI.h diff --git a/src/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp similarity index 100% rename from src/game/AI/CreatureAI.cpp rename to src/server/game/AI/CreatureAI.cpp diff --git a/src/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h similarity index 100% rename from src/game/AI/CreatureAI.h rename to src/server/game/AI/CreatureAI.h diff --git a/src/game/AI/CreatureAIFactory.h b/src/server/game/AI/CreatureAIFactory.h similarity index 100% rename from src/game/AI/CreatureAIFactory.h rename to src/server/game/AI/CreatureAIFactory.h diff --git a/src/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h similarity index 100% rename from src/game/AI/CreatureAIImpl.h rename to src/server/game/AI/CreatureAIImpl.h diff --git a/src/game/AI/CreatureAIRegistry.cpp b/src/server/game/AI/CreatureAIRegistry.cpp similarity index 100% rename from src/game/AI/CreatureAIRegistry.cpp rename to src/server/game/AI/CreatureAIRegistry.cpp diff --git a/src/game/AI/CreatureAIRegistry.h b/src/server/game/AI/CreatureAIRegistry.h similarity index 100% rename from src/game/AI/CreatureAIRegistry.h rename to src/server/game/AI/CreatureAIRegistry.h diff --git a/src/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp similarity index 100% rename from src/game/AI/CreatureAISelector.cpp rename to src/server/game/AI/CreatureAISelector.cpp diff --git a/src/game/AI/CreatureAISelector.h b/src/server/game/AI/CreatureAISelector.h similarity index 100% rename from src/game/AI/CreatureAISelector.h rename to src/server/game/AI/CreatureAISelector.h diff --git a/src/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp similarity index 100% rename from src/game/AI/ScriptedAI/ScriptedCreature.cpp rename to src/server/game/AI/ScriptedAI/ScriptedCreature.cpp diff --git a/src/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h similarity index 100% rename from src/game/AI/ScriptedAI/ScriptedCreature.h rename to src/server/game/AI/ScriptedAI/ScriptedCreature.h diff --git a/src/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp similarity index 100% rename from src/game/AI/ScriptedAI/ScriptedEscortAI.cpp rename to src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp diff --git a/src/game/AI/ScriptedAI/ScriptedEscortAI.h b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h similarity index 100% rename from src/game/AI/ScriptedAI/ScriptedEscortAI.h rename to src/server/game/AI/ScriptedAI/ScriptedEscortAI.h diff --git a/src/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp similarity index 100% rename from src/game/AI/ScriptedAI/ScriptedFollowerAI.cpp rename to src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp diff --git a/src/game/AI/ScriptedAI/ScriptedFollowerAI.h b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h similarity index 100% rename from src/game/AI/ScriptedAI/ScriptedFollowerAI.h rename to src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h diff --git a/src/game/AI/ScriptedAI/ScriptedGossip.cpp b/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp similarity index 100% rename from src/game/AI/ScriptedAI/ScriptedGossip.cpp rename to src/server/game/AI/ScriptedAI/ScriptedGossip.cpp diff --git a/src/game/AI/ScriptedAI/ScriptedGossip.h b/src/server/game/AI/ScriptedAI/ScriptedGossip.h similarity index 100% rename from src/game/AI/ScriptedAI/ScriptedGossip.h rename to src/server/game/AI/ScriptedAI/ScriptedGossip.h diff --git a/src/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp similarity index 100% rename from src/game/AI/SmartScripts/SmartAI.cpp rename to src/server/game/AI/SmartScripts/SmartAI.cpp diff --git a/src/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h similarity index 100% rename from src/game/AI/SmartScripts/SmartAI.h rename to src/server/game/AI/SmartScripts/SmartAI.h diff --git a/src/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp similarity index 100% rename from src/game/AI/SmartScripts/SmartScript.cpp rename to src/server/game/AI/SmartScripts/SmartScript.cpp diff --git a/src/game/AI/SmartScripts/SmartScript.h b/src/server/game/AI/SmartScripts/SmartScript.h similarity index 100% rename from src/game/AI/SmartScripts/SmartScript.h rename to src/server/game/AI/SmartScripts/SmartScript.h diff --git a/src/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp similarity index 100% rename from src/game/AI/SmartScripts/SmartScriptMgr.cpp rename to src/server/game/AI/SmartScripts/SmartScriptMgr.cpp diff --git a/src/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h similarity index 100% rename from src/game/AI/SmartScripts/SmartScriptMgr.h rename to src/server/game/AI/SmartScripts/SmartScriptMgr.h diff --git a/src/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp similarity index 100% rename from src/game/Accounts/AccountMgr.cpp rename to src/server/game/Accounts/AccountMgr.cpp diff --git a/src/game/Accounts/AccountMgr.h b/src/server/game/Accounts/AccountMgr.h similarity index 100% rename from src/game/Accounts/AccountMgr.h rename to src/server/game/Accounts/AccountMgr.h diff --git a/src/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp similarity index 100% rename from src/game/Achievements/AchievementMgr.cpp rename to src/server/game/Achievements/AchievementMgr.cpp diff --git a/src/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h similarity index 100% rename from src/game/Achievements/AchievementMgr.h rename to src/server/game/Achievements/AchievementMgr.h diff --git a/src/framework/Addons/AddonMgr.cpp b/src/server/game/Addons/AddonMgr.cpp similarity index 100% rename from src/framework/Addons/AddonMgr.cpp rename to src/server/game/Addons/AddonMgr.cpp diff --git a/src/framework/Addons/AddonMgr.h b/src/server/game/Addons/AddonMgr.h similarity index 100% rename from src/framework/Addons/AddonMgr.h rename to src/server/game/Addons/AddonMgr.h diff --git a/src/game/ArenaSpectator/ArenaSpectator.h b/src/server/game/ArenaSpectator/ArenaSpectator.h similarity index 100% rename from src/game/ArenaSpectator/ArenaSpectator.h rename to src/server/game/ArenaSpectator/ArenaSpectator.h diff --git a/src/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp similarity index 100% rename from src/game/AuctionHouse/AuctionHouseMgr.cpp rename to src/server/game/AuctionHouse/AuctionHouseMgr.cpp diff --git a/src/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h similarity index 100% rename from src/game/AuctionHouse/AuctionHouseMgr.h rename to src/server/game/AuctionHouse/AuctionHouseMgr.h diff --git a/src/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp similarity index 100% rename from src/game/Battlefield/Battlefield.cpp rename to src/server/game/Battlefield/Battlefield.cpp diff --git a/src/game/Battlefield/Battlefield.h b/src/server/game/Battlefield/Battlefield.h similarity index 100% rename from src/game/Battlefield/Battlefield.h rename to src/server/game/Battlefield/Battlefield.h diff --git a/src/game/Battlefield/BattlefieldHandler.cpp b/src/server/game/Battlefield/BattlefieldHandler.cpp similarity index 100% rename from src/game/Battlefield/BattlefieldHandler.cpp rename to src/server/game/Battlefield/BattlefieldHandler.cpp diff --git a/src/game/Battlefield/BattlefieldMgr.cpp b/src/server/game/Battlefield/BattlefieldMgr.cpp similarity index 100% rename from src/game/Battlefield/BattlefieldMgr.cpp rename to src/server/game/Battlefield/BattlefieldMgr.cpp diff --git a/src/game/Battlefield/BattlefieldMgr.h b/src/server/game/Battlefield/BattlefieldMgr.h similarity index 100% rename from src/game/Battlefield/BattlefieldMgr.h rename to src/server/game/Battlefield/BattlefieldMgr.h diff --git a/src/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp similarity index 100% rename from src/game/Battlefield/Zones/BattlefieldWG.cpp rename to src/server/game/Battlefield/Zones/BattlefieldWG.cpp diff --git a/src/game/Battlefield/Zones/BattlefieldWG.h b/src/server/game/Battlefield/Zones/BattlefieldWG.h similarity index 100% rename from src/game/Battlefield/Zones/BattlefieldWG.h rename to src/server/game/Battlefield/Zones/BattlefieldWG.h diff --git a/src/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp similarity index 100% rename from src/game/Battlegrounds/ArenaTeam.cpp rename to src/server/game/Battlegrounds/ArenaTeam.cpp diff --git a/src/game/Battlegrounds/ArenaTeam.h b/src/server/game/Battlegrounds/ArenaTeam.h similarity index 100% rename from src/game/Battlegrounds/ArenaTeam.h rename to src/server/game/Battlegrounds/ArenaTeam.h diff --git a/src/game/Battlegrounds/ArenaTeamMgr.cpp b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp similarity index 100% rename from src/game/Battlegrounds/ArenaTeamMgr.cpp rename to src/server/game/Battlegrounds/ArenaTeamMgr.cpp diff --git a/src/game/Battlegrounds/ArenaTeamMgr.h b/src/server/game/Battlegrounds/ArenaTeamMgr.h similarity index 100% rename from src/game/Battlegrounds/ArenaTeamMgr.h rename to src/server/game/Battlegrounds/ArenaTeamMgr.h diff --git a/src/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp similarity index 100% rename from src/game/Battlegrounds/Battleground.cpp rename to src/server/game/Battlegrounds/Battleground.cpp diff --git a/src/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h similarity index 100% rename from src/game/Battlegrounds/Battleground.h rename to src/server/game/Battlegrounds/Battleground.h diff --git a/src/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp similarity index 100% rename from src/game/Battlegrounds/BattlegroundMgr.cpp rename to src/server/game/Battlegrounds/BattlegroundMgr.cpp diff --git a/src/game/Battlegrounds/BattlegroundMgr.h b/src/server/game/Battlegrounds/BattlegroundMgr.h similarity index 100% rename from src/game/Battlegrounds/BattlegroundMgr.h rename to src/server/game/Battlegrounds/BattlegroundMgr.h diff --git a/src/game/Battlegrounds/BattlegroundQueue.cpp b/src/server/game/Battlegrounds/BattlegroundQueue.cpp similarity index 100% rename from src/game/Battlegrounds/BattlegroundQueue.cpp rename to src/server/game/Battlegrounds/BattlegroundQueue.cpp diff --git a/src/game/Battlegrounds/BattlegroundQueue.h b/src/server/game/Battlegrounds/BattlegroundQueue.h similarity index 100% rename from src/game/Battlegrounds/BattlegroundQueue.h rename to src/server/game/Battlegrounds/BattlegroundQueue.h diff --git a/src/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundAB.cpp rename to src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp diff --git a/src/game/Battlegrounds/Zones/BattlegroundAB.h b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundAB.h rename to src/server/game/Battlegrounds/Zones/BattlegroundAB.h diff --git a/src/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundAV.cpp rename to src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp diff --git a/src/game/Battlegrounds/Zones/BattlegroundAV.h b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundAV.h rename to src/server/game/Battlegrounds/Zones/BattlegroundAV.h diff --git a/src/game/Battlegrounds/Zones/BattlegroundBE.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundBE.cpp rename to src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp diff --git a/src/game/Battlegrounds/Zones/BattlegroundBE.h b/src/server/game/Battlegrounds/Zones/BattlegroundBE.h similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundBE.h rename to src/server/game/Battlegrounds/Zones/BattlegroundBE.h diff --git a/src/game/Battlegrounds/Zones/BattlegroundDS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundDS.cpp rename to src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp diff --git a/src/game/Battlegrounds/Zones/BattlegroundDS.h b/src/server/game/Battlegrounds/Zones/BattlegroundDS.h similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundDS.h rename to src/server/game/Battlegrounds/Zones/BattlegroundDS.h diff --git a/src/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundEY.cpp rename to src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp diff --git a/src/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundEY.h rename to src/server/game/Battlegrounds/Zones/BattlegroundEY.h diff --git a/src/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundIC.cpp rename to src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp diff --git a/src/game/Battlegrounds/Zones/BattlegroundIC.h b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundIC.h rename to src/server/game/Battlegrounds/Zones/BattlegroundIC.h diff --git a/src/game/Battlegrounds/Zones/BattlegroundNA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundNA.cpp rename to src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp diff --git a/src/game/Battlegrounds/Zones/BattlegroundNA.h b/src/server/game/Battlegrounds/Zones/BattlegroundNA.h similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundNA.h rename to src/server/game/Battlegrounds/Zones/BattlegroundNA.h diff --git a/src/game/Battlegrounds/Zones/BattlegroundRL.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundRL.cpp rename to src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp diff --git a/src/game/Battlegrounds/Zones/BattlegroundRL.h b/src/server/game/Battlegrounds/Zones/BattlegroundRL.h similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundRL.h rename to src/server/game/Battlegrounds/Zones/BattlegroundRL.h diff --git a/src/game/Battlegrounds/Zones/BattlegroundRV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundRV.cpp rename to src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp diff --git a/src/game/Battlegrounds/Zones/BattlegroundRV.h b/src/server/game/Battlegrounds/Zones/BattlegroundRV.h similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundRV.h rename to src/server/game/Battlegrounds/Zones/BattlegroundRV.h diff --git a/src/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundSA.cpp rename to src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp diff --git a/src/game/Battlegrounds/Zones/BattlegroundSA.h b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundSA.h rename to src/server/game/Battlegrounds/Zones/BattlegroundSA.h diff --git a/src/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundWS.cpp rename to src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp diff --git a/src/game/Battlegrounds/Zones/BattlegroundWS.h b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h similarity index 100% rename from src/game/Battlegrounds/Zones/BattlegroundWS.h rename to src/server/game/Battlegrounds/Zones/BattlegroundWS.h diff --git a/src/game/CMakeLists.txt b/src/server/game/CMakeLists.txt similarity index 100% rename from src/game/CMakeLists.txt rename to src/server/game/CMakeLists.txt diff --git a/src/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp similarity index 100% rename from src/game/Calendar/CalendarMgr.cpp rename to src/server/game/Calendar/CalendarMgr.cpp diff --git a/src/game/Calendar/CalendarMgr.h b/src/server/game/Calendar/CalendarMgr.h similarity index 100% rename from src/game/Calendar/CalendarMgr.h rename to src/server/game/Calendar/CalendarMgr.h diff --git a/src/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp similarity index 100% rename from src/game/Chat/Channels/Channel.cpp rename to src/server/game/Chat/Channels/Channel.cpp diff --git a/src/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h similarity index 100% rename from src/game/Chat/Channels/Channel.h rename to src/server/game/Chat/Channels/Channel.h diff --git a/src/game/Chat/Channels/ChannelMgr.cpp b/src/server/game/Chat/Channels/ChannelMgr.cpp similarity index 100% rename from src/game/Chat/Channels/ChannelMgr.cpp rename to src/server/game/Chat/Channels/ChannelMgr.cpp diff --git a/src/game/Chat/Channels/ChannelMgr.h b/src/server/game/Chat/Channels/ChannelMgr.h similarity index 100% rename from src/game/Chat/Channels/ChannelMgr.h rename to src/server/game/Chat/Channels/ChannelMgr.h diff --git a/src/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp similarity index 100% rename from src/game/Chat/Chat.cpp rename to src/server/game/Chat/Chat.cpp diff --git a/src/game/Chat/Chat.h b/src/server/game/Chat/Chat.h similarity index 100% rename from src/game/Chat/Chat.h rename to src/server/game/Chat/Chat.h diff --git a/src/game/Chat/ChatLink.cpp b/src/server/game/Chat/ChatLink.cpp similarity index 100% rename from src/game/Chat/ChatLink.cpp rename to src/server/game/Chat/ChatLink.cpp diff --git a/src/game/Chat/ChatLink.h b/src/server/game/Chat/ChatLink.h similarity index 100% rename from src/game/Chat/ChatLink.h rename to src/server/game/Chat/ChatLink.h diff --git a/src/game/Combat/HostileRefManager.cpp b/src/server/game/Combat/HostileRefManager.cpp similarity index 100% rename from src/game/Combat/HostileRefManager.cpp rename to src/server/game/Combat/HostileRefManager.cpp diff --git a/src/game/Combat/HostileRefManager.h b/src/server/game/Combat/HostileRefManager.h similarity index 100% rename from src/game/Combat/HostileRefManager.h rename to src/server/game/Combat/HostileRefManager.h diff --git a/src/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp similarity index 100% rename from src/game/Combat/ThreatManager.cpp rename to src/server/game/Combat/ThreatManager.cpp diff --git a/src/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h similarity index 100% rename from src/game/Combat/ThreatManager.h rename to src/server/game/Combat/ThreatManager.h diff --git a/src/game/Combat/UnitEvents.h b/src/server/game/Combat/UnitEvents.h similarity index 100% rename from src/game/Combat/UnitEvents.h rename to src/server/game/Combat/UnitEvents.h diff --git a/src/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp similarity index 100% rename from src/game/Conditions/ConditionMgr.cpp rename to src/server/game/Conditions/ConditionMgr.cpp diff --git a/src/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h similarity index 100% rename from src/game/Conditions/ConditionMgr.h rename to src/server/game/Conditions/ConditionMgr.h diff --git a/src/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp similarity index 100% rename from src/game/Conditions/DisableMgr.cpp rename to src/server/game/Conditions/DisableMgr.cpp diff --git a/src/game/Conditions/DisableMgr.h b/src/server/game/Conditions/DisableMgr.h similarity index 100% rename from src/game/Conditions/DisableMgr.h rename to src/server/game/Conditions/DisableMgr.h diff --git a/src/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h similarity index 100% rename from src/game/DataStores/DBCEnums.h rename to src/server/game/DataStores/DBCEnums.h diff --git a/src/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp similarity index 100% rename from src/game/DataStores/DBCStores.cpp rename to src/server/game/DataStores/DBCStores.cpp diff --git a/src/game/DataStores/DBCStores.h b/src/server/game/DataStores/DBCStores.h similarity index 100% rename from src/game/DataStores/DBCStores.h rename to src/server/game/DataStores/DBCStores.h diff --git a/src/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h similarity index 100% rename from src/game/DataStores/DBCStructure.h rename to src/server/game/DataStores/DBCStructure.h diff --git a/src/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h similarity index 100% rename from src/game/DataStores/DBCfmt.h rename to src/server/game/DataStores/DBCfmt.h diff --git a/src/game/DungeonFinding/LFG.cpp b/src/server/game/DungeonFinding/LFG.cpp similarity index 100% rename from src/game/DungeonFinding/LFG.cpp rename to src/server/game/DungeonFinding/LFG.cpp diff --git a/src/game/DungeonFinding/LFG.h b/src/server/game/DungeonFinding/LFG.h similarity index 100% rename from src/game/DungeonFinding/LFG.h rename to src/server/game/DungeonFinding/LFG.h diff --git a/src/game/DungeonFinding/LFGGroupData.cpp b/src/server/game/DungeonFinding/LFGGroupData.cpp similarity index 100% rename from src/game/DungeonFinding/LFGGroupData.cpp rename to src/server/game/DungeonFinding/LFGGroupData.cpp diff --git a/src/game/DungeonFinding/LFGGroupData.h b/src/server/game/DungeonFinding/LFGGroupData.h similarity index 100% rename from src/game/DungeonFinding/LFGGroupData.h rename to src/server/game/DungeonFinding/LFGGroupData.h diff --git a/src/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp similarity index 100% rename from src/game/DungeonFinding/LFGMgr.cpp rename to src/server/game/DungeonFinding/LFGMgr.cpp diff --git a/src/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h similarity index 100% rename from src/game/DungeonFinding/LFGMgr.h rename to src/server/game/DungeonFinding/LFGMgr.h diff --git a/src/game/DungeonFinding/LFGPlayerData.cpp b/src/server/game/DungeonFinding/LFGPlayerData.cpp similarity index 100% rename from src/game/DungeonFinding/LFGPlayerData.cpp rename to src/server/game/DungeonFinding/LFGPlayerData.cpp diff --git a/src/game/DungeonFinding/LFGPlayerData.h b/src/server/game/DungeonFinding/LFGPlayerData.h similarity index 100% rename from src/game/DungeonFinding/LFGPlayerData.h rename to src/server/game/DungeonFinding/LFGPlayerData.h diff --git a/src/game/DungeonFinding/LFGQueue.cpp b/src/server/game/DungeonFinding/LFGQueue.cpp similarity index 100% rename from src/game/DungeonFinding/LFGQueue.cpp rename to src/server/game/DungeonFinding/LFGQueue.cpp diff --git a/src/game/DungeonFinding/LFGQueue.h b/src/server/game/DungeonFinding/LFGQueue.h similarity index 100% rename from src/game/DungeonFinding/LFGQueue.h rename to src/server/game/DungeonFinding/LFGQueue.h diff --git a/src/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp similarity index 100% rename from src/game/DungeonFinding/LFGScripts.cpp rename to src/server/game/DungeonFinding/LFGScripts.cpp diff --git a/src/game/DungeonFinding/LFGScripts.h b/src/server/game/DungeonFinding/LFGScripts.h similarity index 100% rename from src/game/DungeonFinding/LFGScripts.h rename to src/server/game/DungeonFinding/LFGScripts.h diff --git a/src/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp similarity index 100% rename from src/game/Entities/Corpse/Corpse.cpp rename to src/server/game/Entities/Corpse/Corpse.cpp diff --git a/src/game/Entities/Corpse/Corpse.h b/src/server/game/Entities/Corpse/Corpse.h similarity index 100% rename from src/game/Entities/Corpse/Corpse.h rename to src/server/game/Entities/Corpse/Corpse.h diff --git a/src/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp similarity index 100% rename from src/game/Entities/Creature/Creature.cpp rename to src/server/game/Entities/Creature/Creature.cpp diff --git a/src/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h similarity index 100% rename from src/game/Entities/Creature/Creature.h rename to src/server/game/Entities/Creature/Creature.h diff --git a/src/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp similarity index 100% rename from src/game/Entities/Creature/CreatureGroups.cpp rename to src/server/game/Entities/Creature/CreatureGroups.cpp diff --git a/src/game/Entities/Creature/CreatureGroups.h b/src/server/game/Entities/Creature/CreatureGroups.h similarity index 100% rename from src/game/Entities/Creature/CreatureGroups.h rename to src/server/game/Entities/Creature/CreatureGroups.h diff --git a/src/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp similarity index 100% rename from src/game/Entities/Creature/GossipDef.cpp rename to src/server/game/Entities/Creature/GossipDef.cpp diff --git a/src/game/Entities/Creature/GossipDef.h b/src/server/game/Entities/Creature/GossipDef.h similarity index 100% rename from src/game/Entities/Creature/GossipDef.h rename to src/server/game/Entities/Creature/GossipDef.h diff --git a/src/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp similarity index 100% rename from src/game/Entities/Creature/TemporarySummon.cpp rename to src/server/game/Entities/Creature/TemporarySummon.cpp diff --git a/src/game/Entities/Creature/TemporarySummon.h b/src/server/game/Entities/Creature/TemporarySummon.h similarity index 100% rename from src/game/Entities/Creature/TemporarySummon.h rename to src/server/game/Entities/Creature/TemporarySummon.h diff --git a/src/game/Entities/DynamicObject/DynamicObject.cpp b/src/server/game/Entities/DynamicObject/DynamicObject.cpp similarity index 100% rename from src/game/Entities/DynamicObject/DynamicObject.cpp rename to src/server/game/Entities/DynamicObject/DynamicObject.cpp diff --git a/src/game/Entities/DynamicObject/DynamicObject.h b/src/server/game/Entities/DynamicObject/DynamicObject.h similarity index 100% rename from src/game/Entities/DynamicObject/DynamicObject.h rename to src/server/game/Entities/DynamicObject/DynamicObject.h diff --git a/src/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp similarity index 100% rename from src/game/Entities/GameObject/GameObject.cpp rename to src/server/game/Entities/GameObject/GameObject.cpp diff --git a/src/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h similarity index 100% rename from src/game/Entities/GameObject/GameObject.h rename to src/server/game/Entities/GameObject/GameObject.h diff --git a/src/game/Entities/Item/Container/Bag.cpp b/src/server/game/Entities/Item/Container/Bag.cpp similarity index 100% rename from src/game/Entities/Item/Container/Bag.cpp rename to src/server/game/Entities/Item/Container/Bag.cpp diff --git a/src/game/Entities/Item/Container/Bag.h b/src/server/game/Entities/Item/Container/Bag.h similarity index 100% rename from src/game/Entities/Item/Container/Bag.h rename to src/server/game/Entities/Item/Container/Bag.h diff --git a/src/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp similarity index 100% rename from src/game/Entities/Item/Item.cpp rename to src/server/game/Entities/Item/Item.cpp diff --git a/src/game/Entities/Item/Item.h b/src/server/game/Entities/Item/Item.h similarity index 100% rename from src/game/Entities/Item/Item.h rename to src/server/game/Entities/Item/Item.h diff --git a/src/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp similarity index 100% rename from src/game/Entities/Item/ItemEnchantmentMgr.cpp rename to src/server/game/Entities/Item/ItemEnchantmentMgr.cpp diff --git a/src/game/Entities/Item/ItemEnchantmentMgr.h b/src/server/game/Entities/Item/ItemEnchantmentMgr.h similarity index 100% rename from src/game/Entities/Item/ItemEnchantmentMgr.h rename to src/server/game/Entities/Item/ItemEnchantmentMgr.h diff --git a/src/game/Entities/Item/ItemPrototype.h b/src/server/game/Entities/Item/ItemPrototype.h similarity index 100% rename from src/game/Entities/Item/ItemPrototype.h rename to src/server/game/Entities/Item/ItemPrototype.h diff --git a/src/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp similarity index 100% rename from src/game/Entities/Object/Object.cpp rename to src/server/game/Entities/Object/Object.cpp diff --git a/src/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h similarity index 100% rename from src/game/Entities/Object/Object.h rename to src/server/game/Entities/Object/Object.h diff --git a/src/game/Entities/Object/ObjectDefines.h b/src/server/game/Entities/Object/ObjectDefines.h similarity index 100% rename from src/game/Entities/Object/ObjectDefines.h rename to src/server/game/Entities/Object/ObjectDefines.h diff --git a/src/game/Entities/Object/ObjectPosSelector.cpp b/src/server/game/Entities/Object/ObjectPosSelector.cpp similarity index 100% rename from src/game/Entities/Object/ObjectPosSelector.cpp rename to src/server/game/Entities/Object/ObjectPosSelector.cpp diff --git a/src/game/Entities/Object/ObjectPosSelector.h b/src/server/game/Entities/Object/ObjectPosSelector.h similarity index 100% rename from src/game/Entities/Object/ObjectPosSelector.h rename to src/server/game/Entities/Object/ObjectPosSelector.h diff --git a/src/game/Entities/Object/Updates/UpdateData.cpp b/src/server/game/Entities/Object/Updates/UpdateData.cpp similarity index 100% rename from src/game/Entities/Object/Updates/UpdateData.cpp rename to src/server/game/Entities/Object/Updates/UpdateData.cpp diff --git a/src/game/Entities/Object/Updates/UpdateData.h b/src/server/game/Entities/Object/Updates/UpdateData.h similarity index 100% rename from src/game/Entities/Object/Updates/UpdateData.h rename to src/server/game/Entities/Object/Updates/UpdateData.h diff --git a/src/game/Entities/Object/Updates/UpdateFieldFlags.cpp b/src/server/game/Entities/Object/Updates/UpdateFieldFlags.cpp similarity index 100% rename from src/game/Entities/Object/Updates/UpdateFieldFlags.cpp rename to src/server/game/Entities/Object/Updates/UpdateFieldFlags.cpp diff --git a/src/game/Entities/Object/Updates/UpdateFieldFlags.h b/src/server/game/Entities/Object/Updates/UpdateFieldFlags.h similarity index 100% rename from src/game/Entities/Object/Updates/UpdateFieldFlags.h rename to src/server/game/Entities/Object/Updates/UpdateFieldFlags.h diff --git a/src/game/Entities/Object/Updates/UpdateFields.h b/src/server/game/Entities/Object/Updates/UpdateFields.h similarity index 100% rename from src/game/Entities/Object/Updates/UpdateFields.h rename to src/server/game/Entities/Object/Updates/UpdateFields.h diff --git a/src/game/Entities/Object/Updates/UpdateMask.h b/src/server/game/Entities/Object/Updates/UpdateMask.h similarity index 100% rename from src/game/Entities/Object/Updates/UpdateMask.h rename to src/server/game/Entities/Object/Updates/UpdateMask.h diff --git a/src/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp similarity index 100% rename from src/game/Entities/Pet/Pet.cpp rename to src/server/game/Entities/Pet/Pet.cpp diff --git a/src/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h similarity index 100% rename from src/game/Entities/Pet/Pet.h rename to src/server/game/Entities/Pet/Pet.h diff --git a/src/game/Entities/Pet/PetDefines.h b/src/server/game/Entities/Pet/PetDefines.h similarity index 100% rename from src/game/Entities/Pet/PetDefines.h rename to src/server/game/Entities/Pet/PetDefines.h diff --git a/src/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp similarity index 100% rename from src/game/Entities/Player/Player.cpp rename to src/server/game/Entities/Player/Player.cpp diff --git a/src/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h similarity index 100% rename from src/game/Entities/Player/Player.h rename to src/server/game/Entities/Player/Player.h diff --git a/src/game/Entities/Player/SocialMgr.cpp b/src/server/game/Entities/Player/SocialMgr.cpp similarity index 100% rename from src/game/Entities/Player/SocialMgr.cpp rename to src/server/game/Entities/Player/SocialMgr.cpp diff --git a/src/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h similarity index 100% rename from src/game/Entities/Player/SocialMgr.h rename to src/server/game/Entities/Player/SocialMgr.h diff --git a/src/game/Entities/Totem/Totem.cpp b/src/server/game/Entities/Totem/Totem.cpp similarity index 100% rename from src/game/Entities/Totem/Totem.cpp rename to src/server/game/Entities/Totem/Totem.cpp diff --git a/src/game/Entities/Totem/Totem.h b/src/server/game/Entities/Totem/Totem.h similarity index 100% rename from src/game/Entities/Totem/Totem.h rename to src/server/game/Entities/Totem/Totem.h diff --git a/src/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp similarity index 100% rename from src/game/Entities/Transport/Transport.cpp rename to src/server/game/Entities/Transport/Transport.cpp diff --git a/src/game/Entities/Transport/Transport.h b/src/server/game/Entities/Transport/Transport.h similarity index 100% rename from src/game/Entities/Transport/Transport.h rename to src/server/game/Entities/Transport/Transport.h diff --git a/src/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp similarity index 100% rename from src/game/Entities/Unit/StatSystem.cpp rename to src/server/game/Entities/Unit/StatSystem.cpp diff --git a/src/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp similarity index 100% rename from src/game/Entities/Unit/Unit.cpp rename to src/server/game/Entities/Unit/Unit.cpp diff --git a/src/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h similarity index 100% rename from src/game/Entities/Unit/Unit.h rename to src/server/game/Entities/Unit/Unit.h diff --git a/src/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp similarity index 100% rename from src/game/Entities/Vehicle/Vehicle.cpp rename to src/server/game/Entities/Vehicle/Vehicle.cpp diff --git a/src/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h similarity index 100% rename from src/game/Entities/Vehicle/Vehicle.h rename to src/server/game/Entities/Vehicle/Vehicle.h diff --git a/src/game/Entities/Vehicle/VehicleDefines.h b/src/server/game/Entities/Vehicle/VehicleDefines.h similarity index 100% rename from src/game/Entities/Vehicle/VehicleDefines.h rename to src/server/game/Entities/Vehicle/VehicleDefines.h diff --git a/src/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp similarity index 100% rename from src/game/Events/GameEventMgr.cpp rename to src/server/game/Events/GameEventMgr.cpp diff --git a/src/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h similarity index 100% rename from src/game/Events/GameEventMgr.h rename to src/server/game/Events/GameEventMgr.h diff --git a/src/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp similarity index 100% rename from src/game/Globals/ObjectAccessor.cpp rename to src/server/game/Globals/ObjectAccessor.cpp diff --git a/src/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h similarity index 100% rename from src/game/Globals/ObjectAccessor.h rename to src/server/game/Globals/ObjectAccessor.h diff --git a/src/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp similarity index 100% rename from src/game/Globals/ObjectMgr.cpp rename to src/server/game/Globals/ObjectMgr.cpp diff --git a/src/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h similarity index 100% rename from src/game/Globals/ObjectMgr.h rename to src/server/game/Globals/ObjectMgr.h diff --git a/src/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h similarity index 100% rename from src/game/Grids/Cells/Cell.h rename to src/server/game/Grids/Cells/Cell.h diff --git a/src/game/Grids/Cells/CellImpl.h b/src/server/game/Grids/Cells/CellImpl.h similarity index 100% rename from src/game/Grids/Cells/CellImpl.h rename to src/server/game/Grids/Cells/CellImpl.h diff --git a/src/game/Grids/Grid.h b/src/server/game/Grids/Grid.h similarity index 100% rename from src/game/Grids/Grid.h rename to src/server/game/Grids/Grid.h diff --git a/src/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h similarity index 100% rename from src/game/Grids/GridDefines.h rename to src/server/game/Grids/GridDefines.h diff --git a/src/game/Grids/GridLoader.h b/src/server/game/Grids/GridLoader.h similarity index 100% rename from src/game/Grids/GridLoader.h rename to src/server/game/Grids/GridLoader.h diff --git a/src/game/Grids/GridRefManager.h b/src/server/game/Grids/GridRefManager.h similarity index 100% rename from src/game/Grids/GridRefManager.h rename to src/server/game/Grids/GridRefManager.h diff --git a/src/game/Grids/GridReference.h b/src/server/game/Grids/GridReference.h similarity index 100% rename from src/game/Grids/GridReference.h rename to src/server/game/Grids/GridReference.h diff --git a/src/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h similarity index 100% rename from src/game/Grids/NGrid.h rename to src/server/game/Grids/NGrid.h diff --git a/src/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp similarity index 100% rename from src/game/Grids/Notifiers/GridNotifiers.cpp rename to src/server/game/Grids/Notifiers/GridNotifiers.cpp diff --git a/src/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h similarity index 100% rename from src/game/Grids/Notifiers/GridNotifiers.h rename to src/server/game/Grids/Notifiers/GridNotifiers.h diff --git a/src/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h similarity index 100% rename from src/game/Grids/Notifiers/GridNotifiersImpl.h rename to src/server/game/Grids/Notifiers/GridNotifiersImpl.h diff --git a/src/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp similarity index 100% rename from src/game/Grids/ObjectGridLoader.cpp rename to src/server/game/Grids/ObjectGridLoader.cpp diff --git a/src/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h similarity index 100% rename from src/game/Grids/ObjectGridLoader.h rename to src/server/game/Grids/ObjectGridLoader.h diff --git a/src/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp similarity index 100% rename from src/game/Groups/Group.cpp rename to src/server/game/Groups/Group.cpp diff --git a/src/game/Groups/Group.h b/src/server/game/Groups/Group.h similarity index 100% rename from src/game/Groups/Group.h rename to src/server/game/Groups/Group.h diff --git a/src/game/Groups/GroupMgr.cpp b/src/server/game/Groups/GroupMgr.cpp similarity index 100% rename from src/game/Groups/GroupMgr.cpp rename to src/server/game/Groups/GroupMgr.cpp diff --git a/src/game/Groups/GroupMgr.h b/src/server/game/Groups/GroupMgr.h similarity index 100% rename from src/game/Groups/GroupMgr.h rename to src/server/game/Groups/GroupMgr.h diff --git a/src/game/Groups/GroupRefManager.h b/src/server/game/Groups/GroupRefManager.h similarity index 100% rename from src/game/Groups/GroupRefManager.h rename to src/server/game/Groups/GroupRefManager.h diff --git a/src/game/Groups/GroupReference.cpp b/src/server/game/Groups/GroupReference.cpp similarity index 100% rename from src/game/Groups/GroupReference.cpp rename to src/server/game/Groups/GroupReference.cpp diff --git a/src/game/Groups/GroupReference.h b/src/server/game/Groups/GroupReference.h similarity index 100% rename from src/game/Groups/GroupReference.h rename to src/server/game/Groups/GroupReference.h diff --git a/src/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp similarity index 100% rename from src/game/Guilds/Guild.cpp rename to src/server/game/Guilds/Guild.cpp diff --git a/src/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h similarity index 100% rename from src/game/Guilds/Guild.h rename to src/server/game/Guilds/Guild.h diff --git a/src/game/Guilds/GuildMgr.cpp b/src/server/game/Guilds/GuildMgr.cpp similarity index 100% rename from src/game/Guilds/GuildMgr.cpp rename to src/server/game/Guilds/GuildMgr.cpp diff --git a/src/game/Guilds/GuildMgr.h b/src/server/game/Guilds/GuildMgr.h similarity index 100% rename from src/game/Guilds/GuildMgr.h rename to src/server/game/Guilds/GuildMgr.h diff --git a/src/game/Handlers/AddonHandler.cpp b/src/server/game/Handlers/AddonHandler.cpp similarity index 100% rename from src/game/Handlers/AddonHandler.cpp rename to src/server/game/Handlers/AddonHandler.cpp diff --git a/src/game/Handlers/AddonHandler.h b/src/server/game/Handlers/AddonHandler.h similarity index 100% rename from src/game/Handlers/AddonHandler.h rename to src/server/game/Handlers/AddonHandler.h diff --git a/src/game/Handlers/ArenaTeamHandler.cpp b/src/server/game/Handlers/ArenaTeamHandler.cpp similarity index 100% rename from src/game/Handlers/ArenaTeamHandler.cpp rename to src/server/game/Handlers/ArenaTeamHandler.cpp diff --git a/src/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp similarity index 100% rename from src/game/Handlers/AuctionHouseHandler.cpp rename to src/server/game/Handlers/AuctionHouseHandler.cpp diff --git a/src/game/Handlers/AuthHandler.cpp b/src/server/game/Handlers/AuthHandler.cpp similarity index 100% rename from src/game/Handlers/AuthHandler.cpp rename to src/server/game/Handlers/AuthHandler.cpp diff --git a/src/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp similarity index 100% rename from src/game/Handlers/BattleGroundHandler.cpp rename to src/server/game/Handlers/BattleGroundHandler.cpp diff --git a/src/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp similarity index 100% rename from src/game/Handlers/CalendarHandler.cpp rename to src/server/game/Handlers/CalendarHandler.cpp diff --git a/src/game/Handlers/ChannelHandler.cpp b/src/server/game/Handlers/ChannelHandler.cpp similarity index 100% rename from src/game/Handlers/ChannelHandler.cpp rename to src/server/game/Handlers/ChannelHandler.cpp diff --git a/src/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp similarity index 100% rename from src/game/Handlers/CharacterHandler.cpp rename to src/server/game/Handlers/CharacterHandler.cpp diff --git a/src/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp similarity index 100% rename from src/game/Handlers/ChatHandler.cpp rename to src/server/game/Handlers/ChatHandler.cpp diff --git a/src/game/Handlers/CombatHandler.cpp b/src/server/game/Handlers/CombatHandler.cpp similarity index 100% rename from src/game/Handlers/CombatHandler.cpp rename to src/server/game/Handlers/CombatHandler.cpp diff --git a/src/game/Handlers/DuelHandler.cpp b/src/server/game/Handlers/DuelHandler.cpp similarity index 100% rename from src/game/Handlers/DuelHandler.cpp rename to src/server/game/Handlers/DuelHandler.cpp diff --git a/src/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp similarity index 100% rename from src/game/Handlers/GroupHandler.cpp rename to src/server/game/Handlers/GroupHandler.cpp diff --git a/src/game/Handlers/GuildHandler.cpp b/src/server/game/Handlers/GuildHandler.cpp similarity index 100% rename from src/game/Handlers/GuildHandler.cpp rename to src/server/game/Handlers/GuildHandler.cpp diff --git a/src/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp similarity index 100% rename from src/game/Handlers/ItemHandler.cpp rename to src/server/game/Handlers/ItemHandler.cpp diff --git a/src/game/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp similarity index 100% rename from src/game/Handlers/LFGHandler.cpp rename to src/server/game/Handlers/LFGHandler.cpp diff --git a/src/game/Handlers/LootHandler.cpp b/src/server/game/Handlers/LootHandler.cpp similarity index 100% rename from src/game/Handlers/LootHandler.cpp rename to src/server/game/Handlers/LootHandler.cpp diff --git a/src/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp similarity index 100% rename from src/game/Handlers/MailHandler.cpp rename to src/server/game/Handlers/MailHandler.cpp diff --git a/src/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp similarity index 100% rename from src/game/Handlers/MiscHandler.cpp rename to src/server/game/Handlers/MiscHandler.cpp diff --git a/src/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp similarity index 100% rename from src/game/Handlers/MovementHandler.cpp rename to src/server/game/Handlers/MovementHandler.cpp diff --git a/src/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp similarity index 100% rename from src/game/Handlers/NPCHandler.cpp rename to src/server/game/Handlers/NPCHandler.cpp diff --git a/src/game/Handlers/NPCHandler.h b/src/server/game/Handlers/NPCHandler.h similarity index 100% rename from src/game/Handlers/NPCHandler.h rename to src/server/game/Handlers/NPCHandler.h diff --git a/src/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp similarity index 100% rename from src/game/Handlers/PetHandler.cpp rename to src/server/game/Handlers/PetHandler.cpp diff --git a/src/game/Handlers/PetitionsHandler.cpp b/src/server/game/Handlers/PetitionsHandler.cpp similarity index 100% rename from src/game/Handlers/PetitionsHandler.cpp rename to src/server/game/Handlers/PetitionsHandler.cpp diff --git a/src/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp similarity index 100% rename from src/game/Handlers/QueryHandler.cpp rename to src/server/game/Handlers/QueryHandler.cpp diff --git a/src/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp similarity index 100% rename from src/game/Handlers/QuestHandler.cpp rename to src/server/game/Handlers/QuestHandler.cpp diff --git a/src/game/Handlers/ReferAFriendHandler.cpp b/src/server/game/Handlers/ReferAFriendHandler.cpp similarity index 100% rename from src/game/Handlers/ReferAFriendHandler.cpp rename to src/server/game/Handlers/ReferAFriendHandler.cpp diff --git a/src/game/Handlers/SkillHandler.cpp b/src/server/game/Handlers/SkillHandler.cpp similarity index 100% rename from src/game/Handlers/SkillHandler.cpp rename to src/server/game/Handlers/SkillHandler.cpp diff --git a/src/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp similarity index 100% rename from src/game/Handlers/SpellHandler.cpp rename to src/server/game/Handlers/SpellHandler.cpp diff --git a/src/game/Handlers/TaxiHandler.cpp b/src/server/game/Handlers/TaxiHandler.cpp similarity index 100% rename from src/game/Handlers/TaxiHandler.cpp rename to src/server/game/Handlers/TaxiHandler.cpp diff --git a/src/game/Handlers/TicketHandler.cpp b/src/server/game/Handlers/TicketHandler.cpp similarity index 100% rename from src/game/Handlers/TicketHandler.cpp rename to src/server/game/Handlers/TicketHandler.cpp diff --git a/src/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp similarity index 100% rename from src/game/Handlers/TradeHandler.cpp rename to src/server/game/Handlers/TradeHandler.cpp diff --git a/src/game/Handlers/VehicleHandler.cpp b/src/server/game/Handlers/VehicleHandler.cpp similarity index 100% rename from src/game/Handlers/VehicleHandler.cpp rename to src/server/game/Handlers/VehicleHandler.cpp diff --git a/src/game/Handlers/VoiceChatHandler.cpp b/src/server/game/Handlers/VoiceChatHandler.cpp similarity index 100% rename from src/game/Handlers/VoiceChatHandler.cpp rename to src/server/game/Handlers/VoiceChatHandler.cpp diff --git a/src/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp similarity index 100% rename from src/game/Instances/InstanceSaveMgr.cpp rename to src/server/game/Instances/InstanceSaveMgr.cpp diff --git a/src/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h similarity index 100% rename from src/game/Instances/InstanceSaveMgr.h rename to src/server/game/Instances/InstanceSaveMgr.h diff --git a/src/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp similarity index 100% rename from src/game/Instances/InstanceScript.cpp rename to src/server/game/Instances/InstanceScript.cpp diff --git a/src/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h similarity index 100% rename from src/game/Instances/InstanceScript.h rename to src/server/game/Instances/InstanceScript.h diff --git a/src/game/Loot/LootItemStorage.cpp b/src/server/game/Loot/LootItemStorage.cpp similarity index 100% rename from src/game/Loot/LootItemStorage.cpp rename to src/server/game/Loot/LootItemStorage.cpp diff --git a/src/game/Loot/LootItemStorage.h b/src/server/game/Loot/LootItemStorage.h similarity index 100% rename from src/game/Loot/LootItemStorage.h rename to src/server/game/Loot/LootItemStorage.h diff --git a/src/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp similarity index 100% rename from src/game/Loot/LootMgr.cpp rename to src/server/game/Loot/LootMgr.cpp diff --git a/src/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h similarity index 100% rename from src/game/Loot/LootMgr.h rename to src/server/game/Loot/LootMgr.h diff --git a/src/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp similarity index 100% rename from src/game/Mails/Mail.cpp rename to src/server/game/Mails/Mail.cpp diff --git a/src/game/Mails/Mail.h b/src/server/game/Mails/Mail.h similarity index 100% rename from src/game/Mails/Mail.h rename to src/server/game/Mails/Mail.h diff --git a/src/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp similarity index 100% rename from src/game/Maps/Map.cpp rename to src/server/game/Maps/Map.cpp diff --git a/src/game/Maps/Map.h b/src/server/game/Maps/Map.h similarity index 100% rename from src/game/Maps/Map.h rename to src/server/game/Maps/Map.h diff --git a/src/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp similarity index 100% rename from src/game/Maps/MapInstanced.cpp rename to src/server/game/Maps/MapInstanced.cpp diff --git a/src/game/Maps/MapInstanced.h b/src/server/game/Maps/MapInstanced.h similarity index 100% rename from src/game/Maps/MapInstanced.h rename to src/server/game/Maps/MapInstanced.h diff --git a/src/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp similarity index 100% rename from src/game/Maps/MapManager.cpp rename to src/server/game/Maps/MapManager.cpp diff --git a/src/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h similarity index 100% rename from src/game/Maps/MapManager.h rename to src/server/game/Maps/MapManager.h diff --git a/src/game/Maps/MapRefManager.h b/src/server/game/Maps/MapRefManager.h similarity index 100% rename from src/game/Maps/MapRefManager.h rename to src/server/game/Maps/MapRefManager.h diff --git a/src/game/Maps/MapReference.h b/src/server/game/Maps/MapReference.h similarity index 100% rename from src/game/Maps/MapReference.h rename to src/server/game/Maps/MapReference.h diff --git a/src/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp similarity index 100% rename from src/game/Maps/MapUpdater.cpp rename to src/server/game/Maps/MapUpdater.cpp diff --git a/src/game/Maps/MapUpdater.h b/src/server/game/Maps/MapUpdater.h similarity index 100% rename from src/game/Maps/MapUpdater.h rename to src/server/game/Maps/MapUpdater.h diff --git a/src/game/Maps/TransportMgr.cpp b/src/server/game/Maps/TransportMgr.cpp similarity index 100% rename from src/game/Maps/TransportMgr.cpp rename to src/server/game/Maps/TransportMgr.cpp diff --git a/src/game/Maps/TransportMgr.h b/src/server/game/Maps/TransportMgr.h similarity index 100% rename from src/game/Maps/TransportMgr.h rename to src/server/game/Maps/TransportMgr.h diff --git a/src/game/Maps/ZoneScript.h b/src/server/game/Maps/ZoneScript.h similarity index 100% rename from src/game/Maps/ZoneScript.h rename to src/server/game/Maps/ZoneScript.h diff --git a/src/game/Misc/AsyncAuctionListing.cpp b/src/server/game/Misc/AsyncAuctionListing.cpp similarity index 100% rename from src/game/Misc/AsyncAuctionListing.cpp rename to src/server/game/Misc/AsyncAuctionListing.cpp diff --git a/src/game/Misc/AsyncAuctionListing.h b/src/server/game/Misc/AsyncAuctionListing.h similarity index 100% rename from src/game/Misc/AsyncAuctionListing.h rename to src/server/game/Misc/AsyncAuctionListing.h diff --git a/src/game/Misc/AvgDiffTracker.cpp b/src/server/game/Misc/AvgDiffTracker.cpp similarity index 100% rename from src/game/Misc/AvgDiffTracker.cpp rename to src/server/game/Misc/AvgDiffTracker.cpp diff --git a/src/game/Misc/AvgDiffTracker.h b/src/server/game/Misc/AvgDiffTracker.h similarity index 100% rename from src/game/Misc/AvgDiffTracker.h rename to src/server/game/Misc/AvgDiffTracker.h diff --git a/src/game/Misc/DynamicVisibility.cpp b/src/server/game/Misc/DynamicVisibility.cpp similarity index 100% rename from src/game/Misc/DynamicVisibility.cpp rename to src/server/game/Misc/DynamicVisibility.cpp diff --git a/src/game/Misc/DynamicVisibility.h b/src/server/game/Misc/DynamicVisibility.h similarity index 100% rename from src/game/Misc/DynamicVisibility.h rename to src/server/game/Misc/DynamicVisibility.h diff --git a/src/game/Misc/SavingSystem.cpp b/src/server/game/Misc/SavingSystem.cpp similarity index 100% rename from src/game/Misc/SavingSystem.cpp rename to src/server/game/Misc/SavingSystem.cpp diff --git a/src/game/Misc/SavingSystem.h b/src/server/game/Misc/SavingSystem.h similarity index 100% rename from src/game/Misc/SavingSystem.h rename to src/server/game/Misc/SavingSystem.h diff --git a/src/game/Misc/WhoListCache.cpp b/src/server/game/Misc/WhoListCache.cpp similarity index 100% rename from src/game/Misc/WhoListCache.cpp rename to src/server/game/Misc/WhoListCache.cpp diff --git a/src/game/Misc/WhoListCache.h b/src/server/game/Misc/WhoListCache.h similarity index 100% rename from src/game/Misc/WhoListCache.h rename to src/server/game/Misc/WhoListCache.h diff --git a/src/game/Miscellaneous/Formulas.h b/src/server/game/Miscellaneous/Formulas.h similarity index 100% rename from src/game/Miscellaneous/Formulas.h rename to src/server/game/Miscellaneous/Formulas.h diff --git a/src/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h similarity index 100% rename from src/game/Miscellaneous/Language.h rename to src/server/game/Miscellaneous/Language.h diff --git a/src/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h similarity index 100% rename from src/game/Miscellaneous/SharedDefines.h rename to src/server/game/Miscellaneous/SharedDefines.h diff --git a/src/game/Movement/FollowerRefManager.h b/src/server/game/Movement/FollowerRefManager.h similarity index 100% rename from src/game/Movement/FollowerRefManager.h rename to src/server/game/Movement/FollowerRefManager.h diff --git a/src/game/Movement/FollowerReference.cpp b/src/server/game/Movement/FollowerReference.cpp similarity index 100% rename from src/game/Movement/FollowerReference.cpp rename to src/server/game/Movement/FollowerReference.cpp diff --git a/src/game/Movement/FollowerReference.h b/src/server/game/Movement/FollowerReference.h similarity index 100% rename from src/game/Movement/FollowerReference.h rename to src/server/game/Movement/FollowerReference.h diff --git a/src/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp similarity index 100% rename from src/game/Movement/MotionMaster.cpp rename to src/server/game/Movement/MotionMaster.cpp diff --git a/src/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h similarity index 100% rename from src/game/Movement/MotionMaster.h rename to src/server/game/Movement/MotionMaster.h diff --git a/src/game/Movement/MovementGenerator.cpp b/src/server/game/Movement/MovementGenerator.cpp similarity index 100% rename from src/game/Movement/MovementGenerator.cpp rename to src/server/game/Movement/MovementGenerator.cpp diff --git a/src/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h similarity index 100% rename from src/game/Movement/MovementGenerator.h rename to src/server/game/Movement/MovementGenerator.h diff --git a/src/game/Movement/MovementGeneratorImpl.h b/src/server/game/Movement/MovementGeneratorImpl.h similarity index 100% rename from src/game/Movement/MovementGeneratorImpl.h rename to src/server/game/Movement/MovementGeneratorImpl.h diff --git a/src/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp similarity index 100% rename from src/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp rename to src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp diff --git a/src/game/Movement/MovementGenerators/ConfusedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h similarity index 100% rename from src/game/Movement/MovementGenerators/ConfusedMovementGenerator.h rename to src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h diff --git a/src/game/Movement/MovementGenerators/EscortMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp similarity index 100% rename from src/game/Movement/MovementGenerators/EscortMovementGenerator.cpp rename to src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp diff --git a/src/game/Movement/MovementGenerators/EscortMovementGenerator.h b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.h similarity index 100% rename from src/game/Movement/MovementGenerators/EscortMovementGenerator.h rename to src/server/game/Movement/MovementGenerators/EscortMovementGenerator.h diff --git a/src/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp similarity index 100% rename from src/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp rename to src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp diff --git a/src/game/Movement/MovementGenerators/FleeingMovementGenerator.h b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h similarity index 100% rename from src/game/Movement/MovementGenerators/FleeingMovementGenerator.h rename to src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h diff --git a/src/game/Movement/MovementGenerators/HomeMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp similarity index 100% rename from src/game/Movement/MovementGenerators/HomeMovementGenerator.cpp rename to src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp diff --git a/src/game/Movement/MovementGenerators/HomeMovementGenerator.h b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h similarity index 100% rename from src/game/Movement/MovementGenerators/HomeMovementGenerator.h rename to src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h diff --git a/src/game/Movement/MovementGenerators/IdleMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp similarity index 100% rename from src/game/Movement/MovementGenerators/IdleMovementGenerator.cpp rename to src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp diff --git a/src/game/Movement/MovementGenerators/IdleMovementGenerator.h b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h similarity index 100% rename from src/game/Movement/MovementGenerators/IdleMovementGenerator.h rename to src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h diff --git a/src/game/Movement/MovementGenerators/PathGenerator.cpp b/src/server/game/Movement/MovementGenerators/PathGenerator.cpp similarity index 100% rename from src/game/Movement/MovementGenerators/PathGenerator.cpp rename to src/server/game/Movement/MovementGenerators/PathGenerator.cpp diff --git a/src/game/Movement/MovementGenerators/PathGenerator.h b/src/server/game/Movement/MovementGenerators/PathGenerator.h similarity index 100% rename from src/game/Movement/MovementGenerators/PathGenerator.h rename to src/server/game/Movement/MovementGenerators/PathGenerator.h diff --git a/src/game/Movement/MovementGenerators/PointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp similarity index 100% rename from src/game/Movement/MovementGenerators/PointMovementGenerator.cpp rename to src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp diff --git a/src/game/Movement/MovementGenerators/PointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h similarity index 100% rename from src/game/Movement/MovementGenerators/PointMovementGenerator.h rename to src/server/game/Movement/MovementGenerators/PointMovementGenerator.h diff --git a/src/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp similarity index 100% rename from src/game/Movement/MovementGenerators/RandomMovementGenerator.cpp rename to src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp diff --git a/src/game/Movement/MovementGenerators/RandomMovementGenerator.h b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h similarity index 100% rename from src/game/Movement/MovementGenerators/RandomMovementGenerator.h rename to src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h diff --git a/src/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp similarity index 100% rename from src/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp rename to src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp diff --git a/src/game/Movement/MovementGenerators/TargetedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h similarity index 100% rename from src/game/Movement/MovementGenerators/TargetedMovementGenerator.h rename to src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h diff --git a/src/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp similarity index 100% rename from src/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp rename to src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp diff --git a/src/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h similarity index 100% rename from src/game/Movement/MovementGenerators/WaypointMovementGenerator.h rename to src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h diff --git a/src/game/Movement/Spline/MoveSpline.cpp b/src/server/game/Movement/Spline/MoveSpline.cpp similarity index 100% rename from src/game/Movement/Spline/MoveSpline.cpp rename to src/server/game/Movement/Spline/MoveSpline.cpp diff --git a/src/game/Movement/Spline/MoveSpline.h b/src/server/game/Movement/Spline/MoveSpline.h similarity index 100% rename from src/game/Movement/Spline/MoveSpline.h rename to src/server/game/Movement/Spline/MoveSpline.h diff --git a/src/game/Movement/Spline/MoveSplineFlag.h b/src/server/game/Movement/Spline/MoveSplineFlag.h similarity index 100% rename from src/game/Movement/Spline/MoveSplineFlag.h rename to src/server/game/Movement/Spline/MoveSplineFlag.h diff --git a/src/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp similarity index 100% rename from src/game/Movement/Spline/MoveSplineInit.cpp rename to src/server/game/Movement/Spline/MoveSplineInit.cpp diff --git a/src/game/Movement/Spline/MoveSplineInit.h b/src/server/game/Movement/Spline/MoveSplineInit.h similarity index 100% rename from src/game/Movement/Spline/MoveSplineInit.h rename to src/server/game/Movement/Spline/MoveSplineInit.h diff --git a/src/game/Movement/Spline/MoveSplineInitArgs.h b/src/server/game/Movement/Spline/MoveSplineInitArgs.h similarity index 100% rename from src/game/Movement/Spline/MoveSplineInitArgs.h rename to src/server/game/Movement/Spline/MoveSplineInitArgs.h diff --git a/src/game/Movement/Spline/MovementPacketBuilder.cpp b/src/server/game/Movement/Spline/MovementPacketBuilder.cpp similarity index 100% rename from src/game/Movement/Spline/MovementPacketBuilder.cpp rename to src/server/game/Movement/Spline/MovementPacketBuilder.cpp diff --git a/src/game/Movement/Spline/MovementPacketBuilder.h b/src/server/game/Movement/Spline/MovementPacketBuilder.h similarity index 100% rename from src/game/Movement/Spline/MovementPacketBuilder.h rename to src/server/game/Movement/Spline/MovementPacketBuilder.h diff --git a/src/game/Movement/Spline/MovementTypedefs.h b/src/server/game/Movement/Spline/MovementTypedefs.h similarity index 100% rename from src/game/Movement/Spline/MovementTypedefs.h rename to src/server/game/Movement/Spline/MovementTypedefs.h diff --git a/src/game/Movement/Spline/MovementUtil.cpp b/src/server/game/Movement/Spline/MovementUtil.cpp similarity index 100% rename from src/game/Movement/Spline/MovementUtil.cpp rename to src/server/game/Movement/Spline/MovementUtil.cpp diff --git a/src/game/Movement/Spline/Spline.cpp b/src/server/game/Movement/Spline/Spline.cpp similarity index 100% rename from src/game/Movement/Spline/Spline.cpp rename to src/server/game/Movement/Spline/Spline.cpp diff --git a/src/game/Movement/Spline/Spline.h b/src/server/game/Movement/Spline/Spline.h similarity index 100% rename from src/game/Movement/Spline/Spline.h rename to src/server/game/Movement/Spline/Spline.h diff --git a/src/game/Movement/Spline/SplineImpl.h b/src/server/game/Movement/Spline/SplineImpl.h similarity index 100% rename from src/game/Movement/Spline/SplineImpl.h rename to src/server/game/Movement/Spline/SplineImpl.h diff --git a/src/game/Movement/Waypoints/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointManager.cpp similarity index 100% rename from src/game/Movement/Waypoints/WaypointManager.cpp rename to src/server/game/Movement/Waypoints/WaypointManager.cpp diff --git a/src/game/Movement/Waypoints/WaypointManager.h b/src/server/game/Movement/Waypoints/WaypointManager.h similarity index 100% rename from src/game/Movement/Waypoints/WaypointManager.h rename to src/server/game/Movement/Waypoints/WaypointManager.h diff --git a/src/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp similarity index 100% rename from src/game/OutdoorPvP/OutdoorPvP.cpp rename to src/server/game/OutdoorPvP/OutdoorPvP.cpp diff --git a/src/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h similarity index 100% rename from src/game/OutdoorPvP/OutdoorPvP.h rename to src/server/game/OutdoorPvP/OutdoorPvP.h diff --git a/src/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp similarity index 100% rename from src/game/OutdoorPvP/OutdoorPvPMgr.cpp rename to src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp diff --git a/src/game/OutdoorPvP/OutdoorPvPMgr.h b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h similarity index 100% rename from src/game/OutdoorPvP/OutdoorPvPMgr.h rename to src/server/game/OutdoorPvP/OutdoorPvPMgr.h diff --git a/src/game/Petitions/PetitionMgr.cpp b/src/server/game/Petitions/PetitionMgr.cpp similarity index 100% rename from src/game/Petitions/PetitionMgr.cpp rename to src/server/game/Petitions/PetitionMgr.cpp diff --git a/src/game/Petitions/PetitionMgr.h b/src/server/game/Petitions/PetitionMgr.h similarity index 100% rename from src/game/Petitions/PetitionMgr.h rename to src/server/game/Petitions/PetitionMgr.h diff --git a/src/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp similarity index 100% rename from src/game/Pools/PoolMgr.cpp rename to src/server/game/Pools/PoolMgr.cpp diff --git a/src/game/Pools/PoolMgr.h b/src/server/game/Pools/PoolMgr.h similarity index 100% rename from src/game/Pools/PoolMgr.h rename to src/server/game/Pools/PoolMgr.h diff --git a/src/game/PrecompiledHeaders/gamePCH.cpp b/src/server/game/PrecompiledHeaders/gamePCH.cpp similarity index 100% rename from src/game/PrecompiledHeaders/gamePCH.cpp rename to src/server/game/PrecompiledHeaders/gamePCH.cpp diff --git a/src/game/PrecompiledHeaders/gamePCH.h b/src/server/game/PrecompiledHeaders/gamePCH.h similarity index 100% rename from src/game/PrecompiledHeaders/gamePCH.h rename to src/server/game/PrecompiledHeaders/gamePCH.h diff --git a/src/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp similarity index 100% rename from src/game/Quests/QuestDef.cpp rename to src/server/game/Quests/QuestDef.cpp diff --git a/src/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h similarity index 100% rename from src/game/Quests/QuestDef.h rename to src/server/game/Quests/QuestDef.h diff --git a/src/game/Reputation/ReputationMgr.cpp b/src/server/game/Reputation/ReputationMgr.cpp similarity index 100% rename from src/game/Reputation/ReputationMgr.cpp rename to src/server/game/Reputation/ReputationMgr.cpp diff --git a/src/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h similarity index 100% rename from src/game/Reputation/ReputationMgr.h rename to src/server/game/Reputation/ReputationMgr.h diff --git a/src/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp similarity index 100% rename from src/game/Scripting/MapScripts.cpp rename to src/server/game/Scripting/MapScripts.cpp diff --git a/src/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp similarity index 100% rename from src/game/Scripting/ScriptMgr.cpp rename to src/server/game/Scripting/ScriptMgr.cpp diff --git a/src/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h similarity index 100% rename from src/game/Scripting/ScriptMgr.h rename to src/server/game/Scripting/ScriptMgr.h diff --git a/src/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp similarity index 100% rename from src/game/Scripting/ScriptSystem.cpp rename to src/server/game/Scripting/ScriptSystem.cpp diff --git a/src/game/Scripting/ScriptSystem.h b/src/server/game/Scripting/ScriptSystem.h similarity index 100% rename from src/game/Scripting/ScriptSystem.h rename to src/server/game/Scripting/ScriptSystem.h diff --git a/src/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp similarity index 100% rename from src/game/Server/Protocol/Opcodes.cpp rename to src/server/game/Server/Protocol/Opcodes.cpp diff --git a/src/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h similarity index 100% rename from src/game/Server/Protocol/Opcodes.h rename to src/server/game/Server/Protocol/Opcodes.h diff --git a/src/game/Server/Protocol/PacketLog.cpp b/src/server/game/Server/Protocol/PacketLog.cpp similarity index 100% rename from src/game/Server/Protocol/PacketLog.cpp rename to src/server/game/Server/Protocol/PacketLog.cpp diff --git a/src/game/Server/Protocol/PacketLog.h b/src/server/game/Server/Protocol/PacketLog.h similarity index 100% rename from src/game/Server/Protocol/PacketLog.h rename to src/server/game/Server/Protocol/PacketLog.h diff --git a/src/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp similarity index 100% rename from src/game/Server/WorldSession.cpp rename to src/server/game/Server/WorldSession.cpp diff --git a/src/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h similarity index 100% rename from src/game/Server/WorldSession.h rename to src/server/game/Server/WorldSession.h diff --git a/src/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp similarity index 100% rename from src/game/Server/WorldSocket.cpp rename to src/server/game/Server/WorldSocket.cpp diff --git a/src/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h similarity index 100% rename from src/game/Server/WorldSocket.h rename to src/server/game/Server/WorldSocket.h diff --git a/src/game/Server/WorldSocketAcceptor.h b/src/server/game/Server/WorldSocketAcceptor.h similarity index 100% rename from src/game/Server/WorldSocketAcceptor.h rename to src/server/game/Server/WorldSocketAcceptor.h diff --git a/src/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp similarity index 100% rename from src/game/Server/WorldSocketMgr.cpp rename to src/server/game/Server/WorldSocketMgr.cpp diff --git a/src/game/Server/WorldSocketMgr.h b/src/server/game/Server/WorldSocketMgr.h similarity index 100% rename from src/game/Server/WorldSocketMgr.h rename to src/server/game/Server/WorldSocketMgr.h diff --git a/src/game/Skills/SkillDiscovery.cpp b/src/server/game/Skills/SkillDiscovery.cpp similarity index 100% rename from src/game/Skills/SkillDiscovery.cpp rename to src/server/game/Skills/SkillDiscovery.cpp diff --git a/src/game/Skills/SkillDiscovery.h b/src/server/game/Skills/SkillDiscovery.h similarity index 100% rename from src/game/Skills/SkillDiscovery.h rename to src/server/game/Skills/SkillDiscovery.h diff --git a/src/game/Skills/SkillExtraItems.cpp b/src/server/game/Skills/SkillExtraItems.cpp similarity index 100% rename from src/game/Skills/SkillExtraItems.cpp rename to src/server/game/Skills/SkillExtraItems.cpp diff --git a/src/game/Skills/SkillExtraItems.h b/src/server/game/Skills/SkillExtraItems.h similarity index 100% rename from src/game/Skills/SkillExtraItems.h rename to src/server/game/Skills/SkillExtraItems.h diff --git a/src/game/Spells/Auras/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h similarity index 100% rename from src/game/Spells/Auras/SpellAuraDefines.h rename to src/server/game/Spells/Auras/SpellAuraDefines.h diff --git a/src/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp similarity index 100% rename from src/game/Spells/Auras/SpellAuraEffects.cpp rename to src/server/game/Spells/Auras/SpellAuraEffects.cpp diff --git a/src/game/Spells/Auras/SpellAuraEffects.h b/src/server/game/Spells/Auras/SpellAuraEffects.h similarity index 100% rename from src/game/Spells/Auras/SpellAuraEffects.h rename to src/server/game/Spells/Auras/SpellAuraEffects.h diff --git a/src/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp similarity index 100% rename from src/game/Spells/Auras/SpellAuras.cpp rename to src/server/game/Spells/Auras/SpellAuras.cpp diff --git a/src/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h similarity index 100% rename from src/game/Spells/Auras/SpellAuras.h rename to src/server/game/Spells/Auras/SpellAuras.h diff --git a/src/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp similarity index 100% rename from src/game/Spells/Spell.cpp rename to src/server/game/Spells/Spell.cpp diff --git a/src/game/Spells/Spell.h b/src/server/game/Spells/Spell.h similarity index 100% rename from src/game/Spells/Spell.h rename to src/server/game/Spells/Spell.h diff --git a/src/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp similarity index 100% rename from src/game/Spells/SpellEffects.cpp rename to src/server/game/Spells/SpellEffects.cpp diff --git a/src/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp similarity index 100% rename from src/game/Spells/SpellInfo.cpp rename to src/server/game/Spells/SpellInfo.cpp diff --git a/src/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h similarity index 100% rename from src/game/Spells/SpellInfo.h rename to src/server/game/Spells/SpellInfo.h diff --git a/src/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp similarity index 100% rename from src/game/Spells/SpellMgr.cpp rename to src/server/game/Spells/SpellMgr.cpp diff --git a/src/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h similarity index 100% rename from src/game/Spells/SpellMgr.h rename to src/server/game/Spells/SpellMgr.h diff --git a/src/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp similarity index 100% rename from src/game/Spells/SpellScript.cpp rename to src/server/game/Spells/SpellScript.cpp diff --git a/src/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h similarity index 100% rename from src/game/Spells/SpellScript.h rename to src/server/game/Spells/SpellScript.h diff --git a/src/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp similarity index 100% rename from src/game/Texts/CreatureTextMgr.cpp rename to src/server/game/Texts/CreatureTextMgr.cpp diff --git a/src/game/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h similarity index 100% rename from src/game/Texts/CreatureTextMgr.h rename to src/server/game/Texts/CreatureTextMgr.h diff --git a/src/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp similarity index 100% rename from src/game/Tickets/TicketMgr.cpp rename to src/server/game/Tickets/TicketMgr.cpp diff --git a/src/game/Tickets/TicketMgr.h b/src/server/game/Tickets/TicketMgr.h similarity index 100% rename from src/game/Tickets/TicketMgr.h rename to src/server/game/Tickets/TicketMgr.h diff --git a/src/game/Tools/CharacterDatabaseCleaner.cpp b/src/server/game/Tools/CharacterDatabaseCleaner.cpp similarity index 100% rename from src/game/Tools/CharacterDatabaseCleaner.cpp rename to src/server/game/Tools/CharacterDatabaseCleaner.cpp diff --git a/src/game/Tools/CharacterDatabaseCleaner.h b/src/server/game/Tools/CharacterDatabaseCleaner.h similarity index 100% rename from src/game/Tools/CharacterDatabaseCleaner.h rename to src/server/game/Tools/CharacterDatabaseCleaner.h diff --git a/src/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp similarity index 100% rename from src/game/Tools/PlayerDump.cpp rename to src/server/game/Tools/PlayerDump.cpp diff --git a/src/game/Tools/PlayerDump.h b/src/server/game/Tools/PlayerDump.h similarity index 100% rename from src/game/Tools/PlayerDump.h rename to src/server/game/Tools/PlayerDump.h diff --git a/src/game/Warden/Modules/WardenModuleMac.h b/src/server/game/Warden/Modules/WardenModuleMac.h similarity index 100% rename from src/game/Warden/Modules/WardenModuleMac.h rename to src/server/game/Warden/Modules/WardenModuleMac.h diff --git a/src/game/Warden/Modules/WardenModuleWin.h b/src/server/game/Warden/Modules/WardenModuleWin.h similarity index 100% rename from src/game/Warden/Modules/WardenModuleWin.h rename to src/server/game/Warden/Modules/WardenModuleWin.h diff --git a/src/game/Warden/Warden.cpp b/src/server/game/Warden/Warden.cpp similarity index 100% rename from src/game/Warden/Warden.cpp rename to src/server/game/Warden/Warden.cpp diff --git a/src/game/Warden/Warden.h b/src/server/game/Warden/Warden.h similarity index 100% rename from src/game/Warden/Warden.h rename to src/server/game/Warden/Warden.h diff --git a/src/game/Warden/WardenCheckMgr.cpp b/src/server/game/Warden/WardenCheckMgr.cpp similarity index 100% rename from src/game/Warden/WardenCheckMgr.cpp rename to src/server/game/Warden/WardenCheckMgr.cpp diff --git a/src/game/Warden/WardenCheckMgr.h b/src/server/game/Warden/WardenCheckMgr.h similarity index 100% rename from src/game/Warden/WardenCheckMgr.h rename to src/server/game/Warden/WardenCheckMgr.h diff --git a/src/game/Warden/WardenMac.cpp b/src/server/game/Warden/WardenMac.cpp similarity index 100% rename from src/game/Warden/WardenMac.cpp rename to src/server/game/Warden/WardenMac.cpp diff --git a/src/game/Warden/WardenMac.h b/src/server/game/Warden/WardenMac.h similarity index 100% rename from src/game/Warden/WardenMac.h rename to src/server/game/Warden/WardenMac.h diff --git a/src/game/Warden/WardenWin.cpp b/src/server/game/Warden/WardenWin.cpp similarity index 100% rename from src/game/Warden/WardenWin.cpp rename to src/server/game/Warden/WardenWin.cpp diff --git a/src/game/Warden/WardenWin.h b/src/server/game/Warden/WardenWin.h similarity index 100% rename from src/game/Warden/WardenWin.h rename to src/server/game/Warden/WardenWin.h diff --git a/src/game/Weather/Weather.cpp b/src/server/game/Weather/Weather.cpp similarity index 100% rename from src/game/Weather/Weather.cpp rename to src/server/game/Weather/Weather.cpp diff --git a/src/game/Weather/Weather.h b/src/server/game/Weather/Weather.h similarity index 100% rename from src/game/Weather/Weather.h rename to src/server/game/Weather/Weather.h diff --git a/src/game/Weather/WeatherMgr.cpp b/src/server/game/Weather/WeatherMgr.cpp similarity index 100% rename from src/game/Weather/WeatherMgr.cpp rename to src/server/game/Weather/WeatherMgr.cpp diff --git a/src/game/Weather/WeatherMgr.h b/src/server/game/Weather/WeatherMgr.h similarity index 100% rename from src/game/Weather/WeatherMgr.h rename to src/server/game/Weather/WeatherMgr.h diff --git a/src/game/World/World.cpp b/src/server/game/World/World.cpp similarity index 100% rename from src/game/World/World.cpp rename to src/server/game/World/World.cpp diff --git a/src/game/World/World.h b/src/server/game/World/World.h similarity index 100% rename from src/game/World/World.h rename to src/server/game/World/World.h diff --git a/src/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt similarity index 100% rename from src/scripts/CMakeLists.txt rename to src/server/scripts/CMakeLists.txt diff --git a/src/scripts/Commands/CMakeLists.txt b/src/server/scripts/Commands/CMakeLists.txt similarity index 100% rename from src/scripts/Commands/CMakeLists.txt rename to src/server/scripts/Commands/CMakeLists.txt diff --git a/src/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp similarity index 100% rename from src/scripts/Commands/cs_account.cpp rename to src/server/scripts/Commands/cs_account.cpp diff --git a/src/scripts/Commands/cs_achievement.cpp b/src/server/scripts/Commands/cs_achievement.cpp similarity index 100% rename from src/scripts/Commands/cs_achievement.cpp rename to src/server/scripts/Commands/cs_achievement.cpp diff --git a/src/scripts/Commands/cs_ban.cpp b/src/server/scripts/Commands/cs_ban.cpp similarity index 100% rename from src/scripts/Commands/cs_ban.cpp rename to src/server/scripts/Commands/cs_ban.cpp diff --git a/src/scripts/Commands/cs_bf.cpp b/src/server/scripts/Commands/cs_bf.cpp similarity index 100% rename from src/scripts/Commands/cs_bf.cpp rename to src/server/scripts/Commands/cs_bf.cpp diff --git a/src/scripts/Commands/cs_cast.cpp b/src/server/scripts/Commands/cs_cast.cpp similarity index 100% rename from src/scripts/Commands/cs_cast.cpp rename to src/server/scripts/Commands/cs_cast.cpp diff --git a/src/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp similarity index 100% rename from src/scripts/Commands/cs_character.cpp rename to src/server/scripts/Commands/cs_character.cpp diff --git a/src/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp similarity index 100% rename from src/scripts/Commands/cs_debug.cpp rename to src/server/scripts/Commands/cs_debug.cpp diff --git a/src/scripts/Commands/cs_disable.cpp b/src/server/scripts/Commands/cs_disable.cpp similarity index 100% rename from src/scripts/Commands/cs_disable.cpp rename to src/server/scripts/Commands/cs_disable.cpp diff --git a/src/scripts/Commands/cs_event.cpp b/src/server/scripts/Commands/cs_event.cpp similarity index 100% rename from src/scripts/Commands/cs_event.cpp rename to src/server/scripts/Commands/cs_event.cpp diff --git a/src/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp similarity index 100% rename from src/scripts/Commands/cs_gm.cpp rename to src/server/scripts/Commands/cs_gm.cpp diff --git a/src/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp similarity index 100% rename from src/scripts/Commands/cs_go.cpp rename to src/server/scripts/Commands/cs_go.cpp diff --git a/src/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp similarity index 100% rename from src/scripts/Commands/cs_gobject.cpp rename to src/server/scripts/Commands/cs_gobject.cpp diff --git a/src/scripts/Commands/cs_guild.cpp b/src/server/scripts/Commands/cs_guild.cpp similarity index 100% rename from src/scripts/Commands/cs_guild.cpp rename to src/server/scripts/Commands/cs_guild.cpp diff --git a/src/scripts/Commands/cs_honor.cpp b/src/server/scripts/Commands/cs_honor.cpp similarity index 100% rename from src/scripts/Commands/cs_honor.cpp rename to src/server/scripts/Commands/cs_honor.cpp diff --git a/src/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp similarity index 100% rename from src/scripts/Commands/cs_instance.cpp rename to src/server/scripts/Commands/cs_instance.cpp diff --git a/src/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp similarity index 100% rename from src/scripts/Commands/cs_learn.cpp rename to src/server/scripts/Commands/cs_learn.cpp diff --git a/src/scripts/Commands/cs_lfg.cpp b/src/server/scripts/Commands/cs_lfg.cpp similarity index 100% rename from src/scripts/Commands/cs_lfg.cpp rename to src/server/scripts/Commands/cs_lfg.cpp diff --git a/src/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp similarity index 100% rename from src/scripts/Commands/cs_list.cpp rename to src/server/scripts/Commands/cs_list.cpp diff --git a/src/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp similarity index 100% rename from src/scripts/Commands/cs_lookup.cpp rename to src/server/scripts/Commands/cs_lookup.cpp diff --git a/src/scripts/Commands/cs_message.cpp b/src/server/scripts/Commands/cs_message.cpp similarity index 100% rename from src/scripts/Commands/cs_message.cpp rename to src/server/scripts/Commands/cs_message.cpp diff --git a/src/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp similarity index 100% rename from src/scripts/Commands/cs_misc.cpp rename to src/server/scripts/Commands/cs_misc.cpp diff --git a/src/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp similarity index 100% rename from src/scripts/Commands/cs_modify.cpp rename to src/server/scripts/Commands/cs_modify.cpp diff --git a/src/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp similarity index 100% rename from src/scripts/Commands/cs_npc.cpp rename to src/server/scripts/Commands/cs_npc.cpp diff --git a/src/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp similarity index 100% rename from src/scripts/Commands/cs_quest.cpp rename to src/server/scripts/Commands/cs_quest.cpp diff --git a/src/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp similarity index 100% rename from src/scripts/Commands/cs_reload.cpp rename to src/server/scripts/Commands/cs_reload.cpp diff --git a/src/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp similarity index 100% rename from src/scripts/Commands/cs_reset.cpp rename to src/server/scripts/Commands/cs_reset.cpp diff --git a/src/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp similarity index 100% rename from src/scripts/Commands/cs_server.cpp rename to src/server/scripts/Commands/cs_server.cpp diff --git a/src/scripts/Commands/cs_spectator.cpp b/src/server/scripts/Commands/cs_spectator.cpp similarity index 100% rename from src/scripts/Commands/cs_spectator.cpp rename to src/server/scripts/Commands/cs_spectator.cpp diff --git a/src/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp similarity index 100% rename from src/scripts/Commands/cs_tele.cpp rename to src/server/scripts/Commands/cs_tele.cpp diff --git a/src/scripts/Commands/cs_ticket.cpp b/src/server/scripts/Commands/cs_ticket.cpp similarity index 100% rename from src/scripts/Commands/cs_ticket.cpp rename to src/server/scripts/Commands/cs_ticket.cpp diff --git a/src/scripts/Commands/cs_titles.cpp b/src/server/scripts/Commands/cs_titles.cpp similarity index 100% rename from src/scripts/Commands/cs_titles.cpp rename to src/server/scripts/Commands/cs_titles.cpp diff --git a/src/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp similarity index 100% rename from src/scripts/Commands/cs_wp.cpp rename to src/server/scripts/Commands/cs_wp.cpp diff --git a/src/scripts/Custom/README.md b/src/server/scripts/Custom/README.md similarity index 100% rename from src/scripts/Custom/README.md rename to src/server/scripts/Custom/README.md diff --git a/src/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp similarity index 100% rename from src/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp rename to src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp diff --git a/src/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp similarity index 100% rename from src/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp rename to src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp diff --git a/src/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp similarity index 100% rename from src/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp rename to src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp diff --git a/src/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp similarity index 100% rename from src/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp rename to src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp diff --git a/src/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp similarity index 100% rename from src/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp rename to src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h similarity index 100% rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h diff --git a/src/scripts/EasternKingdoms/CMakeLists.txt b/src/server/scripts/EasternKingdoms/CMakeLists.txt similarity index 100% rename from src/scripts/EasternKingdoms/CMakeLists.txt rename to src/server/scripts/EasternKingdoms/CMakeLists.txt diff --git a/src/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp similarity index 100% rename from src/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp rename to src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp diff --git a/src/scripts/EasternKingdoms/Deadmines/deadmines.h b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h similarity index 100% rename from src/scripts/EasternKingdoms/Deadmines/deadmines.h rename to src/server/scripts/EasternKingdoms/Deadmines/deadmines.h diff --git a/src/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp similarity index 100% rename from src/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp rename to src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp diff --git a/src/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp similarity index 100% rename from src/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp rename to src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp similarity index 100% rename from src/scripts/EasternKingdoms/Karazhan/boss_curator.cpp rename to src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp similarity index 100% rename from src/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp rename to src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp similarity index 100% rename from src/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp rename to src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp similarity index 100% rename from src/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp rename to src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp similarity index 100% rename from src/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp rename to src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp similarity index 100% rename from src/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp rename to src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp similarity index 100% rename from src/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp rename to src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp similarity index 100% rename from src/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp rename to src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp similarity index 100% rename from src/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp rename to src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp similarity index 100% rename from src/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp rename to src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp diff --git a/src/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp similarity index 100% rename from src/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp rename to src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp diff --git a/src/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp similarity index 100% rename from src/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp rename to src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp diff --git a/src/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp similarity index 100% rename from src/scripts/EasternKingdoms/Karazhan/karazhan.cpp rename to src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp diff --git a/src/scripts/EasternKingdoms/Karazhan/karazhan.h b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h similarity index 100% rename from src/scripts/EasternKingdoms/Karazhan/karazhan.h rename to src/server/scripts/EasternKingdoms/Karazhan/karazhan.h diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp similarity index 100% rename from src/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp rename to src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp similarity index 100% rename from src/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp rename to src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp similarity index 100% rename from src/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp rename to src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp similarity index 100% rename from src/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp rename to src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp similarity index 100% rename from src/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp rename to src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h similarity index 100% rename from src/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h rename to src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h diff --git a/src/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp rename to src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp diff --git a/src/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp rename to src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp diff --git a/src/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp rename to src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp diff --git a/src/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp rename to src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp diff --git a/src/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp rename to src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp diff --git a/src/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp similarity index 100% rename from src/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp rename to src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp diff --git a/src/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp similarity index 100% rename from src/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp rename to src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp diff --git a/src/scripts/EasternKingdoms/Scholomance/scholomance.h b/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h similarity index 100% rename from src/scripts/EasternKingdoms/Scholomance/scholomance.h rename to src/server/scripts/EasternKingdoms/Scholomance/scholomance.h diff --git a/src/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp rename to src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp diff --git a/src/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h similarity index 100% rename from src/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h rename to src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h diff --git a/src/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp similarity index 100% rename from src/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp rename to src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp diff --git a/src/scripts/EasternKingdoms/Stratholme/stratholme.h b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h similarity index 100% rename from src/scripts/EasternKingdoms/Stratholme/stratholme.h rename to src/server/scripts/EasternKingdoms/Stratholme/stratholme.h diff --git a/src/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp similarity index 100% rename from src/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp rename to src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp diff --git a/src/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h similarity index 100% rename from src/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h rename to src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp similarity index 100% rename from src/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp rename to src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp similarity index 100% rename from src/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp rename to src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp similarity index 100% rename from src/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp rename to src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp similarity index 100% rename from src/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp rename to src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp similarity index 100% rename from src/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp rename to src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp similarity index 100% rename from src/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp rename to src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp similarity index 100% rename from src/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp rename to src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h similarity index 100% rename from src/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h rename to src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h diff --git a/src/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp b/src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp similarity index 100% rename from src/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp rename to src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp diff --git a/src/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp similarity index 100% rename from src/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp rename to src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp diff --git a/src/scripts/EasternKingdoms/Uldaman/uldaman.h b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h similarity index 100% rename from src/scripts/EasternKingdoms/Uldaman/uldaman.h rename to src/server/scripts/EasternKingdoms/Uldaman/uldaman.h diff --git a/src/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp rename to src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp diff --git a/src/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp rename to src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp diff --git a/src/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp rename to src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp diff --git a/src/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp rename to src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp diff --git a/src/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp rename to src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp diff --git a/src/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp rename to src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp diff --git a/src/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp rename to src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp diff --git a/src/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulAman/zulaman.cpp rename to src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp diff --git a/src/scripts/EasternKingdoms/ZulAman/zulaman.h b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h similarity index 100% rename from src/scripts/EasternKingdoms/ZulAman/zulaman.h rename to src/server/scripts/EasternKingdoms/ZulAman/zulaman.h diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp diff --git a/src/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp similarity index 100% rename from src/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp rename to src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp diff --git a/src/scripts/EasternKingdoms/ZulGurub/zulgurub.h b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h similarity index 100% rename from src/scripts/EasternKingdoms/ZulGurub/zulgurub.h rename to src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h diff --git a/src/scripts/EasternKingdoms/zone_alterac_mountains.cpp b/src/server/scripts/EasternKingdoms/zone_alterac_mountains.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_alterac_mountains.cpp rename to src/server/scripts/EasternKingdoms/zone_alterac_mountains.cpp diff --git a/src/scripts/EasternKingdoms/zone_arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_arathi_highlands.cpp rename to src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp diff --git a/src/scripts/EasternKingdoms/zone_blasted_lands.cpp b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_blasted_lands.cpp rename to src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp diff --git a/src/scripts/EasternKingdoms/zone_burning_steppes.cpp b/src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_burning_steppes.cpp rename to src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp diff --git a/src/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_duskwood.cpp rename to src/server/scripts/EasternKingdoms/zone_duskwood.cpp diff --git a/src/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp rename to src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp diff --git a/src/scripts/EasternKingdoms/zone_eversong_woods.cpp b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_eversong_woods.cpp rename to src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp diff --git a/src/scripts/EasternKingdoms/zone_ghostlands.cpp b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_ghostlands.cpp rename to src/server/scripts/EasternKingdoms/zone_ghostlands.cpp diff --git a/src/scripts/EasternKingdoms/zone_hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_hinterlands.cpp rename to src/server/scripts/EasternKingdoms/zone_hinterlands.cpp diff --git a/src/scripts/EasternKingdoms/zone_ironforge.cpp b/src/server/scripts/EasternKingdoms/zone_ironforge.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_ironforge.cpp rename to src/server/scripts/EasternKingdoms/zone_ironforge.cpp diff --git a/src/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp rename to src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp diff --git a/src/scripts/EasternKingdoms/zone_loch_modan.cpp b/src/server/scripts/EasternKingdoms/zone_loch_modan.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_loch_modan.cpp rename to src/server/scripts/EasternKingdoms/zone_loch_modan.cpp diff --git a/src/scripts/EasternKingdoms/zone_redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_redridge_mountains.cpp rename to src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp diff --git a/src/scripts/EasternKingdoms/zone_silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_silverpine_forest.cpp rename to src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp diff --git a/src/scripts/EasternKingdoms/zone_stormwind_city.cpp b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_stormwind_city.cpp rename to src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp diff --git a/src/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp rename to src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp diff --git a/src/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp b/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp rename to src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp diff --git a/src/scripts/EasternKingdoms/zone_tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_tirisfal_glades.cpp rename to src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp diff --git a/src/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_undercity.cpp rename to src/server/scripts/EasternKingdoms/zone_undercity.cpp diff --git a/src/scripts/EasternKingdoms/zone_western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_western_plaguelands.cpp rename to src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp diff --git a/src/scripts/EasternKingdoms/zone_westfall.cpp b/src/server/scripts/EasternKingdoms/zone_westfall.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_westfall.cpp rename to src/server/scripts/EasternKingdoms/zone_westfall.cpp diff --git a/src/scripts/EasternKingdoms/zone_wetlands.cpp b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp similarity index 100% rename from src/scripts/EasternKingdoms/zone_wetlands.cpp rename to src/server/scripts/EasternKingdoms/zone_wetlands.cpp diff --git a/src/scripts/Events/CMakeLists.txt b/src/server/scripts/Events/CMakeLists.txt similarity index 100% rename from src/scripts/Events/CMakeLists.txt rename to src/server/scripts/Events/CMakeLists.txt diff --git a/src/scripts/Events/brewfest.cpp b/src/server/scripts/Events/brewfest.cpp similarity index 100% rename from src/scripts/Events/brewfest.cpp rename to src/server/scripts/Events/brewfest.cpp diff --git a/src/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp similarity index 100% rename from src/scripts/Events/childrens_week.cpp rename to src/server/scripts/Events/childrens_week.cpp diff --git a/src/scripts/Events/hallows_end.cpp b/src/server/scripts/Events/hallows_end.cpp similarity index 100% rename from src/scripts/Events/hallows_end.cpp rename to src/server/scripts/Events/hallows_end.cpp diff --git a/src/scripts/Events/love_in_air.cpp b/src/server/scripts/Events/love_in_air.cpp similarity index 100% rename from src/scripts/Events/love_in_air.cpp rename to src/server/scripts/Events/love_in_air.cpp diff --git a/src/scripts/Events/midsummer.cpp b/src/server/scripts/Events/midsummer.cpp similarity index 100% rename from src/scripts/Events/midsummer.cpp rename to src/server/scripts/Events/midsummer.cpp diff --git a/src/scripts/Events/pilgrims_bounty.cpp b/src/server/scripts/Events/pilgrims_bounty.cpp similarity index 100% rename from src/scripts/Events/pilgrims_bounty.cpp rename to src/server/scripts/Events/pilgrims_bounty.cpp diff --git a/src/scripts/Events/winter_veil.cpp b/src/server/scripts/Events/winter_veil.cpp similarity index 100% rename from src/scripts/Events/winter_veil.cpp rename to src/server/scripts/Events/winter_veil.cpp diff --git a/src/scripts/GenLoader.cpp.cmake b/src/server/scripts/GenLoader.cpp.cmake similarity index 100% rename from src/scripts/GenLoader.cpp.cmake rename to src/server/scripts/GenLoader.cpp.cmake diff --git a/src/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h similarity index 100% rename from src/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h rename to src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h diff --git a/src/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp similarity index 100% rename from src/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp rename to src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp diff --git a/src/scripts/Kalimdor/CMakeLists.txt b/src/server/scripts/Kalimdor/CMakeLists.txt similarity index 100% rename from src/scripts/Kalimdor/CMakeLists.txt rename to src/server/scripts/Kalimdor/CMakeLists.txt diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h diff --git a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h rename to src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp rename to src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h similarity index 100% rename from src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h rename to src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h diff --git a/src/scripts/Kalimdor/DireMaul/dire_maul.h b/src/server/scripts/Kalimdor/DireMaul/dire_maul.h similarity index 100% rename from src/scripts/Kalimdor/DireMaul/dire_maul.h rename to src/server/scripts/Kalimdor/DireMaul/dire_maul.h diff --git a/src/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp similarity index 100% rename from src/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp rename to src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp diff --git a/src/scripts/Kalimdor/Maraudon/instance_maraudon.cpp b/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp similarity index 100% rename from src/scripts/Kalimdor/Maraudon/instance_maraudon.cpp rename to src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp diff --git a/src/scripts/Kalimdor/Maraudon/maraudon.h b/src/server/scripts/Kalimdor/Maraudon/maraudon.h similarity index 100% rename from src/scripts/Kalimdor/Maraudon/maraudon.h rename to src/server/scripts/Kalimdor/Maraudon/maraudon.h diff --git a/src/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp similarity index 100% rename from src/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp rename to src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp diff --git a/src/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp similarity index 100% rename from src/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp rename to src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp diff --git a/src/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h similarity index 100% rename from src/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h rename to src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h diff --git a/src/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp b/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp similarity index 100% rename from src/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp rename to src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp diff --git a/src/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp similarity index 100% rename from src/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp rename to src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp diff --git a/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp similarity index 100% rename from src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp rename to src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp diff --git a/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h similarity index 100% rename from src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h rename to src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h diff --git a/src/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp similarity index 100% rename from src/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp rename to src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp diff --git a/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp similarity index 100% rename from src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp rename to src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp diff --git a/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp similarity index 100% rename from src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp rename to src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp diff --git a/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp similarity index 100% rename from src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp rename to src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp diff --git a/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp similarity index 100% rename from src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp rename to src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp diff --git a/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp similarity index 100% rename from src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp rename to src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp diff --git a/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp similarity index 100% rename from src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp rename to src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp diff --git a/src/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp similarity index 100% rename from src/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp rename to src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp diff --git a/src/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h similarity index 100% rename from src/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h rename to src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp similarity index 100% rename from src/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp similarity index 100% rename from src/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp similarity index 100% rename from src/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp similarity index 100% rename from src/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp similarity index 100% rename from src/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp similarity index 100% rename from src/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp similarity index 100% rename from src/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp similarity index 100% rename from src/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp similarity index 100% rename from src/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp similarity index 100% rename from src/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp similarity index 100% rename from src/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h similarity index 100% rename from src/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h diff --git a/src/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp similarity index 100% rename from src/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp rename to src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp diff --git a/src/scripts/Kalimdor/WailingCaverns/wailing_caverns.h b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h similarity index 100% rename from src/scripts/Kalimdor/WailingCaverns/wailing_caverns.h rename to src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h diff --git a/src/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp similarity index 100% rename from src/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp rename to src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp diff --git a/src/scripts/Kalimdor/ZulFarrak/zulfarrak.h b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h similarity index 100% rename from src/scripts/Kalimdor/ZulFarrak/zulfarrak.h rename to src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h diff --git a/src/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp similarity index 100% rename from src/scripts/Kalimdor/boss_azuregos.cpp rename to src/server/scripts/Kalimdor/boss_azuregos.cpp diff --git a/src/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_ashenvale.cpp rename to src/server/scripts/Kalimdor/zone_ashenvale.cpp diff --git a/src/scripts/Kalimdor/zone_azshara.cpp b/src/server/scripts/Kalimdor/zone_azshara.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_azshara.cpp rename to src/server/scripts/Kalimdor/zone_azshara.cpp diff --git a/src/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_azuremyst_isle.cpp rename to src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp diff --git a/src/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_bloodmyst_isle.cpp rename to src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp diff --git a/src/scripts/Kalimdor/zone_darkshore.cpp b/src/server/scripts/Kalimdor/zone_darkshore.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_darkshore.cpp rename to src/server/scripts/Kalimdor/zone_darkshore.cpp diff --git a/src/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_desolace.cpp rename to src/server/scripts/Kalimdor/zone_desolace.cpp diff --git a/src/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_durotar.cpp rename to src/server/scripts/Kalimdor/zone_durotar.cpp diff --git a/src/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_dustwallow_marsh.cpp rename to src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp diff --git a/src/scripts/Kalimdor/zone_felwood.cpp b/src/server/scripts/Kalimdor/zone_felwood.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_felwood.cpp rename to src/server/scripts/Kalimdor/zone_felwood.cpp diff --git a/src/scripts/Kalimdor/zone_feralas.cpp b/src/server/scripts/Kalimdor/zone_feralas.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_feralas.cpp rename to src/server/scripts/Kalimdor/zone_feralas.cpp diff --git a/src/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_moonglade.cpp rename to src/server/scripts/Kalimdor/zone_moonglade.cpp diff --git a/src/scripts/Kalimdor/zone_mulgore.cpp b/src/server/scripts/Kalimdor/zone_mulgore.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_mulgore.cpp rename to src/server/scripts/Kalimdor/zone_mulgore.cpp diff --git a/src/scripts/Kalimdor/zone_orgrimmar.cpp b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_orgrimmar.cpp rename to src/server/scripts/Kalimdor/zone_orgrimmar.cpp diff --git a/src/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_silithus.cpp rename to src/server/scripts/Kalimdor/zone_silithus.cpp diff --git a/src/scripts/Kalimdor/zone_stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_stonetalon_mountains.cpp rename to src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp diff --git a/src/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_tanaris.cpp rename to src/server/scripts/Kalimdor/zone_tanaris.cpp diff --git a/src/scripts/Kalimdor/zone_teldrassil.cpp b/src/server/scripts/Kalimdor/zone_teldrassil.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_teldrassil.cpp rename to src/server/scripts/Kalimdor/zone_teldrassil.cpp diff --git a/src/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_the_barrens.cpp rename to src/server/scripts/Kalimdor/zone_the_barrens.cpp diff --git a/src/scripts/Kalimdor/zone_thousand_needles.cpp b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_thousand_needles.cpp rename to src/server/scripts/Kalimdor/zone_thousand_needles.cpp diff --git a/src/scripts/Kalimdor/zone_thunder_bluff.cpp b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_thunder_bluff.cpp rename to src/server/scripts/Kalimdor/zone_thunder_bluff.cpp diff --git a/src/scripts/Kalimdor/zone_ungoro_crater.cpp b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_ungoro_crater.cpp rename to src/server/scripts/Kalimdor/zone_ungoro_crater.cpp diff --git a/src/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp similarity index 100% rename from src/scripts/Kalimdor/zone_winterspring.cpp rename to src/server/scripts/Kalimdor/zone_winterspring.cpp diff --git a/src/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h similarity index 100% rename from src/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h rename to src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h diff --git a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp similarity index 100% rename from src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp rename to src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp diff --git a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp similarity index 100% rename from src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp rename to src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp diff --git a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp similarity index 100% rename from src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp rename to src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp diff --git a/src/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp similarity index 100% rename from src/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp rename to src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp diff --git a/src/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h similarity index 100% rename from src/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h rename to src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h diff --git a/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp similarity index 100% rename from src/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp rename to src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp diff --git a/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp similarity index 100% rename from src/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp rename to src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp diff --git a/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp similarity index 100% rename from src/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp rename to src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp diff --git a/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp similarity index 100% rename from src/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp rename to src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp diff --git a/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp similarity index 100% rename from src/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp rename to src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp diff --git a/src/scripts/Northrend/AzjolNerub/ahnkahet/def_ahnkahet.h b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/def_ahnkahet.h similarity index 100% rename from src/scripts/Northrend/AzjolNerub/ahnkahet/def_ahnkahet.h rename to src/server/scripts/Northrend/AzjolNerub/ahnkahet/def_ahnkahet.h diff --git a/src/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp similarity index 100% rename from src/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp rename to src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp diff --git a/src/scripts/Northrend/CMakeLists.txt b/src/server/scripts/Northrend/CMakeLists.txt similarity index 100% rename from src/scripts/Northrend/CMakeLists.txt rename to src/server/scripts/Northrend/CMakeLists.txt diff --git a/src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp similarity index 100% rename from src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp rename to src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp diff --git a/src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp similarity index 100% rename from src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp rename to src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp diff --git a/src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h similarity index 100% rename from src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h rename to src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp similarity index 100% rename from src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp rename to src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp similarity index 100% rename from src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp rename to src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp similarity index 100% rename from src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp rename to src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp similarity index 100% rename from src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp rename to src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp similarity index 100% rename from src/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp rename to src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h similarity index 100% rename from src/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h rename to src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp similarity index 100% rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp similarity index 100% rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp similarity index 100% rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp similarity index 100% rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp similarity index 100% rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h similarity index 100% rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp similarity index 100% rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp similarity index 100% rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp similarity index 100% rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp similarity index 100% rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp similarity index 100% rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp similarity index 100% rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp similarity index 100% rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h similarity index 100% rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h diff --git a/src/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp similarity index 100% rename from src/scripts/Northrend/DraktharonKeep/boss_dred.cpp rename to src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp diff --git a/src/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp similarity index 100% rename from src/scripts/Northrend/DraktharonKeep/boss_novos.cpp rename to src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp diff --git a/src/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp similarity index 100% rename from src/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp rename to src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp diff --git a/src/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp similarity index 100% rename from src/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp rename to src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp diff --git a/src/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h similarity index 100% rename from src/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h rename to src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h diff --git a/src/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp similarity index 100% rename from src/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp rename to src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp diff --git a/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp similarity index 100% rename from src/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp rename to src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp diff --git a/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp similarity index 100% rename from src/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp rename to src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp diff --git a/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp similarity index 100% rename from src/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp rename to src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp diff --git a/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h similarity index 100% rename from src/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h rename to src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h diff --git a/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp similarity index 100% rename from src/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp rename to src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp diff --git a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp similarity index 100% rename from src/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp rename to src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp diff --git a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp similarity index 100% rename from src/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp rename to src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp diff --git a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp similarity index 100% rename from src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp rename to src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp diff --git a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h similarity index 100% rename from src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h rename to src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h diff --git a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp similarity index 100% rename from src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp rename to src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp diff --git a/src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp similarity index 100% rename from src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp rename to src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp diff --git a/src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp similarity index 100% rename from src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp rename to src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp diff --git a/src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp similarity index 100% rename from src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp rename to src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp diff --git a/src/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp similarity index 100% rename from src/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp rename to src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp diff --git a/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp similarity index 100% rename from src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp rename to src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp diff --git a/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h similarity index 100% rename from src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h rename to src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h diff --git a/src/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp similarity index 100% rename from src/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp rename to src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp diff --git a/src/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp similarity index 100% rename from src/scripts/Northrend/Gundrak/boss_eck.cpp rename to src/server/scripts/Northrend/Gundrak/boss_eck.cpp diff --git a/src/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp similarity index 100% rename from src/scripts/Northrend/Gundrak/boss_gal_darah.cpp rename to src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp diff --git a/src/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp similarity index 100% rename from src/scripts/Northrend/Gundrak/boss_moorabi.cpp rename to src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp diff --git a/src/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp similarity index 100% rename from src/scripts/Northrend/Gundrak/boss_slad_ran.cpp rename to src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp diff --git a/src/scripts/Northrend/Gundrak/gundrak.h b/src/server/scripts/Northrend/Gundrak/gundrak.h similarity index 100% rename from src/scripts/Northrend/Gundrak/gundrak.h rename to src/server/scripts/Northrend/Gundrak/gundrak.h diff --git a/src/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp similarity index 100% rename from src/scripts/Northrend/Gundrak/instance_gundrak.cpp rename to src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp similarity index 100% rename from src/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp rename to src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp similarity index 100% rename from src/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp rename to src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp similarity index 100% rename from src/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp rename to src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp similarity index 100% rename from src/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp rename to src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp similarity index 100% rename from src/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp rename to src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp similarity index 100% rename from src/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp rename to src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp similarity index 100% rename from src/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp rename to src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp similarity index 100% rename from src/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp rename to src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp similarity index 100% rename from src/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp rename to src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp similarity index 100% rename from src/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp rename to src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp similarity index 100% rename from src/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp rename to src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp similarity index 100% rename from src/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp rename to src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp diff --git a/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp similarity index 100% rename from src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp rename to src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp diff --git a/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h similarity index 100% rename from src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h rename to src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h diff --git a/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp similarity index 100% rename from src/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp rename to src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp diff --git a/src/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp similarity index 100% rename from src/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp rename to src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp diff --git a/src/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp similarity index 100% rename from src/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp rename to src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp diff --git a/src/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp similarity index 100% rename from src/scripts/Northrend/Naxxramas/boss_faerlina.cpp rename to src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp diff --git a/src/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp similarity index 100% rename from src/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp rename to src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp diff --git a/src/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp similarity index 100% rename from src/scripts/Northrend/Naxxramas/boss_gluth.cpp rename to src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp diff --git a/src/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp similarity index 100% rename from src/scripts/Northrend/Naxxramas/boss_gothik.cpp rename to src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp diff --git a/src/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp similarity index 100% rename from src/scripts/Northrend/Naxxramas/boss_grobbulus.cpp rename to src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp diff --git a/src/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp similarity index 100% rename from src/scripts/Northrend/Naxxramas/boss_heigan.cpp rename to src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp diff --git a/src/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp similarity index 100% rename from src/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp rename to src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp diff --git a/src/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp similarity index 100% rename from src/scripts/Northrend/Naxxramas/boss_loatheb.cpp rename to src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp diff --git a/src/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp similarity index 100% rename from src/scripts/Northrend/Naxxramas/boss_maexxna.cpp rename to src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp diff --git a/src/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp similarity index 100% rename from src/scripts/Northrend/Naxxramas/boss_noth.cpp rename to src/server/scripts/Northrend/Naxxramas/boss_noth.cpp diff --git a/src/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp similarity index 100% rename from src/scripts/Northrend/Naxxramas/boss_patchwerk.cpp rename to src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp diff --git a/src/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp similarity index 100% rename from src/scripts/Northrend/Naxxramas/boss_razuvious.cpp rename to src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp diff --git a/src/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp similarity index 100% rename from src/scripts/Northrend/Naxxramas/boss_sapphiron.cpp rename to src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp diff --git a/src/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp similarity index 100% rename from src/scripts/Northrend/Naxxramas/boss_thaddius.cpp rename to src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp diff --git a/src/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp similarity index 100% rename from src/scripts/Northrend/Naxxramas/instance_naxxramas.cpp rename to src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp diff --git a/src/scripts/Northrend/Naxxramas/naxxramas.h b/src/server/scripts/Northrend/Naxxramas/naxxramas.h similarity index 100% rename from src/scripts/Northrend/Naxxramas/naxxramas.h rename to src/server/scripts/Northrend/Naxxramas/naxxramas.h diff --git a/src/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp similarity index 100% rename from src/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp rename to src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp diff --git a/src/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h b/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h similarity index 100% rename from src/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h rename to src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h diff --git a/src/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp similarity index 100% rename from src/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp rename to src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp diff --git a/src/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp similarity index 100% rename from src/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp rename to src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp diff --git a/src/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp similarity index 100% rename from src/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp rename to src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp diff --git a/src/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp similarity index 100% rename from src/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp rename to src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp diff --git a/src/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp similarity index 100% rename from src/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp rename to src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp diff --git a/src/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp similarity index 100% rename from src/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp rename to src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp diff --git a/src/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp similarity index 100% rename from src/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp rename to src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp diff --git a/src/scripts/Northrend/Nexus/Nexus/nexus.h b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h similarity index 100% rename from src/scripts/Northrend/Nexus/Nexus/nexus.h rename to src/server/scripts/Northrend/Nexus/Nexus/nexus.h diff --git a/src/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp similarity index 100% rename from src/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp rename to src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp diff --git a/src/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp similarity index 100% rename from src/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp rename to src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp diff --git a/src/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp similarity index 100% rename from src/scripts/Northrend/Nexus/Oculus/boss_urom.cpp rename to src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp diff --git a/src/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp similarity index 100% rename from src/scripts/Northrend/Nexus/Oculus/boss_varos.cpp rename to src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp diff --git a/src/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp similarity index 100% rename from src/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp rename to src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp diff --git a/src/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp similarity index 100% rename from src/scripts/Northrend/Nexus/Oculus/oculus.cpp rename to src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp diff --git a/src/scripts/Northrend/Nexus/Oculus/oculus.h b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h similarity index 100% rename from src/scripts/Northrend/Nexus/Oculus/oculus.h rename to src/server/scripts/Northrend/Nexus/Oculus/oculus.h diff --git a/src/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp rename to src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp diff --git a/src/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp rename to src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp diff --git a/src/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp rename to src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp diff --git a/src/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp rename to src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp diff --git a/src/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h similarity index 100% rename from src/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h rename to src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h diff --git a/src/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp rename to src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp diff --git a/src/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp rename to src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp diff --git a/src/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp rename to src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp diff --git a/src/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp rename to src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp diff --git a/src/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp rename to src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp diff --git a/src/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h similarity index 100% rename from src/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h rename to src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h diff --git a/src/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp rename to src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp diff --git a/src/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp rename to src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp diff --git a/src/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp similarity index 100% rename from src/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp rename to src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp diff --git a/src/scripts/Northrend/Ulduar/Ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h similarity index 100% rename from src/scripts/Northrend/Ulduar/Ulduar/ulduar.h rename to src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp similarity index 100% rename from src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp rename to src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp similarity index 100% rename from src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp rename to src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp similarity index 100% rename from src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp rename to src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp similarity index 100% rename from src/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp rename to src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp similarity index 100% rename from src/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp rename to src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h similarity index 100% rename from src/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h rename to src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp similarity index 100% rename from src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp rename to src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp similarity index 100% rename from src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp rename to src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp similarity index 100% rename from src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp rename to src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp similarity index 100% rename from src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp rename to src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp similarity index 100% rename from src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp rename to src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h similarity index 100% rename from src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h rename to src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h diff --git a/src/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp similarity index 100% rename from src/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp rename to src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp diff --git a/src/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp similarity index 100% rename from src/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp rename to src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp diff --git a/src/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp similarity index 100% rename from src/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp rename to src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp diff --git a/src/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp similarity index 100% rename from src/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp rename to src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp diff --git a/src/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp similarity index 100% rename from src/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp rename to src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp diff --git a/src/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h similarity index 100% rename from src/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h rename to src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h diff --git a/src/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp similarity index 100% rename from src/scripts/Northrend/VioletHold/boss_cyanigosa.cpp rename to src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp diff --git a/src/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp similarity index 100% rename from src/scripts/Northrend/VioletHold/boss_erekem.cpp rename to src/server/scripts/Northrend/VioletHold/boss_erekem.cpp diff --git a/src/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp similarity index 100% rename from src/scripts/Northrend/VioletHold/boss_ichoron.cpp rename to src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp diff --git a/src/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp similarity index 100% rename from src/scripts/Northrend/VioletHold/boss_lavanthor.cpp rename to src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp diff --git a/src/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp similarity index 100% rename from src/scripts/Northrend/VioletHold/boss_moragg.cpp rename to src/server/scripts/Northrend/VioletHold/boss_moragg.cpp diff --git a/src/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp similarity index 100% rename from src/scripts/Northrend/VioletHold/boss_xevozz.cpp rename to src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp diff --git a/src/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp similarity index 100% rename from src/scripts/Northrend/VioletHold/boss_zuramat.cpp rename to src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp diff --git a/src/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp similarity index 100% rename from src/scripts/Northrend/VioletHold/instance_violet_hold.cpp rename to src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp diff --git a/src/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp similarity index 100% rename from src/scripts/Northrend/VioletHold/violet_hold.cpp rename to src/server/scripts/Northrend/VioletHold/violet_hold.cpp diff --git a/src/scripts/Northrend/VioletHold/violet_hold.h b/src/server/scripts/Northrend/VioletHold/violet_hold.h similarity index 100% rename from src/scripts/Northrend/VioletHold/violet_hold.h rename to src/server/scripts/Northrend/VioletHold/violet_hold.h diff --git a/src/scripts/Northrend/isle_of_conquest.cpp b/src/server/scripts/Northrend/isle_of_conquest.cpp similarity index 100% rename from src/scripts/Northrend/isle_of_conquest.cpp rename to src/server/scripts/Northrend/isle_of_conquest.cpp diff --git a/src/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp similarity index 100% rename from src/scripts/Northrend/zone_borean_tundra.cpp rename to src/server/scripts/Northrend/zone_borean_tundra.cpp diff --git a/src/scripts/Northrend/zone_crystalsong_forest.cpp b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp similarity index 100% rename from src/scripts/Northrend/zone_crystalsong_forest.cpp rename to src/server/scripts/Northrend/zone_crystalsong_forest.cpp diff --git a/src/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp similarity index 100% rename from src/scripts/Northrend/zone_dalaran.cpp rename to src/server/scripts/Northrend/zone_dalaran.cpp diff --git a/src/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp similarity index 100% rename from src/scripts/Northrend/zone_dragonblight.cpp rename to src/server/scripts/Northrend/zone_dragonblight.cpp diff --git a/src/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp similarity index 100% rename from src/scripts/Northrend/zone_grizzly_hills.cpp rename to src/server/scripts/Northrend/zone_grizzly_hills.cpp diff --git a/src/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp similarity index 100% rename from src/scripts/Northrend/zone_howling_fjord.cpp rename to src/server/scripts/Northrend/zone_howling_fjord.cpp diff --git a/src/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp similarity index 100% rename from src/scripts/Northrend/zone_icecrown.cpp rename to src/server/scripts/Northrend/zone_icecrown.cpp diff --git a/src/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp similarity index 100% rename from src/scripts/Northrend/zone_sholazar_basin.cpp rename to src/server/scripts/Northrend/zone_sholazar_basin.cpp diff --git a/src/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp similarity index 100% rename from src/scripts/Northrend/zone_storm_peaks.cpp rename to src/server/scripts/Northrend/zone_storm_peaks.cpp diff --git a/src/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp similarity index 100% rename from src/scripts/Northrend/zone_wintergrasp.cpp rename to src/server/scripts/Northrend/zone_wintergrasp.cpp diff --git a/src/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp similarity index 100% rename from src/scripts/Northrend/zone_zuldrak.cpp rename to src/server/scripts/Northrend/zone_zuldrak.cpp diff --git a/src/scripts/OutdoorPvP/CMakeLists.txt b/src/server/scripts/OutdoorPvP/CMakeLists.txt similarity index 100% rename from src/scripts/OutdoorPvP/CMakeLists.txt rename to src/server/scripts/OutdoorPvP/CMakeLists.txt diff --git a/src/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp similarity index 100% rename from src/scripts/OutdoorPvP/OutdoorPvPEP.cpp rename to src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp diff --git a/src/scripts/OutdoorPvP/OutdoorPvPEP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h similarity index 100% rename from src/scripts/OutdoorPvP/OutdoorPvPEP.h rename to src/server/scripts/OutdoorPvP/OutdoorPvPEP.h diff --git a/src/scripts/OutdoorPvP/OutdoorPvPGH.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp similarity index 100% rename from src/scripts/OutdoorPvP/OutdoorPvPGH.cpp rename to src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp diff --git a/src/scripts/OutdoorPvP/OutdoorPvPGH.h b/src/server/scripts/OutdoorPvP/OutdoorPvPGH.h similarity index 100% rename from src/scripts/OutdoorPvP/OutdoorPvPGH.h rename to src/server/scripts/OutdoorPvP/OutdoorPvPGH.h diff --git a/src/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp similarity index 100% rename from src/scripts/OutdoorPvP/OutdoorPvPHP.cpp rename to src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp diff --git a/src/scripts/OutdoorPvP/OutdoorPvPHP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h similarity index 100% rename from src/scripts/OutdoorPvP/OutdoorPvPHP.h rename to src/server/scripts/OutdoorPvP/OutdoorPvPHP.h diff --git a/src/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp similarity index 100% rename from src/scripts/OutdoorPvP/OutdoorPvPNA.cpp rename to src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp diff --git a/src/scripts/OutdoorPvP/OutdoorPvPNA.h b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h similarity index 100% rename from src/scripts/OutdoorPvP/OutdoorPvPNA.h rename to src/server/scripts/OutdoorPvP/OutdoorPvPNA.h diff --git a/src/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp similarity index 100% rename from src/scripts/OutdoorPvP/OutdoorPvPSI.cpp rename to src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp diff --git a/src/scripts/OutdoorPvP/OutdoorPvPSI.h b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h similarity index 100% rename from src/scripts/OutdoorPvP/OutdoorPvPSI.h rename to src/server/scripts/OutdoorPvP/OutdoorPvPSI.h diff --git a/src/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp similarity index 100% rename from src/scripts/OutdoorPvP/OutdoorPvPTF.cpp rename to src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp diff --git a/src/scripts/OutdoorPvP/OutdoorPvPTF.h b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h similarity index 100% rename from src/scripts/OutdoorPvP/OutdoorPvPTF.h rename to src/server/scripts/OutdoorPvP/OutdoorPvPTF.h diff --git a/src/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp similarity index 100% rename from src/scripts/OutdoorPvP/OutdoorPvPZM.cpp rename to src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp diff --git a/src/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h similarity index 100% rename from src/scripts/OutdoorPvP/OutdoorPvPZM.h rename to src/server/scripts/OutdoorPvP/OutdoorPvPZM.h diff --git a/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp similarity index 100% rename from src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp rename to src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp diff --git a/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp similarity index 100% rename from src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp rename to src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp diff --git a/src/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp similarity index 100% rename from src/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp rename to src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp diff --git a/src/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp similarity index 100% rename from src/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp rename to src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp diff --git a/src/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp similarity index 100% rename from src/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp rename to src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp diff --git a/src/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h similarity index 100% rename from src/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h rename to src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp similarity index 100% rename from src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp rename to src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp similarity index 100% rename from src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp rename to src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp similarity index 100% rename from src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp rename to src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp similarity index 100% rename from src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp rename to src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp similarity index 100% rename from src/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp rename to src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h similarity index 100% rename from src/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h rename to src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h diff --git a/src/scripts/Outland/BlackTemple/black_temple.h b/src/server/scripts/Outland/BlackTemple/black_temple.h similarity index 100% rename from src/scripts/Outland/BlackTemple/black_temple.h rename to src/server/scripts/Outland/BlackTemple/black_temple.h diff --git a/src/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp similarity index 100% rename from src/scripts/Outland/BlackTemple/boss_bloodboil.cpp rename to src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp diff --git a/src/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp similarity index 100% rename from src/scripts/Outland/BlackTemple/boss_illidan.cpp rename to src/server/scripts/Outland/BlackTemple/boss_illidan.cpp diff --git a/src/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp similarity index 100% rename from src/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp rename to src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp diff --git a/src/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp similarity index 100% rename from src/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp rename to src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp diff --git a/src/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp similarity index 100% rename from src/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp rename to src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp diff --git a/src/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp similarity index 100% rename from src/scripts/Outland/BlackTemple/boss_supremus.cpp rename to src/server/scripts/Outland/BlackTemple/boss_supremus.cpp diff --git a/src/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp similarity index 100% rename from src/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp rename to src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp diff --git a/src/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp similarity index 100% rename from src/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp rename to src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp diff --git a/src/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp similarity index 100% rename from src/scripts/Outland/BlackTemple/illidari_council.cpp rename to src/server/scripts/Outland/BlackTemple/illidari_council.cpp diff --git a/src/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp similarity index 100% rename from src/scripts/Outland/BlackTemple/instance_black_temple.cpp rename to src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp diff --git a/src/scripts/Outland/CMakeLists.txt b/src/server/scripts/Outland/CMakeLists.txt similarity index 100% rename from src/scripts/Outland/CMakeLists.txt rename to src/server/scripts/Outland/CMakeLists.txt diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp similarity index 100% rename from src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp similarity index 100% rename from src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp similarity index 100% rename from src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp similarity index 100% rename from src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp similarity index 100% rename from src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp similarity index 100% rename from src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp similarity index 100% rename from src/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h similarity index 100% rename from src/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h diff --git a/src/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp similarity index 100% rename from src/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp rename to src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp diff --git a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp similarity index 100% rename from src/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp rename to src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp diff --git a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp similarity index 100% rename from src/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp rename to src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp diff --git a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp similarity index 100% rename from src/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp rename to src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp diff --git a/src/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp similarity index 100% rename from src/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp rename to src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp diff --git a/src/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h similarity index 100% rename from src/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h rename to src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h diff --git a/src/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp similarity index 100% rename from src/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp rename to src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp diff --git a/src/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp similarity index 100% rename from src/scripts/Outland/GruulsLair/boss_gruul.cpp rename to src/server/scripts/Outland/GruulsLair/boss_gruul.cpp diff --git a/src/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp similarity index 100% rename from src/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp rename to src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp diff --git a/src/scripts/Outland/GruulsLair/gruuls_lair.h b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h similarity index 100% rename from src/scripts/Outland/GruulsLair/gruuls_lair.h rename to src/server/scripts/Outland/GruulsLair/gruuls_lair.h diff --git a/src/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp similarity index 100% rename from src/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp rename to src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp diff --git a/src/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h similarity index 100% rename from src/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h rename to src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h diff --git a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp similarity index 100% rename from src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp rename to src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp diff --git a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp similarity index 100% rename from src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp rename to src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp diff --git a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp similarity index 100% rename from src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp rename to src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp diff --git a/src/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp similarity index 100% rename from src/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp rename to src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp diff --git a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp similarity index 100% rename from src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp rename to src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp diff --git a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp similarity index 100% rename from src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp rename to src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp diff --git a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp similarity index 100% rename from src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp rename to src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp diff --git a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h similarity index 100% rename from src/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h rename to src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h diff --git a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp similarity index 100% rename from src/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp rename to src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp diff --git a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp similarity index 100% rename from src/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp rename to src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp diff --git a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp similarity index 100% rename from src/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp rename to src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp diff --git a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h similarity index 100% rename from src/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h rename to src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h diff --git a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp similarity index 100% rename from src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp rename to src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp diff --git a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp similarity index 100% rename from src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp rename to src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp diff --git a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp similarity index 100% rename from src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp rename to src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp diff --git a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp similarity index 100% rename from src/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp rename to src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp diff --git a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h similarity index 100% rename from src/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h rename to src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h diff --git a/src/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/Eye/boss_alar.cpp rename to src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp diff --git a/src/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp rename to src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp diff --git a/src/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp rename to src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp diff --git a/src/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp rename to src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp diff --git a/src/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp rename to src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp diff --git a/src/scripts/Outland/TempestKeep/Eye/the_eye.h b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h similarity index 100% rename from src/scripts/Outland/TempestKeep/Eye/the_eye.h rename to src/server/scripts/Outland/TempestKeep/Eye/the_eye.h diff --git a/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp rename to src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp diff --git a/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp rename to src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp diff --git a/src/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp rename to src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp diff --git a/src/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp rename to src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp diff --git a/src/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp rename to src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp diff --git a/src/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp rename to src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp diff --git a/src/scripts/Outland/TempestKeep/Mechanar/mechanar.h b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h similarity index 100% rename from src/scripts/Outland/TempestKeep/Mechanar/mechanar.h rename to src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h diff --git a/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp rename to src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp diff --git a/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.h b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h similarity index 100% rename from src/scripts/Outland/TempestKeep/arcatraz/arcatraz.h rename to src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h diff --git a/src/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp rename to src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp diff --git a/src/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp rename to src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp diff --git a/src/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp rename to src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp diff --git a/src/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp rename to src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp diff --git a/src/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp rename to src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp diff --git a/src/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp rename to src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp diff --git a/src/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp rename to src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp diff --git a/src/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/botanica/boss_laj.cpp rename to src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp diff --git a/src/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp rename to src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp diff --git a/src/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp rename to src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp diff --git a/src/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp similarity index 100% rename from src/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp rename to src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp diff --git a/src/scripts/Outland/TempestKeep/botanica/the_botanica.h b/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h similarity index 100% rename from src/scripts/Outland/TempestKeep/botanica/the_botanica.h rename to src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h diff --git a/src/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp similarity index 100% rename from src/scripts/Outland/boss_doomlord_kazzak.cpp rename to src/server/scripts/Outland/boss_doomlord_kazzak.cpp diff --git a/src/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp similarity index 100% rename from src/scripts/Outland/boss_doomwalker.cpp rename to src/server/scripts/Outland/boss_doomwalker.cpp diff --git a/src/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp similarity index 100% rename from src/scripts/Outland/zone_blades_edge_mountains.cpp rename to src/server/scripts/Outland/zone_blades_edge_mountains.cpp diff --git a/src/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp similarity index 100% rename from src/scripts/Outland/zone_hellfire_peninsula.cpp rename to src/server/scripts/Outland/zone_hellfire_peninsula.cpp diff --git a/src/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp similarity index 100% rename from src/scripts/Outland/zone_nagrand.cpp rename to src/server/scripts/Outland/zone_nagrand.cpp diff --git a/src/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp similarity index 100% rename from src/scripts/Outland/zone_netherstorm.cpp rename to src/server/scripts/Outland/zone_netherstorm.cpp diff --git a/src/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp similarity index 100% rename from src/scripts/Outland/zone_shadowmoon_valley.cpp rename to src/server/scripts/Outland/zone_shadowmoon_valley.cpp diff --git a/src/scripts/Outland/zone_shattrath_city.cpp b/src/server/scripts/Outland/zone_shattrath_city.cpp similarity index 100% rename from src/scripts/Outland/zone_shattrath_city.cpp rename to src/server/scripts/Outland/zone_shattrath_city.cpp diff --git a/src/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp similarity index 100% rename from src/scripts/Outland/zone_terokkar_forest.cpp rename to src/server/scripts/Outland/zone_terokkar_forest.cpp diff --git a/src/scripts/Outland/zone_zangarmarsh.cpp b/src/server/scripts/Outland/zone_zangarmarsh.cpp similarity index 100% rename from src/scripts/Outland/zone_zangarmarsh.cpp rename to src/server/scripts/Outland/zone_zangarmarsh.cpp diff --git a/src/scripts/Pet/CMakeLists.txt b/src/server/scripts/Pet/CMakeLists.txt similarity index 100% rename from src/scripts/Pet/CMakeLists.txt rename to src/server/scripts/Pet/CMakeLists.txt diff --git a/src/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp similarity index 100% rename from src/scripts/Pet/pet_dk.cpp rename to src/server/scripts/Pet/pet_dk.cpp diff --git a/src/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp similarity index 100% rename from src/scripts/Pet/pet_generic.cpp rename to src/server/scripts/Pet/pet_generic.cpp diff --git a/src/scripts/Pet/pet_hunter.cpp b/src/server/scripts/Pet/pet_hunter.cpp similarity index 100% rename from src/scripts/Pet/pet_hunter.cpp rename to src/server/scripts/Pet/pet_hunter.cpp diff --git a/src/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp similarity index 100% rename from src/scripts/Pet/pet_mage.cpp rename to src/server/scripts/Pet/pet_mage.cpp diff --git a/src/scripts/Pet/pet_priest.cpp b/src/server/scripts/Pet/pet_priest.cpp similarity index 100% rename from src/scripts/Pet/pet_priest.cpp rename to src/server/scripts/Pet/pet_priest.cpp diff --git a/src/scripts/Pet/pet_shaman.cpp b/src/server/scripts/Pet/pet_shaman.cpp similarity index 100% rename from src/scripts/Pet/pet_shaman.cpp rename to src/server/scripts/Pet/pet_shaman.cpp diff --git a/src/scripts/PrecompiledHeaders/ScriptPCH.cpp b/src/server/scripts/PrecompiledHeaders/ScriptPCH.cpp similarity index 100% rename from src/scripts/PrecompiledHeaders/ScriptPCH.cpp rename to src/server/scripts/PrecompiledHeaders/ScriptPCH.cpp diff --git a/src/scripts/PrecompiledHeaders/ScriptPCH.h b/src/server/scripts/PrecompiledHeaders/ScriptPCH.h similarity index 100% rename from src/scripts/PrecompiledHeaders/ScriptPCH.h rename to src/server/scripts/PrecompiledHeaders/ScriptPCH.h diff --git a/src/scripts/ScriptLoader.cpp b/src/server/scripts/ScriptLoader.cpp similarity index 100% rename from src/scripts/ScriptLoader.cpp rename to src/server/scripts/ScriptLoader.cpp diff --git a/src/scripts/ScriptLoader.h b/src/server/scripts/ScriptLoader.h similarity index 100% rename from src/scripts/ScriptLoader.h rename to src/server/scripts/ScriptLoader.h diff --git a/src/scripts/Spells/CMakeLists.txt b/src/server/scripts/Spells/CMakeLists.txt similarity index 100% rename from src/scripts/Spells/CMakeLists.txt rename to src/server/scripts/Spells/CMakeLists.txt diff --git a/src/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp similarity index 100% rename from src/scripts/Spells/spell_dk.cpp rename to src/server/scripts/Spells/spell_dk.cpp diff --git a/src/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp similarity index 100% rename from src/scripts/Spells/spell_druid.cpp rename to src/server/scripts/Spells/spell_druid.cpp diff --git a/src/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp similarity index 100% rename from src/scripts/Spells/spell_generic.cpp rename to src/server/scripts/Spells/spell_generic.cpp diff --git a/src/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp similarity index 100% rename from src/scripts/Spells/spell_hunter.cpp rename to src/server/scripts/Spells/spell_hunter.cpp diff --git a/src/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp similarity index 100% rename from src/scripts/Spells/spell_item.cpp rename to src/server/scripts/Spells/spell_item.cpp diff --git a/src/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp similarity index 100% rename from src/scripts/Spells/spell_mage.cpp rename to src/server/scripts/Spells/spell_mage.cpp diff --git a/src/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp similarity index 100% rename from src/scripts/Spells/spell_paladin.cpp rename to src/server/scripts/Spells/spell_paladin.cpp diff --git a/src/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp similarity index 100% rename from src/scripts/Spells/spell_priest.cpp rename to src/server/scripts/Spells/spell_priest.cpp diff --git a/src/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp similarity index 100% rename from src/scripts/Spells/spell_quest.cpp rename to src/server/scripts/Spells/spell_quest.cpp diff --git a/src/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp similarity index 100% rename from src/scripts/Spells/spell_rogue.cpp rename to src/server/scripts/Spells/spell_rogue.cpp diff --git a/src/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp similarity index 100% rename from src/scripts/Spells/spell_shaman.cpp rename to src/server/scripts/Spells/spell_shaman.cpp diff --git a/src/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp similarity index 100% rename from src/scripts/Spells/spell_warlock.cpp rename to src/server/scripts/Spells/spell_warlock.cpp diff --git a/src/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp similarity index 100% rename from src/scripts/Spells/spell_warrior.cpp rename to src/server/scripts/Spells/spell_warrior.cpp diff --git a/src/scripts/World/CMakeLists.txt b/src/server/scripts/World/CMakeLists.txt similarity index 100% rename from src/scripts/World/CMakeLists.txt rename to src/server/scripts/World/CMakeLists.txt diff --git a/src/scripts/World/achievement_scripts.cpp b/src/server/scripts/World/achievement_scripts.cpp similarity index 100% rename from src/scripts/World/achievement_scripts.cpp rename to src/server/scripts/World/achievement_scripts.cpp diff --git a/src/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp similarity index 100% rename from src/scripts/World/areatrigger_scripts.cpp rename to src/server/scripts/World/areatrigger_scripts.cpp diff --git a/src/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp similarity index 100% rename from src/scripts/World/boss_emerald_dragons.cpp rename to src/server/scripts/World/boss_emerald_dragons.cpp diff --git a/src/scripts/World/character_creation.cpp b/src/server/scripts/World/character_creation.cpp similarity index 100% rename from src/scripts/World/character_creation.cpp rename to src/server/scripts/World/character_creation.cpp diff --git a/src/scripts/World/chat_log.cpp b/src/server/scripts/World/chat_log.cpp similarity index 100% rename from src/scripts/World/chat_log.cpp rename to src/server/scripts/World/chat_log.cpp diff --git a/src/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp similarity index 100% rename from src/scripts/World/go_scripts.cpp rename to src/server/scripts/World/go_scripts.cpp diff --git a/src/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp similarity index 100% rename from src/scripts/World/guards.cpp rename to src/server/scripts/World/guards.cpp diff --git a/src/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp similarity index 100% rename from src/scripts/World/item_scripts.cpp rename to src/server/scripts/World/item_scripts.cpp diff --git a/src/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp similarity index 100% rename from src/scripts/World/mob_generic_creature.cpp rename to src/server/scripts/World/mob_generic_creature.cpp diff --git a/src/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp similarity index 100% rename from src/scripts/World/npc_innkeeper.cpp rename to src/server/scripts/World/npc_innkeeper.cpp diff --git a/src/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp similarity index 100% rename from src/scripts/World/npc_professions.cpp rename to src/server/scripts/World/npc_professions.cpp diff --git a/src/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp similarity index 100% rename from src/scripts/World/npc_taxi.cpp rename to src/server/scripts/World/npc_taxi.cpp diff --git a/src/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp similarity index 100% rename from src/scripts/World/npcs_special.cpp rename to src/server/scripts/World/npcs_special.cpp diff --git a/src/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt similarity index 100% rename from src/worldserver/CMakeLists.txt rename to src/server/worldserver/CMakeLists.txt diff --git a/src/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp similarity index 100% rename from src/worldserver/CommandLine/CliRunnable.cpp rename to src/server/worldserver/CommandLine/CliRunnable.cpp diff --git a/src/worldserver/CommandLine/CliRunnable.h b/src/server/worldserver/CommandLine/CliRunnable.h similarity index 100% rename from src/worldserver/CommandLine/CliRunnable.h rename to src/server/worldserver/CommandLine/CliRunnable.h diff --git a/src/worldserver/Main.cpp b/src/server/worldserver/Main.cpp similarity index 100% rename from src/worldserver/Main.cpp rename to src/server/worldserver/Main.cpp diff --git a/src/worldserver/Master.cpp b/src/server/worldserver/Master.cpp similarity index 100% rename from src/worldserver/Master.cpp rename to src/server/worldserver/Master.cpp diff --git a/src/worldserver/Master.h b/src/server/worldserver/Master.h similarity index 100% rename from src/worldserver/Master.h rename to src/server/worldserver/Master.h diff --git a/src/worldserver/PrecompiledHeaders/worldPCH.cpp b/src/server/worldserver/PrecompiledHeaders/worldPCH.cpp similarity index 100% rename from src/worldserver/PrecompiledHeaders/worldPCH.cpp rename to src/server/worldserver/PrecompiledHeaders/worldPCH.cpp diff --git a/src/worldserver/PrecompiledHeaders/worldPCH.h b/src/server/worldserver/PrecompiledHeaders/worldPCH.h similarity index 100% rename from src/worldserver/PrecompiledHeaders/worldPCH.h rename to src/server/worldserver/PrecompiledHeaders/worldPCH.h diff --git a/src/worldserver/RemoteAccess/RARunnable.cpp b/src/server/worldserver/RemoteAccess/RARunnable.cpp similarity index 100% rename from src/worldserver/RemoteAccess/RARunnable.cpp rename to src/server/worldserver/RemoteAccess/RARunnable.cpp diff --git a/src/worldserver/RemoteAccess/RARunnable.h b/src/server/worldserver/RemoteAccess/RARunnable.h similarity index 100% rename from src/worldserver/RemoteAccess/RARunnable.h rename to src/server/worldserver/RemoteAccess/RARunnable.h diff --git a/src/worldserver/RemoteAccess/RASocket.cpp b/src/server/worldserver/RemoteAccess/RASocket.cpp similarity index 100% rename from src/worldserver/RemoteAccess/RASocket.cpp rename to src/server/worldserver/RemoteAccess/RASocket.cpp diff --git a/src/worldserver/RemoteAccess/RASocket.h b/src/server/worldserver/RemoteAccess/RASocket.h similarity index 100% rename from src/worldserver/RemoteAccess/RASocket.h rename to src/server/worldserver/RemoteAccess/RASocket.h diff --git a/src/worldserver/TCSoap/TCSoap.cpp b/src/server/worldserver/TCSoap/TCSoap.cpp similarity index 100% rename from src/worldserver/TCSoap/TCSoap.cpp rename to src/server/worldserver/TCSoap/TCSoap.cpp diff --git a/src/worldserver/TCSoap/TCSoap.h b/src/server/worldserver/TCSoap/TCSoap.h similarity index 100% rename from src/worldserver/TCSoap/TCSoap.h rename to src/server/worldserver/TCSoap/TCSoap.h diff --git a/src/worldserver/WorldThread/WorldRunnable.cpp b/src/server/worldserver/WorldThread/WorldRunnable.cpp similarity index 100% rename from src/worldserver/WorldThread/WorldRunnable.cpp rename to src/server/worldserver/WorldThread/WorldRunnable.cpp diff --git a/src/worldserver/WorldThread/WorldRunnable.h b/src/server/worldserver/WorldThread/WorldRunnable.h similarity index 100% rename from src/worldserver/WorldThread/WorldRunnable.h rename to src/server/worldserver/WorldThread/WorldRunnable.h diff --git a/src/worldserver/resource.h b/src/server/worldserver/resource.h similarity index 100% rename from src/worldserver/resource.h rename to src/server/worldserver/resource.h diff --git a/src/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist similarity index 100% rename from src/worldserver/worldserver.conf.dist rename to src/server/worldserver/worldserver.conf.dist diff --git a/src/worldserver/worldserver.ico b/src/server/worldserver/worldserver.ico similarity index 100% rename from src/worldserver/worldserver.ico rename to src/server/worldserver/worldserver.ico diff --git a/src/worldserver/worldserver.rc b/src/server/worldserver/worldserver.rc similarity index 100% rename from src/worldserver/worldserver.rc rename to src/server/worldserver/worldserver.rc