diff --git a/src/framework/CMakeLists.txt b/src/server/framework/CMakeLists.txt
similarity index 100%
rename from src/framework/CMakeLists.txt
rename to src/server/framework/CMakeLists.txt
diff --git a/src/framework/Dynamic/FactoryHolder.h b/src/server/framework/Dynamic/FactoryHolder.h
similarity index 100%
rename from src/framework/Dynamic/FactoryHolder.h
rename to src/server/framework/Dynamic/FactoryHolder.h
diff --git a/src/framework/Dynamic/ObjectRegistry.h b/src/server/framework/Dynamic/ObjectRegistry.h
similarity index 100%
rename from src/framework/Dynamic/ObjectRegistry.h
rename to src/server/framework/Dynamic/ObjectRegistry.h
diff --git a/src/framework/GameSystem/Grid.h b/src/server/framework/GameSystem/Grid.h
similarity index 100%
rename from src/framework/GameSystem/Grid.h
rename to src/server/framework/GameSystem/Grid.h
diff --git a/src/framework/GameSystem/GridLoader.h b/src/server/framework/GameSystem/GridLoader.h
similarity index 100%
rename from src/framework/GameSystem/GridLoader.h
rename to src/server/framework/GameSystem/GridLoader.h
diff --git a/src/framework/GameSystem/GridRefManager.h b/src/server/framework/GameSystem/GridRefManager.h
similarity index 100%
rename from src/framework/GameSystem/GridRefManager.h
rename to src/server/framework/GameSystem/GridRefManager.h
diff --git a/src/framework/GameSystem/GridReference.h b/src/server/framework/GameSystem/GridReference.h
similarity index 100%
rename from src/framework/GameSystem/GridReference.h
rename to src/server/framework/GameSystem/GridReference.h
diff --git a/src/framework/GameSystem/NGrid.h b/src/server/framework/GameSystem/NGrid.h
similarity index 100%
rename from src/framework/GameSystem/NGrid.h
rename to src/server/framework/GameSystem/NGrid.h
diff --git a/src/framework/GameSystem/TypeContainer.h b/src/server/framework/GameSystem/TypeContainer.h
similarity index 100%
rename from src/framework/GameSystem/TypeContainer.h
rename to src/server/framework/GameSystem/TypeContainer.h
diff --git a/src/framework/GameSystem/TypeContainerFunctions.h b/src/server/framework/GameSystem/TypeContainerFunctions.h
similarity index 100%
rename from src/framework/GameSystem/TypeContainerFunctions.h
rename to src/server/framework/GameSystem/TypeContainerFunctions.h
diff --git a/src/framework/GameSystem/TypeContainerFunctionsPtr.h b/src/server/framework/GameSystem/TypeContainerFunctionsPtr.h
similarity index 100%
rename from src/framework/GameSystem/TypeContainerFunctionsPtr.h
rename to src/server/framework/GameSystem/TypeContainerFunctionsPtr.h
diff --git a/src/framework/GameSystem/TypeContainerVisitor.h b/src/server/framework/GameSystem/TypeContainerVisitor.h
similarity index 100%
rename from src/framework/GameSystem/TypeContainerVisitor.h
rename to src/server/framework/GameSystem/TypeContainerVisitor.h
diff --git a/src/framework/Network/SocketDefines.h b/src/server/framework/Network/SocketDefines.h
similarity index 100%
rename from src/framework/Network/SocketDefines.h
rename to src/server/framework/Network/SocketDefines.h
diff --git a/src/framework/Platform/CompilerDefs.h b/src/server/framework/Platform/CompilerDefs.h
similarity index 100%
rename from src/framework/Platform/CompilerDefs.h
rename to src/server/framework/Platform/CompilerDefs.h
diff --git a/src/framework/Platform/Define.h b/src/server/framework/Platform/Define.h
similarity index 100%
rename from src/framework/Platform/Define.h
rename to src/server/framework/Platform/Define.h
diff --git a/src/framework/Policies/CreationPolicy.h b/src/server/framework/Policies/CreationPolicy.h
similarity index 100%
rename from src/framework/Policies/CreationPolicy.h
rename to src/server/framework/Policies/CreationPolicy.h
diff --git a/src/framework/Policies/ObjectLifeTime.cpp b/src/server/framework/Policies/ObjectLifeTime.cpp
similarity index 100%
rename from src/framework/Policies/ObjectLifeTime.cpp
rename to src/server/framework/Policies/ObjectLifeTime.cpp
diff --git a/src/framework/Policies/ObjectLifeTime.h b/src/server/framework/Policies/ObjectLifeTime.h
similarity index 100%
rename from src/framework/Policies/ObjectLifeTime.h
rename to src/server/framework/Policies/ObjectLifeTime.h
diff --git a/src/framework/Policies/Singleton.h b/src/server/framework/Policies/Singleton.h
similarity index 100%
rename from src/framework/Policies/Singleton.h
rename to src/server/framework/Policies/Singleton.h
diff --git a/src/framework/Policies/SingletonImp.h b/src/server/framework/Policies/SingletonImp.h
similarity index 100%
rename from src/framework/Policies/SingletonImp.h
rename to src/server/framework/Policies/SingletonImp.h
diff --git a/src/framework/Policies/ThreadingModel.h b/src/server/framework/Policies/ThreadingModel.h
similarity index 100%
rename from src/framework/Policies/ThreadingModel.h
rename to src/server/framework/Policies/ThreadingModel.h
diff --git a/src/framework/Utilities/ByteConverter.h b/src/server/framework/Utilities/ByteConverter.h
similarity index 100%
rename from src/framework/Utilities/ByteConverter.h
rename to src/server/framework/Utilities/ByteConverter.h
diff --git a/src/framework/Utilities/Callback.h b/src/server/framework/Utilities/Callback.h
similarity index 100%
rename from src/framework/Utilities/Callback.h
rename to src/server/framework/Utilities/Callback.h
diff --git a/src/framework/Utilities/CountedReference/Reference.h b/src/server/framework/Utilities/CountedReference/Reference.h
similarity index 100%
rename from src/framework/Utilities/CountedReference/Reference.h
rename to src/server/framework/Utilities/CountedReference/Reference.h
diff --git a/src/framework/Utilities/CountedReference/ReferenceHolder.h b/src/server/framework/Utilities/CountedReference/ReferenceHolder.h
similarity index 100%
rename from src/framework/Utilities/CountedReference/ReferenceHolder.h
rename to src/server/framework/Utilities/CountedReference/ReferenceHolder.h
diff --git a/src/framework/Utilities/CountedReference/ReferenceImpl.h b/src/server/framework/Utilities/CountedReference/ReferenceImpl.h
similarity index 100%
rename from src/framework/Utilities/CountedReference/ReferenceImpl.h
rename to src/server/framework/Utilities/CountedReference/ReferenceImpl.h
diff --git a/src/framework/Utilities/EventProcessor.cpp b/src/server/framework/Utilities/EventProcessor.cpp
similarity index 100%
rename from src/framework/Utilities/EventProcessor.cpp
rename to src/server/framework/Utilities/EventProcessor.cpp
diff --git a/src/framework/Utilities/EventProcessor.h b/src/server/framework/Utilities/EventProcessor.h
similarity index 100%
rename from src/framework/Utilities/EventProcessor.h
rename to src/server/framework/Utilities/EventProcessor.h
diff --git a/src/framework/Utilities/LinkedList.h b/src/server/framework/Utilities/LinkedList.h
similarity index 100%
rename from src/framework/Utilities/LinkedList.h
rename to src/server/framework/Utilities/LinkedList.h
diff --git a/src/framework/Utilities/LinkedReference/RefManager.h b/src/server/framework/Utilities/LinkedReference/RefManager.h
similarity index 100%
rename from src/framework/Utilities/LinkedReference/RefManager.h
rename to src/server/framework/Utilities/LinkedReference/RefManager.h
diff --git a/src/framework/Utilities/LinkedReference/Reference.h b/src/server/framework/Utilities/LinkedReference/Reference.h
similarity index 100%
rename from src/framework/Utilities/LinkedReference/Reference.h
rename to src/server/framework/Utilities/LinkedReference/Reference.h
diff --git a/src/framework/Utilities/TypeList.h b/src/server/framework/Utilities/TypeList.h
similarity index 100%
rename from src/framework/Utilities/TypeList.h
rename to src/server/framework/Utilities/TypeList.h
diff --git a/src/framework/Utilities/UnorderedMap.h b/src/server/framework/Utilities/UnorderedMap.h
similarity index 100%
rename from src/framework/Utilities/UnorderedMap.h
rename to src/server/framework/Utilities/UnorderedMap.h
diff --git a/src/game/AccountMgr.cpp b/src/server/game/AccountMgr.cpp
similarity index 100%
rename from src/game/AccountMgr.cpp
rename to src/server/game/AccountMgr.cpp
diff --git a/src/game/AccountMgr.h b/src/server/game/AccountMgr.h
similarity index 100%
rename from src/game/AccountMgr.h
rename to src/server/game/AccountMgr.h
diff --git a/src/game/AchievementMgr.cpp b/src/server/game/AchievementMgr.cpp
similarity index 100%
rename from src/game/AchievementMgr.cpp
rename to src/server/game/AchievementMgr.cpp
diff --git a/src/game/AchievementMgr.h b/src/server/game/AchievementMgr.h
similarity index 100%
rename from src/game/AchievementMgr.h
rename to src/server/game/AchievementMgr.h
diff --git a/src/game/AddonHandler.cpp b/src/server/game/AddonHandler.cpp
similarity index 100%
rename from src/game/AddonHandler.cpp
rename to src/server/game/AddonHandler.cpp
diff --git a/src/game/AddonHandler.h b/src/server/game/AddonHandler.h
similarity index 100%
rename from src/game/AddonHandler.h
rename to src/server/game/AddonHandler.h
diff --git a/src/game/AddonMgr.cpp b/src/server/game/AddonMgr.cpp
similarity index 100%
rename from src/game/AddonMgr.cpp
rename to src/server/game/AddonMgr.cpp
diff --git a/src/game/AddonMgr.h b/src/server/game/AddonMgr.h
similarity index 100%
rename from src/game/AddonMgr.h
rename to src/server/game/AddonMgr.h
diff --git a/src/game/ArenaTeam.cpp b/src/server/game/ArenaTeam.cpp
similarity index 100%
rename from src/game/ArenaTeam.cpp
rename to src/server/game/ArenaTeam.cpp
diff --git a/src/game/ArenaTeam.h b/src/server/game/ArenaTeam.h
similarity index 100%
rename from src/game/ArenaTeam.h
rename to src/server/game/ArenaTeam.h
diff --git a/src/game/ArenaTeamHandler.cpp b/src/server/game/ArenaTeamHandler.cpp
similarity index 100%
rename from src/game/ArenaTeamHandler.cpp
rename to src/server/game/ArenaTeamHandler.cpp
diff --git a/src/game/AuctionHouseBot.cpp b/src/server/game/AuctionHouseBot.cpp
similarity index 100%
rename from src/game/AuctionHouseBot.cpp
rename to src/server/game/AuctionHouseBot.cpp
diff --git a/src/game/AuctionHouseBot.h b/src/server/game/AuctionHouseBot.h
similarity index 100%
rename from src/game/AuctionHouseBot.h
rename to src/server/game/AuctionHouseBot.h
diff --git a/src/game/AuctionHouseHandler.cpp b/src/server/game/AuctionHouseHandler.cpp
similarity index 100%
rename from src/game/AuctionHouseHandler.cpp
rename to src/server/game/AuctionHouseHandler.cpp
diff --git a/src/game/AuctionHouseMgr.cpp b/src/server/game/AuctionHouseMgr.cpp
similarity index 100%
rename from src/game/AuctionHouseMgr.cpp
rename to src/server/game/AuctionHouseMgr.cpp
diff --git a/src/game/AuctionHouseMgr.h b/src/server/game/AuctionHouseMgr.h
similarity index 100%
rename from src/game/AuctionHouseMgr.h
rename to src/server/game/AuctionHouseMgr.h
diff --git a/src/game/Bag.cpp b/src/server/game/Bag.cpp
similarity index 100%
rename from src/game/Bag.cpp
rename to src/server/game/Bag.cpp
diff --git a/src/game/Bag.h b/src/server/game/Bag.h
similarity index 100%
rename from src/game/Bag.h
rename to src/server/game/Bag.h
diff --git a/src/game/BattleGround.cpp b/src/server/game/BattleGround.cpp
similarity index 100%
rename from src/game/BattleGround.cpp
rename to src/server/game/BattleGround.cpp
diff --git a/src/game/BattleGround.h b/src/server/game/BattleGround.h
similarity index 100%
rename from src/game/BattleGround.h
rename to src/server/game/BattleGround.h
diff --git a/src/game/BattleGroundAA.cpp b/src/server/game/BattleGroundAA.cpp
similarity index 100%
rename from src/game/BattleGroundAA.cpp
rename to src/server/game/BattleGroundAA.cpp
diff --git a/src/game/BattleGroundAA.h b/src/server/game/BattleGroundAA.h
similarity index 100%
rename from src/game/BattleGroundAA.h
rename to src/server/game/BattleGroundAA.h
diff --git a/src/game/BattleGroundAB.cpp b/src/server/game/BattleGroundAB.cpp
similarity index 100%
rename from src/game/BattleGroundAB.cpp
rename to src/server/game/BattleGroundAB.cpp
diff --git a/src/game/BattleGroundAB.h b/src/server/game/BattleGroundAB.h
similarity index 100%
rename from src/game/BattleGroundAB.h
rename to src/server/game/BattleGroundAB.h
diff --git a/src/game/BattleGroundAV.cpp b/src/server/game/BattleGroundAV.cpp
similarity index 100%
rename from src/game/BattleGroundAV.cpp
rename to src/server/game/BattleGroundAV.cpp
diff --git a/src/game/BattleGroundAV.h b/src/server/game/BattleGroundAV.h
similarity index 100%
rename from src/game/BattleGroundAV.h
rename to src/server/game/BattleGroundAV.h
diff --git a/src/game/BattleGroundBE.cpp b/src/server/game/BattleGroundBE.cpp
similarity index 100%
rename from src/game/BattleGroundBE.cpp
rename to src/server/game/BattleGroundBE.cpp
diff --git a/src/game/BattleGroundBE.h b/src/server/game/BattleGroundBE.h
similarity index 100%
rename from src/game/BattleGroundBE.h
rename to src/server/game/BattleGroundBE.h
diff --git a/src/game/BattleGroundDS.cpp b/src/server/game/BattleGroundDS.cpp
similarity index 100%
rename from src/game/BattleGroundDS.cpp
rename to src/server/game/BattleGroundDS.cpp
diff --git a/src/game/BattleGroundDS.h b/src/server/game/BattleGroundDS.h
similarity index 100%
rename from src/game/BattleGroundDS.h
rename to src/server/game/BattleGroundDS.h
diff --git a/src/game/BattleGroundEY.cpp b/src/server/game/BattleGroundEY.cpp
similarity index 100%
rename from src/game/BattleGroundEY.cpp
rename to src/server/game/BattleGroundEY.cpp
diff --git a/src/game/BattleGroundEY.h b/src/server/game/BattleGroundEY.h
similarity index 100%
rename from src/game/BattleGroundEY.h
rename to src/server/game/BattleGroundEY.h
diff --git a/src/game/BattleGroundHandler.cpp b/src/server/game/BattleGroundHandler.cpp
similarity index 100%
rename from src/game/BattleGroundHandler.cpp
rename to src/server/game/BattleGroundHandler.cpp
diff --git a/src/game/BattleGroundIC.cpp b/src/server/game/BattleGroundIC.cpp
similarity index 100%
rename from src/game/BattleGroundIC.cpp
rename to src/server/game/BattleGroundIC.cpp
diff --git a/src/game/BattleGroundIC.h b/src/server/game/BattleGroundIC.h
similarity index 100%
rename from src/game/BattleGroundIC.h
rename to src/server/game/BattleGroundIC.h
diff --git a/src/game/BattleGroundMgr.cpp b/src/server/game/BattleGroundMgr.cpp
similarity index 100%
rename from src/game/BattleGroundMgr.cpp
rename to src/server/game/BattleGroundMgr.cpp
diff --git a/src/game/BattleGroundMgr.h b/src/server/game/BattleGroundMgr.h
similarity index 100%
rename from src/game/BattleGroundMgr.h
rename to src/server/game/BattleGroundMgr.h
diff --git a/src/game/BattleGroundNA.cpp b/src/server/game/BattleGroundNA.cpp
similarity index 100%
rename from src/game/BattleGroundNA.cpp
rename to src/server/game/BattleGroundNA.cpp
diff --git a/src/game/BattleGroundNA.h b/src/server/game/BattleGroundNA.h
similarity index 100%
rename from src/game/BattleGroundNA.h
rename to src/server/game/BattleGroundNA.h
diff --git a/src/game/BattleGroundRB.cpp b/src/server/game/BattleGroundRB.cpp
similarity index 100%
rename from src/game/BattleGroundRB.cpp
rename to src/server/game/BattleGroundRB.cpp
diff --git a/src/game/BattleGroundRB.h b/src/server/game/BattleGroundRB.h
similarity index 100%
rename from src/game/BattleGroundRB.h
rename to src/server/game/BattleGroundRB.h
diff --git a/src/game/BattleGroundRL.cpp b/src/server/game/BattleGroundRL.cpp
similarity index 100%
rename from src/game/BattleGroundRL.cpp
rename to src/server/game/BattleGroundRL.cpp
diff --git a/src/game/BattleGroundRL.h b/src/server/game/BattleGroundRL.h
similarity index 100%
rename from src/game/BattleGroundRL.h
rename to src/server/game/BattleGroundRL.h
diff --git a/src/game/BattleGroundRV.cpp b/src/server/game/BattleGroundRV.cpp
similarity index 100%
rename from src/game/BattleGroundRV.cpp
rename to src/server/game/BattleGroundRV.cpp
diff --git a/src/game/BattleGroundRV.h b/src/server/game/BattleGroundRV.h
similarity index 100%
rename from src/game/BattleGroundRV.h
rename to src/server/game/BattleGroundRV.h
diff --git a/src/game/BattleGroundSA.cpp b/src/server/game/BattleGroundSA.cpp
similarity index 100%
rename from src/game/BattleGroundSA.cpp
rename to src/server/game/BattleGroundSA.cpp
diff --git a/src/game/BattleGroundSA.h b/src/server/game/BattleGroundSA.h
similarity index 100%
rename from src/game/BattleGroundSA.h
rename to src/server/game/BattleGroundSA.h
diff --git a/src/game/BattleGroundWS.cpp b/src/server/game/BattleGroundWS.cpp
similarity index 100%
rename from src/game/BattleGroundWS.cpp
rename to src/server/game/BattleGroundWS.cpp
diff --git a/src/game/BattleGroundWS.h b/src/server/game/BattleGroundWS.h
similarity index 100%
rename from src/game/BattleGroundWS.h
rename to src/server/game/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.cpp b/src/server/game/Calendar.cpp
similarity index 100%
rename from src/game/Calendar.cpp
rename to src/server/game/Calendar.cpp
diff --git a/src/game/Calendar.h b/src/server/game/Calendar.h
similarity index 100%
rename from src/game/Calendar.h
rename to src/server/game/Calendar.h
diff --git a/src/game/CalendarHandler.cpp b/src/server/game/CalendarHandler.cpp
similarity index 100%
rename from src/game/CalendarHandler.cpp
rename to src/server/game/CalendarHandler.cpp
diff --git a/src/game/Cell.h b/src/server/game/Cell.h
similarity index 100%
rename from src/game/Cell.h
rename to src/server/game/Cell.h
diff --git a/src/game/CellImpl.h b/src/server/game/CellImpl.h
similarity index 100%
rename from src/game/CellImpl.h
rename to src/server/game/CellImpl.h
diff --git a/src/game/Channel.cpp b/src/server/game/Channel.cpp
similarity index 100%
rename from src/game/Channel.cpp
rename to src/server/game/Channel.cpp
diff --git a/src/game/Channel.h b/src/server/game/Channel.h
similarity index 100%
rename from src/game/Channel.h
rename to src/server/game/Channel.h
diff --git a/src/game/ChannelHandler.cpp b/src/server/game/ChannelHandler.cpp
similarity index 100%
rename from src/game/ChannelHandler.cpp
rename to src/server/game/ChannelHandler.cpp
diff --git a/src/game/ChannelMgr.cpp b/src/server/game/ChannelMgr.cpp
similarity index 100%
rename from src/game/ChannelMgr.cpp
rename to src/server/game/ChannelMgr.cpp
diff --git a/src/game/ChannelMgr.h b/src/server/game/ChannelMgr.h
similarity index 100%
rename from src/game/ChannelMgr.h
rename to src/server/game/ChannelMgr.h
diff --git a/src/game/CharacterHandler.cpp b/src/server/game/CharacterHandler.cpp
similarity index 100%
rename from src/game/CharacterHandler.cpp
rename to src/server/game/CharacterHandler.cpp
diff --git a/src/game/Chat.cpp b/src/server/game/Chat.cpp
similarity index 100%
rename from src/game/Chat.cpp
rename to src/server/game/Chat.cpp
diff --git a/src/game/Chat.h b/src/server/game/Chat.h
similarity index 100%
rename from src/game/Chat.h
rename to src/server/game/Chat.h
diff --git a/src/game/ChatHandler.cpp b/src/server/game/ChatHandler.cpp
similarity index 100%
rename from src/game/ChatHandler.cpp
rename to src/server/game/ChatHandler.cpp
diff --git a/src/game/CombatAI.cpp b/src/server/game/CombatAI.cpp
similarity index 100%
rename from src/game/CombatAI.cpp
rename to src/server/game/CombatAI.cpp
diff --git a/src/game/CombatAI.h b/src/server/game/CombatAI.h
similarity index 100%
rename from src/game/CombatAI.h
rename to src/server/game/CombatAI.h
diff --git a/src/game/CombatHandler.cpp b/src/server/game/CombatHandler.cpp
similarity index 100%
rename from src/game/CombatHandler.cpp
rename to src/server/game/CombatHandler.cpp
diff --git a/src/game/ConditionMgr.cpp b/src/server/game/ConditionMgr.cpp
similarity index 100%
rename from src/game/ConditionMgr.cpp
rename to src/server/game/ConditionMgr.cpp
diff --git a/src/game/ConditionMgr.h b/src/server/game/ConditionMgr.h
similarity index 100%
rename from src/game/ConditionMgr.h
rename to src/server/game/ConditionMgr.h
diff --git a/src/game/ConfusedMovementGenerator.cpp b/src/server/game/ConfusedMovementGenerator.cpp
similarity index 100%
rename from src/game/ConfusedMovementGenerator.cpp
rename to src/server/game/ConfusedMovementGenerator.cpp
diff --git a/src/game/ConfusedMovementGenerator.h b/src/server/game/ConfusedMovementGenerator.h
similarity index 100%
rename from src/game/ConfusedMovementGenerator.h
rename to src/server/game/ConfusedMovementGenerator.h
diff --git a/src/game/Corpse.cpp b/src/server/game/Corpse.cpp
similarity index 100%
rename from src/game/Corpse.cpp
rename to src/server/game/Corpse.cpp
diff --git a/src/game/Corpse.h b/src/server/game/Corpse.h
similarity index 100%
rename from src/game/Corpse.h
rename to src/server/game/Corpse.h
diff --git a/src/game/Creature.cpp b/src/server/game/Creature.cpp
similarity index 100%
rename from src/game/Creature.cpp
rename to src/server/game/Creature.cpp
diff --git a/src/game/Creature.h b/src/server/game/Creature.h
similarity index 100%
rename from src/game/Creature.h
rename to src/server/game/Creature.h
diff --git a/src/game/CreatureAI.cpp b/src/server/game/CreatureAI.cpp
similarity index 100%
rename from src/game/CreatureAI.cpp
rename to src/server/game/CreatureAI.cpp
diff --git a/src/game/CreatureAI.h b/src/server/game/CreatureAI.h
similarity index 100%
rename from src/game/CreatureAI.h
rename to src/server/game/CreatureAI.h
diff --git a/src/game/CreatureAIFactory.h b/src/server/game/CreatureAIFactory.h
similarity index 100%
rename from src/game/CreatureAIFactory.h
rename to src/server/game/CreatureAIFactory.h
diff --git a/src/game/CreatureAIImpl.h b/src/server/game/CreatureAIImpl.h
similarity index 100%
rename from src/game/CreatureAIImpl.h
rename to src/server/game/CreatureAIImpl.h
diff --git a/src/game/CreatureAIRegistry.cpp b/src/server/game/CreatureAIRegistry.cpp
similarity index 100%
rename from src/game/CreatureAIRegistry.cpp
rename to src/server/game/CreatureAIRegistry.cpp
diff --git a/src/game/CreatureAIRegistry.h b/src/server/game/CreatureAIRegistry.h
similarity index 100%
rename from src/game/CreatureAIRegistry.h
rename to src/server/game/CreatureAIRegistry.h
diff --git a/src/game/CreatureAISelector.cpp b/src/server/game/CreatureAISelector.cpp
similarity index 100%
rename from src/game/CreatureAISelector.cpp
rename to src/server/game/CreatureAISelector.cpp
diff --git a/src/game/CreatureAISelector.h b/src/server/game/CreatureAISelector.h
similarity index 100%
rename from src/game/CreatureAISelector.h
rename to src/server/game/CreatureAISelector.h
diff --git a/src/game/CreatureEventAI.cpp b/src/server/game/CreatureEventAI.cpp
similarity index 100%
rename from src/game/CreatureEventAI.cpp
rename to src/server/game/CreatureEventAI.cpp
diff --git a/src/game/CreatureEventAI.h b/src/server/game/CreatureEventAI.h
similarity index 100%
rename from src/game/CreatureEventAI.h
rename to src/server/game/CreatureEventAI.h
diff --git a/src/game/CreatureEventAIMgr.cpp b/src/server/game/CreatureEventAIMgr.cpp
similarity index 100%
rename from src/game/CreatureEventAIMgr.cpp
rename to src/server/game/CreatureEventAIMgr.cpp
diff --git a/src/game/CreatureEventAIMgr.h b/src/server/game/CreatureEventAIMgr.h
similarity index 100%
rename from src/game/CreatureEventAIMgr.h
rename to src/server/game/CreatureEventAIMgr.h
diff --git a/src/game/CreatureGroups.cpp b/src/server/game/CreatureGroups.cpp
similarity index 100%
rename from src/game/CreatureGroups.cpp
rename to src/server/game/CreatureGroups.cpp
diff --git a/src/game/CreatureGroups.h b/src/server/game/CreatureGroups.h
similarity index 100%
rename from src/game/CreatureGroups.h
rename to src/server/game/CreatureGroups.h
diff --git a/src/game/DBCEnums.h b/src/server/game/DBCEnums.h
similarity index 100%
rename from src/game/DBCEnums.h
rename to src/server/game/DBCEnums.h
diff --git a/src/game/DBCStores.cpp b/src/server/game/DBCStores.cpp
similarity index 100%
rename from src/game/DBCStores.cpp
rename to src/server/game/DBCStores.cpp
diff --git a/src/game/DBCStores.h b/src/server/game/DBCStores.h
similarity index 100%
rename from src/game/DBCStores.h
rename to src/server/game/DBCStores.h
diff --git a/src/game/DBCStructure.h b/src/server/game/DBCStructure.h
similarity index 100%
rename from src/game/DBCStructure.h
rename to src/server/game/DBCStructure.h
diff --git a/src/game/DBCfmt.h b/src/server/game/DBCfmt.h
similarity index 100%
rename from src/game/DBCfmt.h
rename to src/server/game/DBCfmt.h
diff --git a/src/game/Debugcmds.cpp b/src/server/game/Debugcmds.cpp
similarity index 100%
rename from src/game/Debugcmds.cpp
rename to src/server/game/Debugcmds.cpp
diff --git a/src/game/DestinationHolder.cpp b/src/server/game/DestinationHolder.cpp
similarity index 100%
rename from src/game/DestinationHolder.cpp
rename to src/server/game/DestinationHolder.cpp
diff --git a/src/game/DestinationHolder.h b/src/server/game/DestinationHolder.h
similarity index 100%
rename from src/game/DestinationHolder.h
rename to src/server/game/DestinationHolder.h
diff --git a/src/game/DestinationHolderImp.h b/src/server/game/DestinationHolderImp.h
similarity index 100%
rename from src/game/DestinationHolderImp.h
rename to src/server/game/DestinationHolderImp.h
diff --git a/src/game/DuelHandler.cpp b/src/server/game/DuelHandler.cpp
similarity index 100%
rename from src/game/DuelHandler.cpp
rename to src/server/game/DuelHandler.cpp
diff --git a/src/game/DynamicObject.cpp b/src/server/game/DynamicObject.cpp
similarity index 100%
rename from src/game/DynamicObject.cpp
rename to src/server/game/DynamicObject.cpp
diff --git a/src/game/DynamicObject.h b/src/server/game/DynamicObject.h
similarity index 100%
rename from src/game/DynamicObject.h
rename to src/server/game/DynamicObject.h
diff --git a/src/game/FleeingMovementGenerator.cpp b/src/server/game/FleeingMovementGenerator.cpp
similarity index 100%
rename from src/game/FleeingMovementGenerator.cpp
rename to src/server/game/FleeingMovementGenerator.cpp
diff --git a/src/game/FleeingMovementGenerator.h b/src/server/game/FleeingMovementGenerator.h
similarity index 100%
rename from src/game/FleeingMovementGenerator.h
rename to src/server/game/FleeingMovementGenerator.h
diff --git a/src/game/FollowerRefManager.h b/src/server/game/FollowerRefManager.h
similarity index 100%
rename from src/game/FollowerRefManager.h
rename to src/server/game/FollowerRefManager.h
diff --git a/src/game/FollowerReference.cpp b/src/server/game/FollowerReference.cpp
similarity index 100%
rename from src/game/FollowerReference.cpp
rename to src/server/game/FollowerReference.cpp
diff --git a/src/game/FollowerReference.h b/src/server/game/FollowerReference.h
similarity index 100%
rename from src/game/FollowerReference.h
rename to src/server/game/FollowerReference.h
diff --git a/src/game/Formulas.h b/src/server/game/Formulas.h
similarity index 100%
rename from src/game/Formulas.h
rename to src/server/game/Formulas.h
diff --git a/src/game/GameEventMgr.cpp b/src/server/game/GameEventMgr.cpp
similarity index 100%
rename from src/game/GameEventMgr.cpp
rename to src/server/game/GameEventMgr.cpp
diff --git a/src/game/GameEventMgr.h b/src/server/game/GameEventMgr.h
similarity index 100%
rename from src/game/GameEventMgr.h
rename to src/server/game/GameEventMgr.h
diff --git a/src/game/GameObject.cpp b/src/server/game/GameObject.cpp
similarity index 100%
rename from src/game/GameObject.cpp
rename to src/server/game/GameObject.cpp
diff --git a/src/game/GameObject.h b/src/server/game/GameObject.h
similarity index 100%
rename from src/game/GameObject.h
rename to src/server/game/GameObject.h
diff --git a/src/game/GlobalEvents.cpp b/src/server/game/GlobalEvents.cpp
similarity index 100%
rename from src/game/GlobalEvents.cpp
rename to src/server/game/GlobalEvents.cpp
diff --git a/src/game/GlobalEvents.h b/src/server/game/GlobalEvents.h
similarity index 100%
rename from src/game/GlobalEvents.h
rename to src/server/game/GlobalEvents.h
diff --git a/src/game/GossipDef.cpp b/src/server/game/GossipDef.cpp
similarity index 100%
rename from src/game/GossipDef.cpp
rename to src/server/game/GossipDef.cpp
diff --git a/src/game/GossipDef.h b/src/server/game/GossipDef.h
similarity index 100%
rename from src/game/GossipDef.h
rename to src/server/game/GossipDef.h
diff --git a/src/game/GridDefines.h b/src/server/game/GridDefines.h
similarity index 100%
rename from src/game/GridDefines.h
rename to src/server/game/GridDefines.h
diff --git a/src/game/GridNotifiers.cpp b/src/server/game/GridNotifiers.cpp
similarity index 100%
rename from src/game/GridNotifiers.cpp
rename to src/server/game/GridNotifiers.cpp
diff --git a/src/game/GridNotifiers.h b/src/server/game/GridNotifiers.h
similarity index 100%
rename from src/game/GridNotifiers.h
rename to src/server/game/GridNotifiers.h
diff --git a/src/game/GridNotifiersImpl.h b/src/server/game/GridNotifiersImpl.h
similarity index 100%
rename from src/game/GridNotifiersImpl.h
rename to src/server/game/GridNotifiersImpl.h
diff --git a/src/game/GridStates.cpp b/src/server/game/GridStates.cpp
similarity index 100%
rename from src/game/GridStates.cpp
rename to src/server/game/GridStates.cpp
diff --git a/src/game/GridStates.h b/src/server/game/GridStates.h
similarity index 100%
rename from src/game/GridStates.h
rename to src/server/game/GridStates.h
diff --git a/src/game/Group.cpp b/src/server/game/Group.cpp
similarity index 100%
rename from src/game/Group.cpp
rename to src/server/game/Group.cpp
diff --git a/src/game/Group.h b/src/server/game/Group.h
similarity index 100%
rename from src/game/Group.h
rename to src/server/game/Group.h
diff --git a/src/game/GroupHandler.cpp b/src/server/game/GroupHandler.cpp
similarity index 100%
rename from src/game/GroupHandler.cpp
rename to src/server/game/GroupHandler.cpp
diff --git a/src/game/GroupRefManager.h b/src/server/game/GroupRefManager.h
similarity index 100%
rename from src/game/GroupRefManager.h
rename to src/server/game/GroupRefManager.h
diff --git a/src/game/GroupReference.cpp b/src/server/game/GroupReference.cpp
similarity index 100%
rename from src/game/GroupReference.cpp
rename to src/server/game/GroupReference.cpp
diff --git a/src/game/GroupReference.h b/src/server/game/GroupReference.h
similarity index 100%
rename from src/game/GroupReference.h
rename to src/server/game/GroupReference.h
diff --git a/src/game/GuardAI.cpp b/src/server/game/GuardAI.cpp
similarity index 100%
rename from src/game/GuardAI.cpp
rename to src/server/game/GuardAI.cpp
diff --git a/src/game/GuardAI.h b/src/server/game/GuardAI.h
similarity index 100%
rename from src/game/GuardAI.h
rename to src/server/game/GuardAI.h
diff --git a/src/game/Guild.cpp b/src/server/game/Guild.cpp
similarity index 100%
rename from src/game/Guild.cpp
rename to src/server/game/Guild.cpp
diff --git a/src/game/Guild.h b/src/server/game/Guild.h
similarity index 100%
rename from src/game/Guild.h
rename to src/server/game/Guild.h
diff --git a/src/game/GuildHandler.cpp b/src/server/game/GuildHandler.cpp
similarity index 100%
rename from src/game/GuildHandler.cpp
rename to src/server/game/GuildHandler.cpp
diff --git a/src/game/HomeMovementGenerator.cpp b/src/server/game/HomeMovementGenerator.cpp
similarity index 100%
rename from src/game/HomeMovementGenerator.cpp
rename to src/server/game/HomeMovementGenerator.cpp
diff --git a/src/game/HomeMovementGenerator.h b/src/server/game/HomeMovementGenerator.h
similarity index 100%
rename from src/game/HomeMovementGenerator.h
rename to src/server/game/HomeMovementGenerator.h
diff --git a/src/game/HostileRefManager.cpp b/src/server/game/HostileRefManager.cpp
similarity index 100%
rename from src/game/HostileRefManager.cpp
rename to src/server/game/HostileRefManager.cpp
diff --git a/src/game/HostileRefManager.h b/src/server/game/HostileRefManager.h
similarity index 100%
rename from src/game/HostileRefManager.h
rename to src/server/game/HostileRefManager.h
diff --git a/src/game/IdleMovementGenerator.cpp b/src/server/game/IdleMovementGenerator.cpp
similarity index 100%
rename from src/game/IdleMovementGenerator.cpp
rename to src/server/game/IdleMovementGenerator.cpp
diff --git a/src/game/IdleMovementGenerator.h b/src/server/game/IdleMovementGenerator.h
similarity index 100%
rename from src/game/IdleMovementGenerator.h
rename to src/server/game/IdleMovementGenerator.h
diff --git a/src/game/InstanceData.cpp b/src/server/game/InstanceData.cpp
similarity index 100%
rename from src/game/InstanceData.cpp
rename to src/server/game/InstanceData.cpp
diff --git a/src/game/InstanceData.h b/src/server/game/InstanceData.h
similarity index 100%
rename from src/game/InstanceData.h
rename to src/server/game/InstanceData.h
diff --git a/src/game/InstanceSaveMgr.cpp b/src/server/game/InstanceSaveMgr.cpp
similarity index 100%
rename from src/game/InstanceSaveMgr.cpp
rename to src/server/game/InstanceSaveMgr.cpp
diff --git a/src/game/InstanceSaveMgr.h b/src/server/game/InstanceSaveMgr.h
similarity index 100%
rename from src/game/InstanceSaveMgr.h
rename to src/server/game/InstanceSaveMgr.h
diff --git a/src/game/Item.cpp b/src/server/game/Item.cpp
similarity index 100%
rename from src/game/Item.cpp
rename to src/server/game/Item.cpp
diff --git a/src/game/Item.h b/src/server/game/Item.h
similarity index 100%
rename from src/game/Item.h
rename to src/server/game/Item.h
diff --git a/src/game/ItemEnchantmentMgr.cpp b/src/server/game/ItemEnchantmentMgr.cpp
similarity index 100%
rename from src/game/ItemEnchantmentMgr.cpp
rename to src/server/game/ItemEnchantmentMgr.cpp
diff --git a/src/game/ItemEnchantmentMgr.h b/src/server/game/ItemEnchantmentMgr.h
similarity index 100%
rename from src/game/ItemEnchantmentMgr.h
rename to src/server/game/ItemEnchantmentMgr.h
diff --git a/src/game/ItemHandler.cpp b/src/server/game/ItemHandler.cpp
similarity index 100%
rename from src/game/ItemHandler.cpp
rename to src/server/game/ItemHandler.cpp
diff --git a/src/game/ItemPrototype.h b/src/server/game/ItemPrototype.h
similarity index 100%
rename from src/game/ItemPrototype.h
rename to src/server/game/ItemPrototype.h
diff --git a/src/game/LFG.h b/src/server/game/LFG.h
similarity index 100%
rename from src/game/LFG.h
rename to src/server/game/LFG.h
diff --git a/src/game/LFGHandler.cpp b/src/server/game/LFGHandler.cpp
similarity index 100%
rename from src/game/LFGHandler.cpp
rename to src/server/game/LFGHandler.cpp
diff --git a/src/game/LFGMgr.cpp b/src/server/game/LFGMgr.cpp
similarity index 100%
rename from src/game/LFGMgr.cpp
rename to src/server/game/LFGMgr.cpp
diff --git a/src/game/LFGMgr.h b/src/server/game/LFGMgr.h
similarity index 100%
rename from src/game/LFGMgr.h
rename to src/server/game/LFGMgr.h
diff --git a/src/game/Language.h b/src/server/game/Language.h
similarity index 100%
rename from src/game/Language.h
rename to src/server/game/Language.h
diff --git a/src/game/Level0.cpp b/src/server/game/Level0.cpp
similarity index 100%
rename from src/game/Level0.cpp
rename to src/server/game/Level0.cpp
diff --git a/src/game/Level1.cpp b/src/server/game/Level1.cpp
similarity index 100%
rename from src/game/Level1.cpp
rename to src/server/game/Level1.cpp
diff --git a/src/game/Level2.cpp b/src/server/game/Level2.cpp
similarity index 100%
rename from src/game/Level2.cpp
rename to src/server/game/Level2.cpp
diff --git a/src/game/Level3.cpp b/src/server/game/Level3.cpp
similarity index 100%
rename from src/game/Level3.cpp
rename to src/server/game/Level3.cpp
diff --git a/src/game/LootHandler.cpp b/src/server/game/LootHandler.cpp
similarity index 100%
rename from src/game/LootHandler.cpp
rename to src/server/game/LootHandler.cpp
diff --git a/src/game/LootMgr.cpp b/src/server/game/LootMgr.cpp
similarity index 100%
rename from src/game/LootMgr.cpp
rename to src/server/game/LootMgr.cpp
diff --git a/src/game/LootMgr.h b/src/server/game/LootMgr.h
similarity index 100%
rename from src/game/LootMgr.h
rename to src/server/game/LootMgr.h
diff --git a/src/game/Mail.cpp b/src/server/game/Mail.cpp
similarity index 100%
rename from src/game/Mail.cpp
rename to src/server/game/Mail.cpp
diff --git a/src/game/Mail.h b/src/server/game/Mail.h
similarity index 100%
rename from src/game/Mail.h
rename to src/server/game/Mail.h
diff --git a/src/game/Map.cpp b/src/server/game/Map.cpp
similarity index 100%
rename from src/game/Map.cpp
rename to src/server/game/Map.cpp
diff --git a/src/game/Map.h b/src/server/game/Map.h
similarity index 100%
rename from src/game/Map.h
rename to src/server/game/Map.h
diff --git a/src/game/MapInstanced.cpp b/src/server/game/MapInstanced.cpp
similarity index 100%
rename from src/game/MapInstanced.cpp
rename to src/server/game/MapInstanced.cpp
diff --git a/src/game/MapInstanced.h b/src/server/game/MapInstanced.h
similarity index 100%
rename from src/game/MapInstanced.h
rename to src/server/game/MapInstanced.h
diff --git a/src/game/MapManager.cpp b/src/server/game/MapManager.cpp
similarity index 100%
rename from src/game/MapManager.cpp
rename to src/server/game/MapManager.cpp
diff --git a/src/game/MapManager.h b/src/server/game/MapManager.h
similarity index 100%
rename from src/game/MapManager.h
rename to src/server/game/MapManager.h
diff --git a/src/game/MapRefManager.h b/src/server/game/MapRefManager.h
similarity index 100%
rename from src/game/MapRefManager.h
rename to src/server/game/MapRefManager.h
diff --git a/src/game/MapReference.h b/src/server/game/MapReference.h
similarity index 100%
rename from src/game/MapReference.h
rename to src/server/game/MapReference.h
diff --git a/src/game/MapUpdater.cpp b/src/server/game/MapUpdater.cpp
similarity index 100%
rename from src/game/MapUpdater.cpp
rename to src/server/game/MapUpdater.cpp
diff --git a/src/game/MapUpdater.h b/src/server/game/MapUpdater.h
similarity index 100%
rename from src/game/MapUpdater.h
rename to src/server/game/MapUpdater.h
diff --git a/src/game/MiscHandler.cpp b/src/server/game/MiscHandler.cpp
similarity index 100%
rename from src/game/MiscHandler.cpp
rename to src/server/game/MiscHandler.cpp
diff --git a/src/game/MotionMaster.cpp b/src/server/game/MotionMaster.cpp
similarity index 100%
rename from src/game/MotionMaster.cpp
rename to src/server/game/MotionMaster.cpp
diff --git a/src/game/MotionMaster.h b/src/server/game/MotionMaster.h
similarity index 100%
rename from src/game/MotionMaster.h
rename to src/server/game/MotionMaster.h
diff --git a/src/game/MovementGenerator.cpp b/src/server/game/MovementGenerator.cpp
similarity index 100%
rename from src/game/MovementGenerator.cpp
rename to src/server/game/MovementGenerator.cpp
diff --git a/src/game/MovementGenerator.h b/src/server/game/MovementGenerator.h
similarity index 100%
rename from src/game/MovementGenerator.h
rename to src/server/game/MovementGenerator.h
diff --git a/src/game/MovementGeneratorImpl.h b/src/server/game/MovementGeneratorImpl.h
similarity index 100%
rename from src/game/MovementGeneratorImpl.h
rename to src/server/game/MovementGeneratorImpl.h
diff --git a/src/game/MovementHandler.cpp b/src/server/game/MovementHandler.cpp
similarity index 100%
rename from src/game/MovementHandler.cpp
rename to src/server/game/MovementHandler.cpp
diff --git a/src/game/NPCHandler.cpp b/src/server/game/NPCHandler.cpp
similarity index 100%
rename from src/game/NPCHandler.cpp
rename to src/server/game/NPCHandler.cpp
diff --git a/src/game/NPCHandler.h b/src/server/game/NPCHandler.h
similarity index 100%
rename from src/game/NPCHandler.h
rename to src/server/game/NPCHandler.h
diff --git a/src/game/Object.cpp b/src/server/game/Object.cpp
similarity index 100%
rename from src/game/Object.cpp
rename to src/server/game/Object.cpp
diff --git a/src/game/Object.h b/src/server/game/Object.h
similarity index 100%
rename from src/game/Object.h
rename to src/server/game/Object.h
diff --git a/src/game/ObjectAccessor.cpp b/src/server/game/ObjectAccessor.cpp
similarity index 100%
rename from src/game/ObjectAccessor.cpp
rename to src/server/game/ObjectAccessor.cpp
diff --git a/src/game/ObjectAccessor.h b/src/server/game/ObjectAccessor.h
similarity index 100%
rename from src/game/ObjectAccessor.h
rename to src/server/game/ObjectAccessor.h
diff --git a/src/game/ObjectDefines.h b/src/server/game/ObjectDefines.h
similarity index 100%
rename from src/game/ObjectDefines.h
rename to src/server/game/ObjectDefines.h
diff --git a/src/game/ObjectGridLoader.cpp b/src/server/game/ObjectGridLoader.cpp
similarity index 100%
rename from src/game/ObjectGridLoader.cpp
rename to src/server/game/ObjectGridLoader.cpp
diff --git a/src/game/ObjectGridLoader.h b/src/server/game/ObjectGridLoader.h
similarity index 100%
rename from src/game/ObjectGridLoader.h
rename to src/server/game/ObjectGridLoader.h
diff --git a/src/game/ObjectMgr.cpp b/src/server/game/ObjectMgr.cpp
similarity index 100%
rename from src/game/ObjectMgr.cpp
rename to src/server/game/ObjectMgr.cpp
diff --git a/src/game/ObjectMgr.h b/src/server/game/ObjectMgr.h
similarity index 100%
rename from src/game/ObjectMgr.h
rename to src/server/game/ObjectMgr.h
diff --git a/src/game/ObjectPosSelector.cpp b/src/server/game/ObjectPosSelector.cpp
similarity index 100%
rename from src/game/ObjectPosSelector.cpp
rename to src/server/game/ObjectPosSelector.cpp
diff --git a/src/game/ObjectPosSelector.h b/src/server/game/ObjectPosSelector.h
similarity index 100%
rename from src/game/ObjectPosSelector.h
rename to src/server/game/ObjectPosSelector.h
diff --git a/src/game/Opcodes.cpp b/src/server/game/Opcodes.cpp
similarity index 100%
rename from src/game/Opcodes.cpp
rename to src/server/game/Opcodes.cpp
diff --git a/src/game/Opcodes.h b/src/server/game/Opcodes.h
similarity index 100%
rename from src/game/Opcodes.h
rename to src/server/game/Opcodes.h
diff --git a/src/game/OutdoorPvP.cpp b/src/server/game/OutdoorPvP.cpp
similarity index 100%
rename from src/game/OutdoorPvP.cpp
rename to src/server/game/OutdoorPvP.cpp
diff --git a/src/game/OutdoorPvP.h b/src/server/game/OutdoorPvP.h
similarity index 100%
rename from src/game/OutdoorPvP.h
rename to src/server/game/OutdoorPvP.h
diff --git a/src/game/OutdoorPvPEP.cpp b/src/server/game/OutdoorPvPEP.cpp
similarity index 100%
rename from src/game/OutdoorPvPEP.cpp
rename to src/server/game/OutdoorPvPEP.cpp
diff --git a/src/game/OutdoorPvPEP.h b/src/server/game/OutdoorPvPEP.h
similarity index 100%
rename from src/game/OutdoorPvPEP.h
rename to src/server/game/OutdoorPvPEP.h
diff --git a/src/game/OutdoorPvPHP.cpp b/src/server/game/OutdoorPvPHP.cpp
similarity index 100%
rename from src/game/OutdoorPvPHP.cpp
rename to src/server/game/OutdoorPvPHP.cpp
diff --git a/src/game/OutdoorPvPHP.h b/src/server/game/OutdoorPvPHP.h
similarity index 100%
rename from src/game/OutdoorPvPHP.h
rename to src/server/game/OutdoorPvPHP.h
diff --git a/src/game/OutdoorPvPImpl.h b/src/server/game/OutdoorPvPImpl.h
similarity index 100%
rename from src/game/OutdoorPvPImpl.h
rename to src/server/game/OutdoorPvPImpl.h
diff --git a/src/game/OutdoorPvPMgr.cpp b/src/server/game/OutdoorPvPMgr.cpp
similarity index 100%
rename from src/game/OutdoorPvPMgr.cpp
rename to src/server/game/OutdoorPvPMgr.cpp
diff --git a/src/game/OutdoorPvPMgr.h b/src/server/game/OutdoorPvPMgr.h
similarity index 100%
rename from src/game/OutdoorPvPMgr.h
rename to src/server/game/OutdoorPvPMgr.h
diff --git a/src/game/OutdoorPvPNA.cpp b/src/server/game/OutdoorPvPNA.cpp
similarity index 100%
rename from src/game/OutdoorPvPNA.cpp
rename to src/server/game/OutdoorPvPNA.cpp
diff --git a/src/game/OutdoorPvPNA.h b/src/server/game/OutdoorPvPNA.h
similarity index 100%
rename from src/game/OutdoorPvPNA.h
rename to src/server/game/OutdoorPvPNA.h
diff --git a/src/game/OutdoorPvPSI.cpp b/src/server/game/OutdoorPvPSI.cpp
similarity index 100%
rename from src/game/OutdoorPvPSI.cpp
rename to src/server/game/OutdoorPvPSI.cpp
diff --git a/src/game/OutdoorPvPSI.h b/src/server/game/OutdoorPvPSI.h
similarity index 100%
rename from src/game/OutdoorPvPSI.h
rename to src/server/game/OutdoorPvPSI.h
diff --git a/src/game/OutdoorPvPTF.cpp b/src/server/game/OutdoorPvPTF.cpp
similarity index 100%
rename from src/game/OutdoorPvPTF.cpp
rename to src/server/game/OutdoorPvPTF.cpp
diff --git a/src/game/OutdoorPvPTF.h b/src/server/game/OutdoorPvPTF.h
similarity index 100%
rename from src/game/OutdoorPvPTF.h
rename to src/server/game/OutdoorPvPTF.h
diff --git a/src/game/OutdoorPvPZM.cpp b/src/server/game/OutdoorPvPZM.cpp
similarity index 100%
rename from src/game/OutdoorPvPZM.cpp
rename to src/server/game/OutdoorPvPZM.cpp
diff --git a/src/game/OutdoorPvPZM.h b/src/server/game/OutdoorPvPZM.h
similarity index 100%
rename from src/game/OutdoorPvPZM.h
rename to src/server/game/OutdoorPvPZM.h
diff --git a/src/game/PassiveAI.cpp b/src/server/game/PassiveAI.cpp
similarity index 100%
rename from src/game/PassiveAI.cpp
rename to src/server/game/PassiveAI.cpp
diff --git a/src/game/PassiveAI.h b/src/server/game/PassiveAI.h
similarity index 100%
rename from src/game/PassiveAI.h
rename to src/server/game/PassiveAI.h
diff --git a/src/game/Path.h b/src/server/game/Path.h
similarity index 100%
rename from src/game/Path.h
rename to src/server/game/Path.h
diff --git a/src/game/Pet.cpp b/src/server/game/Pet.cpp
similarity index 100%
rename from src/game/Pet.cpp
rename to src/server/game/Pet.cpp
diff --git a/src/game/Pet.h b/src/server/game/Pet.h
similarity index 100%
rename from src/game/Pet.h
rename to src/server/game/Pet.h
diff --git a/src/game/PetAI.cpp b/src/server/game/PetAI.cpp
similarity index 100%
rename from src/game/PetAI.cpp
rename to src/server/game/PetAI.cpp
diff --git a/src/game/PetAI.h b/src/server/game/PetAI.h
similarity index 100%
rename from src/game/PetAI.h
rename to src/server/game/PetAI.h
diff --git a/src/game/PetHandler.cpp b/src/server/game/PetHandler.cpp
similarity index 100%
rename from src/game/PetHandler.cpp
rename to src/server/game/PetHandler.cpp
diff --git a/src/game/PetitionsHandler.cpp b/src/server/game/PetitionsHandler.cpp
similarity index 100%
rename from src/game/PetitionsHandler.cpp
rename to src/server/game/PetitionsHandler.cpp
diff --git a/src/game/Player.cpp b/src/server/game/Player.cpp
similarity index 100%
rename from src/game/Player.cpp
rename to src/server/game/Player.cpp
diff --git a/src/game/Player.h b/src/server/game/Player.h
similarity index 100%
rename from src/game/Player.h
rename to src/server/game/Player.h
diff --git a/src/game/PlayerDump.cpp b/src/server/game/PlayerDump.cpp
similarity index 100%
rename from src/game/PlayerDump.cpp
rename to src/server/game/PlayerDump.cpp
diff --git a/src/game/PlayerDump.h b/src/server/game/PlayerDump.h
similarity index 100%
rename from src/game/PlayerDump.h
rename to src/server/game/PlayerDump.h
diff --git a/src/game/PointMovementGenerator.cpp b/src/server/game/PointMovementGenerator.cpp
similarity index 100%
rename from src/game/PointMovementGenerator.cpp
rename to src/server/game/PointMovementGenerator.cpp
diff --git a/src/game/PointMovementGenerator.h b/src/server/game/PointMovementGenerator.h
similarity index 100%
rename from src/game/PointMovementGenerator.h
rename to src/server/game/PointMovementGenerator.h
diff --git a/src/game/PoolHandler.cpp b/src/server/game/PoolHandler.cpp
similarity index 100%
rename from src/game/PoolHandler.cpp
rename to src/server/game/PoolHandler.cpp
diff --git a/src/game/PoolHandler.h b/src/server/game/PoolHandler.h
similarity index 100%
rename from src/game/PoolHandler.h
rename to src/server/game/PoolHandler.h
diff --git a/src/game/QueryHandler.cpp b/src/server/game/QueryHandler.cpp
similarity index 100%
rename from src/game/QueryHandler.cpp
rename to src/server/game/QueryHandler.cpp
diff --git a/src/game/QuestDef.cpp b/src/server/game/QuestDef.cpp
similarity index 100%
rename from src/game/QuestDef.cpp
rename to src/server/game/QuestDef.cpp
diff --git a/src/game/QuestDef.h b/src/server/game/QuestDef.h
similarity index 100%
rename from src/game/QuestDef.h
rename to src/server/game/QuestDef.h
diff --git a/src/game/QuestHandler.cpp b/src/server/game/QuestHandler.cpp
similarity index 100%
rename from src/game/QuestHandler.cpp
rename to src/server/game/QuestHandler.cpp
diff --git a/src/game/RandomMovementGenerator.cpp b/src/server/game/RandomMovementGenerator.cpp
similarity index 100%
rename from src/game/RandomMovementGenerator.cpp
rename to src/server/game/RandomMovementGenerator.cpp
diff --git a/src/game/RandomMovementGenerator.h b/src/server/game/RandomMovementGenerator.h
similarity index 100%
rename from src/game/RandomMovementGenerator.h
rename to src/server/game/RandomMovementGenerator.h
diff --git a/src/game/ReactorAI.cpp b/src/server/game/ReactorAI.cpp
similarity index 100%
rename from src/game/ReactorAI.cpp
rename to src/server/game/ReactorAI.cpp
diff --git a/src/game/ReactorAI.h b/src/server/game/ReactorAI.h
similarity index 100%
rename from src/game/ReactorAI.h
rename to src/server/game/ReactorAI.h
diff --git a/src/game/ReputationMgr.cpp b/src/server/game/ReputationMgr.cpp
similarity index 100%
rename from src/game/ReputationMgr.cpp
rename to src/server/game/ReputationMgr.cpp
diff --git a/src/game/ReputationMgr.h b/src/server/game/ReputationMgr.h
similarity index 100%
rename from src/game/ReputationMgr.h
rename to src/server/game/ReputationMgr.h
diff --git a/src/game/ScriptLoader.cpp b/src/server/game/ScriptLoader.cpp
similarity index 100%
rename from src/game/ScriptLoader.cpp
rename to src/server/game/ScriptLoader.cpp
diff --git a/src/game/ScriptLoader.h b/src/server/game/ScriptLoader.h
similarity index 100%
rename from src/game/ScriptLoader.h
rename to src/server/game/ScriptLoader.h
diff --git a/src/game/ScriptMgr.cpp b/src/server/game/ScriptMgr.cpp
similarity index 100%
rename from src/game/ScriptMgr.cpp
rename to src/server/game/ScriptMgr.cpp
diff --git a/src/game/ScriptMgr.h b/src/server/game/ScriptMgr.h
similarity index 100%
rename from src/game/ScriptMgr.h
rename to src/server/game/ScriptMgr.h
diff --git a/src/game/ScriptSystem.cpp b/src/server/game/ScriptSystem.cpp
similarity index 100%
rename from src/game/ScriptSystem.cpp
rename to src/server/game/ScriptSystem.cpp
diff --git a/src/game/ScriptSystem.h b/src/server/game/ScriptSystem.h
similarity index 100%
rename from src/game/ScriptSystem.h
rename to src/server/game/ScriptSystem.h
diff --git a/src/game/ScriptedCreature.cpp b/src/server/game/ScriptedCreature.cpp
similarity index 100%
rename from src/game/ScriptedCreature.cpp
rename to src/server/game/ScriptedCreature.cpp
diff --git a/src/game/ScriptedCreature.h b/src/server/game/ScriptedCreature.h
similarity index 100%
rename from src/game/ScriptedCreature.h
rename to src/server/game/ScriptedCreature.h
diff --git a/src/game/ScriptedEscortAI.cpp b/src/server/game/ScriptedEscortAI.cpp
similarity index 100%
rename from src/game/ScriptedEscortAI.cpp
rename to src/server/game/ScriptedEscortAI.cpp
diff --git a/src/game/ScriptedEscortAI.h b/src/server/game/ScriptedEscortAI.h
similarity index 100%
rename from src/game/ScriptedEscortAI.h
rename to src/server/game/ScriptedEscortAI.h
diff --git a/src/game/ScriptedFollowerAI.cpp b/src/server/game/ScriptedFollowerAI.cpp
similarity index 100%
rename from src/game/ScriptedFollowerAI.cpp
rename to src/server/game/ScriptedFollowerAI.cpp
diff --git a/src/game/ScriptedFollowerAI.h b/src/server/game/ScriptedFollowerAI.h
similarity index 100%
rename from src/game/ScriptedFollowerAI.h
rename to src/server/game/ScriptedFollowerAI.h
diff --git a/src/game/ScriptedGossip.h b/src/server/game/ScriptedGossip.h
similarity index 100%
rename from src/game/ScriptedGossip.h
rename to src/server/game/ScriptedGossip.h
diff --git a/src/game/ScriptedGuardAI.cpp b/src/server/game/ScriptedGuardAI.cpp
similarity index 100%
rename from src/game/ScriptedGuardAI.cpp
rename to src/server/game/ScriptedGuardAI.cpp
diff --git a/src/game/ScriptedGuardAI.h b/src/server/game/ScriptedGuardAI.h
similarity index 100%
rename from src/game/ScriptedGuardAI.h
rename to src/server/game/ScriptedGuardAI.h
diff --git a/src/game/ScriptedInstance.h b/src/server/game/ScriptedInstance.h
similarity index 100%
rename from src/game/ScriptedInstance.h
rename to src/server/game/ScriptedInstance.h
diff --git a/src/game/ScriptedPch.cpp b/src/server/game/ScriptedPch.cpp
similarity index 100%
rename from src/game/ScriptedPch.cpp
rename to src/server/game/ScriptedPch.cpp
diff --git a/src/game/ScriptedPch.h b/src/server/game/ScriptedPch.h
similarity index 100%
rename from src/game/ScriptedPch.h
rename to src/server/game/ScriptedPch.h
diff --git a/src/game/ScriptedSimpleAI.cpp b/src/server/game/ScriptedSimpleAI.cpp
similarity index 100%
rename from src/game/ScriptedSimpleAI.cpp
rename to src/server/game/ScriptedSimpleAI.cpp
diff --git a/src/game/ScriptedSimpleAI.h b/src/server/game/ScriptedSimpleAI.h
similarity index 100%
rename from src/game/ScriptedSimpleAI.h
rename to src/server/game/ScriptedSimpleAI.h
diff --git a/src/game/ScriptedSmartAI.cpp b/src/server/game/ScriptedSmartAI.cpp
similarity index 100%
rename from src/game/ScriptedSmartAI.cpp
rename to src/server/game/ScriptedSmartAI.cpp
diff --git a/src/game/ScriptedSmartAI.h b/src/server/game/ScriptedSmartAI.h
similarity index 100%
rename from src/game/ScriptedSmartAI.h
rename to src/server/game/ScriptedSmartAI.h
diff --git a/src/game/SharedDefines.h b/src/server/game/SharedDefines.h
similarity index 100%
rename from src/game/SharedDefines.h
rename to src/server/game/SharedDefines.h
diff --git a/src/game/SkillDiscovery.cpp b/src/server/game/SkillDiscovery.cpp
similarity index 100%
rename from src/game/SkillDiscovery.cpp
rename to src/server/game/SkillDiscovery.cpp
diff --git a/src/game/SkillDiscovery.h b/src/server/game/SkillDiscovery.h
similarity index 100%
rename from src/game/SkillDiscovery.h
rename to src/server/game/SkillDiscovery.h
diff --git a/src/game/SkillExtraItems.cpp b/src/server/game/SkillExtraItems.cpp
similarity index 100%
rename from src/game/SkillExtraItems.cpp
rename to src/server/game/SkillExtraItems.cpp
diff --git a/src/game/SkillExtraItems.h b/src/server/game/SkillExtraItems.h
similarity index 100%
rename from src/game/SkillExtraItems.h
rename to src/server/game/SkillExtraItems.h
diff --git a/src/game/SkillHandler.cpp b/src/server/game/SkillHandler.cpp
similarity index 100%
rename from src/game/SkillHandler.cpp
rename to src/server/game/SkillHandler.cpp
diff --git a/src/game/SocialMgr.cpp b/src/server/game/SocialMgr.cpp
similarity index 100%
rename from src/game/SocialMgr.cpp
rename to src/server/game/SocialMgr.cpp
diff --git a/src/game/SocialMgr.h b/src/server/game/SocialMgr.h
similarity index 100%
rename from src/game/SocialMgr.h
rename to src/server/game/SocialMgr.h
diff --git a/src/game/Spell.cpp b/src/server/game/Spell.cpp
similarity index 100%
rename from src/game/Spell.cpp
rename to src/server/game/Spell.cpp
diff --git a/src/game/Spell.h b/src/server/game/Spell.h
similarity index 100%
rename from src/game/Spell.h
rename to src/server/game/Spell.h
diff --git a/src/game/SpellAuraDefines.h b/src/server/game/SpellAuraDefines.h
similarity index 100%
rename from src/game/SpellAuraDefines.h
rename to src/server/game/SpellAuraDefines.h
diff --git a/src/game/SpellAuraEffects.cpp b/src/server/game/SpellAuraEffects.cpp
similarity index 100%
rename from src/game/SpellAuraEffects.cpp
rename to src/server/game/SpellAuraEffects.cpp
diff --git a/src/game/SpellAuraEffects.h b/src/server/game/SpellAuraEffects.h
similarity index 100%
rename from src/game/SpellAuraEffects.h
rename to src/server/game/SpellAuraEffects.h
diff --git a/src/game/SpellAuras.cpp b/src/server/game/SpellAuras.cpp
similarity index 100%
rename from src/game/SpellAuras.cpp
rename to src/server/game/SpellAuras.cpp
diff --git a/src/game/SpellAuras.h b/src/server/game/SpellAuras.h
similarity index 100%
rename from src/game/SpellAuras.h
rename to src/server/game/SpellAuras.h
diff --git a/src/game/SpellEffects.cpp b/src/server/game/SpellEffects.cpp
similarity index 100%
rename from src/game/SpellEffects.cpp
rename to src/server/game/SpellEffects.cpp
diff --git a/src/game/SpellHandler.cpp b/src/server/game/SpellHandler.cpp
similarity index 100%
rename from src/game/SpellHandler.cpp
rename to src/server/game/SpellHandler.cpp
diff --git a/src/game/SpellMgr.cpp b/src/server/game/SpellMgr.cpp
similarity index 100%
rename from src/game/SpellMgr.cpp
rename to src/server/game/SpellMgr.cpp
diff --git a/src/game/SpellMgr.h b/src/server/game/SpellMgr.h
similarity index 100%
rename from src/game/SpellMgr.h
rename to src/server/game/SpellMgr.h
diff --git a/src/game/StatSystem.cpp b/src/server/game/StatSystem.cpp
similarity index 100%
rename from src/game/StatSystem.cpp
rename to src/server/game/StatSystem.cpp
diff --git a/src/game/TargetedMovementGenerator.cpp b/src/server/game/TargetedMovementGenerator.cpp
similarity index 100%
rename from src/game/TargetedMovementGenerator.cpp
rename to src/server/game/TargetedMovementGenerator.cpp
diff --git a/src/game/TargetedMovementGenerator.h b/src/server/game/TargetedMovementGenerator.h
similarity index 100%
rename from src/game/TargetedMovementGenerator.h
rename to src/server/game/TargetedMovementGenerator.h
diff --git a/src/game/TaxiHandler.cpp b/src/server/game/TaxiHandler.cpp
similarity index 100%
rename from src/game/TaxiHandler.cpp
rename to src/server/game/TaxiHandler.cpp
diff --git a/src/game/TemporarySummon.cpp b/src/server/game/TemporarySummon.cpp
similarity index 100%
rename from src/game/TemporarySummon.cpp
rename to src/server/game/TemporarySummon.cpp
diff --git a/src/game/TemporarySummon.h b/src/server/game/TemporarySummon.h
similarity index 100%
rename from src/game/TemporarySummon.h
rename to src/server/game/TemporarySummon.h
diff --git a/src/game/ThreatManager.cpp b/src/server/game/ThreatManager.cpp
similarity index 100%
rename from src/game/ThreatManager.cpp
rename to src/server/game/ThreatManager.cpp
diff --git a/src/game/ThreatManager.h b/src/server/game/ThreatManager.h
similarity index 100%
rename from src/game/ThreatManager.h
rename to src/server/game/ThreatManager.h
diff --git a/src/game/TicketHandler.cpp b/src/server/game/TicketHandler.cpp
similarity index 100%
rename from src/game/TicketHandler.cpp
rename to src/server/game/TicketHandler.cpp
diff --git a/src/game/TimeMgr.cpp b/src/server/game/TimeMgr.cpp
similarity index 100%
rename from src/game/TimeMgr.cpp
rename to src/server/game/TimeMgr.cpp
diff --git a/src/game/TimeMgr.h b/src/server/game/TimeMgr.h
similarity index 100%
rename from src/game/TimeMgr.h
rename to src/server/game/TimeMgr.h
diff --git a/src/game/Tools.cpp b/src/server/game/Tools.cpp
similarity index 100%
rename from src/game/Tools.cpp
rename to src/server/game/Tools.cpp
diff --git a/src/game/Tools.h b/src/server/game/Tools.h
similarity index 100%
rename from src/game/Tools.h
rename to src/server/game/Tools.h
diff --git a/src/game/Totem.cpp b/src/server/game/Totem.cpp
similarity index 100%
rename from src/game/Totem.cpp
rename to src/server/game/Totem.cpp
diff --git a/src/game/Totem.h b/src/server/game/Totem.h
similarity index 100%
rename from src/game/Totem.h
rename to src/server/game/Totem.h
diff --git a/src/game/TotemAI.cpp b/src/server/game/TotemAI.cpp
similarity index 100%
rename from src/game/TotemAI.cpp
rename to src/server/game/TotemAI.cpp
diff --git a/src/game/TotemAI.h b/src/server/game/TotemAI.h
similarity index 100%
rename from src/game/TotemAI.h
rename to src/server/game/TotemAI.h
diff --git a/src/game/TradeHandler.cpp b/src/server/game/TradeHandler.cpp
similarity index 100%
rename from src/game/TradeHandler.cpp
rename to src/server/game/TradeHandler.cpp
diff --git a/src/game/Transports.cpp b/src/server/game/Transports.cpp
similarity index 100%
rename from src/game/Transports.cpp
rename to src/server/game/Transports.cpp
diff --git a/src/game/Transports.h b/src/server/game/Transports.h
similarity index 100%
rename from src/game/Transports.h
rename to src/server/game/Transports.h
diff --git a/src/game/Traveller.h b/src/server/game/Traveller.h
similarity index 100%
rename from src/game/Traveller.h
rename to src/server/game/Traveller.h
diff --git a/src/game/Unit.cpp b/src/server/game/Unit.cpp
similarity index 100%
rename from src/game/Unit.cpp
rename to src/server/game/Unit.cpp
diff --git a/src/game/Unit.h b/src/server/game/Unit.h
similarity index 100%
rename from src/game/Unit.h
rename to src/server/game/Unit.h
diff --git a/src/game/UnitAI.cpp b/src/server/game/UnitAI.cpp
similarity index 100%
rename from src/game/UnitAI.cpp
rename to src/server/game/UnitAI.cpp
diff --git a/src/game/UnitAI.h b/src/server/game/UnitAI.h
similarity index 100%
rename from src/game/UnitAI.h
rename to src/server/game/UnitAI.h
diff --git a/src/game/UnitEvents.h b/src/server/game/UnitEvents.h
similarity index 100%
rename from src/game/UnitEvents.h
rename to src/server/game/UnitEvents.h
diff --git a/src/game/UpdateData.cpp b/src/server/game/UpdateData.cpp
similarity index 100%
rename from src/game/UpdateData.cpp
rename to src/server/game/UpdateData.cpp
diff --git a/src/game/UpdateData.h b/src/server/game/UpdateData.h
similarity index 100%
rename from src/game/UpdateData.h
rename to src/server/game/UpdateData.h
diff --git a/src/game/UpdateFields.h b/src/server/game/UpdateFields.h
similarity index 100%
rename from src/game/UpdateFields.h
rename to src/server/game/UpdateFields.h
diff --git a/src/game/UpdateMask.h b/src/server/game/UpdateMask.h
similarity index 100%
rename from src/game/UpdateMask.h
rename to src/server/game/UpdateMask.h
diff --git a/src/game/Vehicle.cpp b/src/server/game/Vehicle.cpp
similarity index 100%
rename from src/game/Vehicle.cpp
rename to src/server/game/Vehicle.cpp
diff --git a/src/game/Vehicle.h b/src/server/game/Vehicle.h
similarity index 100%
rename from src/game/Vehicle.h
rename to src/server/game/Vehicle.h
diff --git a/src/game/VoiceChatHandler.cpp b/src/server/game/VoiceChatHandler.cpp
similarity index 100%
rename from src/game/VoiceChatHandler.cpp
rename to src/server/game/VoiceChatHandler.cpp
diff --git a/src/game/WaypointManager.cpp b/src/server/game/WaypointManager.cpp
similarity index 100%
rename from src/game/WaypointManager.cpp
rename to src/server/game/WaypointManager.cpp
diff --git a/src/game/WaypointManager.h b/src/server/game/WaypointManager.h
similarity index 100%
rename from src/game/WaypointManager.h
rename to src/server/game/WaypointManager.h
diff --git a/src/game/WaypointMovementGenerator.cpp b/src/server/game/WaypointMovementGenerator.cpp
similarity index 100%
rename from src/game/WaypointMovementGenerator.cpp
rename to src/server/game/WaypointMovementGenerator.cpp
diff --git a/src/game/WaypointMovementGenerator.h b/src/server/game/WaypointMovementGenerator.h
similarity index 100%
rename from src/game/WaypointMovementGenerator.h
rename to src/server/game/WaypointMovementGenerator.h
diff --git a/src/game/Weather.cpp b/src/server/game/Weather.cpp
similarity index 100%
rename from src/game/Weather.cpp
rename to src/server/game/Weather.cpp
diff --git a/src/game/Weather.h b/src/server/game/Weather.h
similarity index 100%
rename from src/game/Weather.h
rename to src/server/game/Weather.h
diff --git a/src/game/World.cpp b/src/server/game/World.cpp
similarity index 100%
rename from src/game/World.cpp
rename to src/server/game/World.cpp
diff --git a/src/game/World.h b/src/server/game/World.h
similarity index 100%
rename from src/game/World.h
rename to src/server/game/World.h
diff --git a/src/game/WorldLog.cpp b/src/server/game/WorldLog.cpp
similarity index 100%
rename from src/game/WorldLog.cpp
rename to src/server/game/WorldLog.cpp
diff --git a/src/game/WorldLog.h b/src/server/game/WorldLog.h
similarity index 100%
rename from src/game/WorldLog.h
rename to src/server/game/WorldLog.h
diff --git a/src/game/WorldSession.cpp b/src/server/game/WorldSession.cpp
similarity index 100%
rename from src/game/WorldSession.cpp
rename to src/server/game/WorldSession.cpp
diff --git a/src/game/WorldSession.h b/src/server/game/WorldSession.h
similarity index 100%
rename from src/game/WorldSession.h
rename to src/server/game/WorldSession.h
diff --git a/src/game/WorldSocket.cpp b/src/server/game/WorldSocket.cpp
similarity index 100%
rename from src/game/WorldSocket.cpp
rename to src/server/game/WorldSocket.cpp
diff --git a/src/game/WorldSocket.h b/src/server/game/WorldSocket.h
similarity index 100%
rename from src/game/WorldSocket.h
rename to src/server/game/WorldSocket.h
diff --git a/src/game/WorldSocketMgr.cpp b/src/server/game/WorldSocketMgr.cpp
similarity index 100%
rename from src/game/WorldSocketMgr.cpp
rename to src/server/game/WorldSocketMgr.cpp
diff --git a/src/game/WorldSocketMgr.h b/src/server/game/WorldSocketMgr.h
similarity index 100%
rename from src/game/WorldSocketMgr.h
rename to src/server/game/WorldSocketMgr.h
diff --git a/src/game/ZoneScript.h b/src/server/game/ZoneScript.h
similarity index 100%
rename from src/game/ZoneScript.h
rename to src/server/game/ZoneScript.h
diff --git a/src/game/pchdef.cpp b/src/server/game/pchdef.cpp
similarity index 100%
rename from src/game/pchdef.cpp
rename to src/server/game/pchdef.cpp
diff --git a/src/game/pchdef.h b/src/server/game/pchdef.h
similarity index 100%
rename from src/game/pchdef.h
rename to src/server/game/pchdef.h
diff --git a/src/game/pchlinux.cpp b/src/server/game/pchlinux.cpp
similarity index 100%
rename from src/game/pchlinux.cpp
rename to src/server/game/pchlinux.cpp
diff --git a/src/game/pchlinux.h b/src/server/game/pchlinux.h
similarity index 100%
rename from src/game/pchlinux.h
rename to src/server/game/pchlinux.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/custom/custom_example.cpp b/src/server/scripts/custom/custom_example.cpp
similarity index 100%
rename from src/scripts/custom/custom_example.cpp
rename to src/server/scripts/custom/custom_example.cpp
diff --git a/src/scripts/custom/custom_gossip_codebox.cpp b/src/server/scripts/custom/custom_gossip_codebox.cpp
similarity index 100%
rename from src/scripts/custom/custom_gossip_codebox.cpp
rename to src/server/scripts/custom/custom_gossip_codebox.cpp
diff --git a/src/scripts/custom/npc_acherus_taxi.cpp b/src/server/scripts/custom/npc_acherus_taxi.cpp
similarity index 100%
rename from src/scripts/custom/npc_acherus_taxi.cpp
rename to src/server/scripts/custom/npc_acherus_taxi.cpp
diff --git a/src/scripts/custom/npc_wyrmresttempel_taxi.cpp b/src/server/scripts/custom/npc_wyrmresttempel_taxi.cpp
similarity index 100%
rename from src/scripts/custom/npc_wyrmresttempel_taxi.cpp
rename to src/server/scripts/custom/npc_wyrmresttempel_taxi.cpp
diff --git a/src/scripts/custom/on_events.cpp b/src/server/scripts/custom/on_events.cpp
similarity index 100%
rename from src/scripts/custom/on_events.cpp
rename to src/server/scripts/custom/on_events.cpp
diff --git a/src/scripts/custom/test.cpp b/src/server/scripts/custom/test.cpp
similarity index 100%
rename from src/scripts/custom/test.cpp
rename to src/server/scripts/custom/test.cpp
diff --git a/src/scripts/eastern_kingdoms/alterac_mountains.cpp b/src/server/scripts/eastern_kingdoms/alterac_mountains.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/alterac_mountains.cpp
rename to src/server/scripts/eastern_kingdoms/alterac_mountains.cpp
diff --git a/src/scripts/eastern_kingdoms/alterac_valley/alterac_valley.cpp b/src/server/scripts/eastern_kingdoms/alterac_valley/alterac_valley.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/alterac_valley/alterac_valley.cpp
rename to src/server/scripts/eastern_kingdoms/alterac_valley/alterac_valley.cpp
diff --git a/src/scripts/eastern_kingdoms/alterac_valley/boss_balinda.cpp b/src/server/scripts/eastern_kingdoms/alterac_valley/boss_balinda.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/alterac_valley/boss_balinda.cpp
rename to src/server/scripts/eastern_kingdoms/alterac_valley/boss_balinda.cpp
diff --git a/src/scripts/eastern_kingdoms/alterac_valley/boss_drekthar.cpp b/src/server/scripts/eastern_kingdoms/alterac_valley/boss_drekthar.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/alterac_valley/boss_drekthar.cpp
rename to src/server/scripts/eastern_kingdoms/alterac_valley/boss_drekthar.cpp
diff --git a/src/scripts/eastern_kingdoms/alterac_valley/boss_galvangar.cpp b/src/server/scripts/eastern_kingdoms/alterac_valley/boss_galvangar.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/alterac_valley/boss_galvangar.cpp
rename to src/server/scripts/eastern_kingdoms/alterac_valley/boss_galvangar.cpp
diff --git a/src/scripts/eastern_kingdoms/alterac_valley/boss_vanndar.cpp b/src/server/scripts/eastern_kingdoms/alterac_valley/boss_vanndar.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/alterac_valley/boss_vanndar.cpp
rename to src/server/scripts/eastern_kingdoms/alterac_valley/boss_vanndar.cpp
diff --git a/src/scripts/eastern_kingdoms/arathi_highlands.cpp b/src/server/scripts/eastern_kingdoms/arathi_highlands.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/arathi_highlands.cpp
rename to src/server/scripts/eastern_kingdoms/arathi_highlands.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp b/src/server/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.h b/src/server/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.h
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.h
rename to src/server/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.h
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp b/src/server/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp b/src/server/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp b/src/server/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp b/src/server/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp b/src/server/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp b/src/server/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp b/src/server/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp b/src/server/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp b/src/server/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.cpp b/src/server/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.h b/src/server/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.h
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.h
rename to src/server/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.h
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp b/src/server/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp b/src/server/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp b/src/server/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp b/src/server/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp b/src/server/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp b/src/server/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp b/src/server/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp b/src/server/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp b/src/server/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp b/src/server/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/instance_blackrock_spire.cpp b/src/server/scripts/eastern_kingdoms/blackrock_spire/instance_blackrock_spire.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackrock_spire/instance_blackrock_spire.cpp
rename to src/server/scripts/eastern_kingdoms/blackrock_spire/instance_blackrock_spire.cpp
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp b/src/server/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp
rename to src/server/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp b/src/server/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp
rename to src/server/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp b/src/server/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp
rename to src/server/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp b/src/server/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp
rename to src/server/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp b/src/server/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp
rename to src/server/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp b/src/server/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp
rename to src/server/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp b/src/server/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp
rename to src/server/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp b/src/server/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp
rename to src/server/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp b/src/server/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp
rename to src/server/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/instance_blackwing_lair.cpp b/src/server/scripts/eastern_kingdoms/blackwing_lair/instance_blackwing_lair.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blackwing_lair/instance_blackwing_lair.cpp
rename to src/server/scripts/eastern_kingdoms/blackwing_lair/instance_blackwing_lair.cpp
diff --git a/src/scripts/eastern_kingdoms/blasted_lands.cpp b/src/server/scripts/eastern_kingdoms/blasted_lands.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/blasted_lands.cpp
rename to src/server/scripts/eastern_kingdoms/blasted_lands.cpp
diff --git a/src/scripts/eastern_kingdoms/boss_kruul.cpp b/src/server/scripts/eastern_kingdoms/boss_kruul.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/boss_kruul.cpp
rename to src/server/scripts/eastern_kingdoms/boss_kruul.cpp
diff --git a/src/scripts/eastern_kingdoms/burning_steppes.cpp b/src/server/scripts/eastern_kingdoms/burning_steppes.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/burning_steppes.cpp
rename to src/server/scripts/eastern_kingdoms/burning_steppes.cpp
diff --git a/src/scripts/eastern_kingdoms/deadmines/boss_mr_smite.cpp b/src/server/scripts/eastern_kingdoms/deadmines/boss_mr_smite.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/deadmines/boss_mr_smite.cpp
rename to src/server/scripts/eastern_kingdoms/deadmines/boss_mr_smite.cpp
diff --git a/src/scripts/eastern_kingdoms/deadmines/deadmines.cpp b/src/server/scripts/eastern_kingdoms/deadmines/deadmines.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/deadmines/deadmines.cpp
rename to src/server/scripts/eastern_kingdoms/deadmines/deadmines.cpp
diff --git a/src/scripts/eastern_kingdoms/deadmines/deadmines.h b/src/server/scripts/eastern_kingdoms/deadmines/deadmines.h
similarity index 100%
rename from src/scripts/eastern_kingdoms/deadmines/deadmines.h
rename to src/server/scripts/eastern_kingdoms/deadmines/deadmines.h
diff --git a/src/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp b/src/server/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp
rename to src/server/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp
diff --git a/src/scripts/eastern_kingdoms/dun_morogh.cpp b/src/server/scripts/eastern_kingdoms/dun_morogh.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/dun_morogh.cpp
rename to src/server/scripts/eastern_kingdoms/dun_morogh.cpp
diff --git a/src/scripts/eastern_kingdoms/duskwood.cpp b/src/server/scripts/eastern_kingdoms/duskwood.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/duskwood.cpp
rename to src/server/scripts/eastern_kingdoms/duskwood.cpp
diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands.cpp b/src/server/scripts/eastern_kingdoms/eastern_plaguelands.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/eastern_plaguelands.cpp
rename to src/server/scripts/eastern_kingdoms/eastern_plaguelands.cpp
diff --git a/src/scripts/eastern_kingdoms/elwynn_forest.cpp b/src/server/scripts/eastern_kingdoms/elwynn_forest.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/elwynn_forest.cpp
rename to src/server/scripts/eastern_kingdoms/elwynn_forest.cpp
diff --git a/src/scripts/eastern_kingdoms/eversong_woods.cpp b/src/server/scripts/eastern_kingdoms/eversong_woods.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/eversong_woods.cpp
rename to src/server/scripts/eastern_kingdoms/eversong_woods.cpp
diff --git a/src/scripts/eastern_kingdoms/ghostlands.cpp b/src/server/scripts/eastern_kingdoms/ghostlands.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/ghostlands.cpp
rename to src/server/scripts/eastern_kingdoms/ghostlands.cpp
diff --git a/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp b/src/server/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp
rename to src/server/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp
diff --git a/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.h b/src/server/scripts/eastern_kingdoms/gnomeregan/gnomeregan.h
similarity index 100%
rename from src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.h
rename to src/server/scripts/eastern_kingdoms/gnomeregan/gnomeregan.h
diff --git a/src/scripts/eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp
rename to src/server/scripts/eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp
diff --git a/src/scripts/eastern_kingdoms/hinterlands.cpp b/src/server/scripts/eastern_kingdoms/hinterlands.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/hinterlands.cpp
rename to src/server/scripts/eastern_kingdoms/hinterlands.cpp
diff --git a/src/scripts/eastern_kingdoms/ironforge.cpp b/src/server/scripts/eastern_kingdoms/ironforge.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/ironforge.cpp
rename to src/server/scripts/eastern_kingdoms/ironforge.cpp
diff --git a/src/scripts/eastern_kingdoms/isle_of_queldanas.cpp b/src/server/scripts/eastern_kingdoms/isle_of_queldanas.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/isle_of_queldanas.cpp
rename to src/server/scripts/eastern_kingdoms/isle_of_queldanas.cpp
diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_curator.cpp b/src/server/scripts/eastern_kingdoms/karazhan/boss_curator.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/karazhan/boss_curator.cpp
rename to src/server/scripts/eastern_kingdoms/karazhan/boss_curator.cpp
diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp
rename to src/server/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp
diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp b/src/server/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp
rename to src/server/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp
diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp b/src/server/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp
rename to src/server/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp
diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp b/src/server/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp
rename to src/server/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp
diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp b/src/server/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp
rename to src/server/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp
diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp
rename to src/server/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp
diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp b/src/server/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp
rename to src/server/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp
diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp
rename to src/server/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp
diff --git a/src/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp b/src/server/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp
rename to src/server/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp
diff --git a/src/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp b/src/server/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp
rename to src/server/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp
diff --git a/src/scripts/eastern_kingdoms/karazhan/karazhan.cpp b/src/server/scripts/eastern_kingdoms/karazhan/karazhan.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/karazhan/karazhan.cpp
rename to src/server/scripts/eastern_kingdoms/karazhan/karazhan.cpp
diff --git a/src/scripts/eastern_kingdoms/karazhan/karazhan.h b/src/server/scripts/eastern_kingdoms/karazhan/karazhan.h
similarity index 100%
rename from src/scripts/eastern_kingdoms/karazhan/karazhan.h
rename to src/server/scripts/eastern_kingdoms/karazhan/karazhan.h
diff --git a/src/scripts/eastern_kingdoms/loch_modan.cpp b/src/server/scripts/eastern_kingdoms/loch_modan.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/loch_modan.cpp
rename to src/server/scripts/eastern_kingdoms/loch_modan.cpp
diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp b/src/server/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp
rename to src/server/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp
diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp b/src/server/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp
rename to src/server/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp
diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp b/src/server/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp
rename to src/server/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp
diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp b/src/server/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp
rename to src/server/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp
diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp b/src/server/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp
rename to src/server/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp
diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp b/src/server/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp
rename to src/server/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp
diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.h b/src/server/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.h
similarity index 100%
rename from src/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.h
rename to src/server/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.h
diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp b/src/server/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp
rename to src/server/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp
diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_garr.cpp b/src/server/scripts/eastern_kingdoms/molten_core/boss_garr.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/molten_core/boss_garr.cpp
rename to src/server/scripts/eastern_kingdoms/molten_core/boss_garr.cpp
diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp b/src/server/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp
rename to src/server/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp
diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp b/src/server/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp
rename to src/server/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp
diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp b/src/server/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp
rename to src/server/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp
diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp b/src/server/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp
rename to src/server/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp
diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp b/src/server/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp
rename to src/server/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp
diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp b/src/server/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp
rename to src/server/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp
diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp b/src/server/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp
rename to src/server/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp
diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp b/src/server/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp
rename to src/server/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp
diff --git a/src/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp b/src/server/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp
rename to src/server/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp
diff --git a/src/scripts/eastern_kingdoms/molten_core/molten_core.cpp b/src/server/scripts/eastern_kingdoms/molten_core/molten_core.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/molten_core/molten_core.cpp
rename to src/server/scripts/eastern_kingdoms/molten_core/molten_core.cpp
diff --git a/src/scripts/eastern_kingdoms/molten_core/molten_core.h b/src/server/scripts/eastern_kingdoms/molten_core/molten_core.h
similarity index 100%
rename from src/scripts/eastern_kingdoms/molten_core/molten_core.h
rename to src/server/scripts/eastern_kingdoms/molten_core/molten_core.h
diff --git a/src/scripts/eastern_kingdoms/redridge_mountains.cpp b/src/server/scripts/eastern_kingdoms/redridge_mountains.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/redridge_mountains.cpp
rename to src/server/scripts/eastern_kingdoms/redridge_mountains.cpp
diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp b/src/server/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
rename to src/server/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp b/src/server/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp
rename to src/server/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp
diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp b/src/server/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp
rename to src/server/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp
diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp b/src/server/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp
rename to src/server/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp b/src/server/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp
rename to src/server/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp
rename to src/server/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp
rename to src/server/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp b/src/server/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp
rename to src/server/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp b/src/server/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp
rename to src/server/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp
rename to src/server/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp b/src/server/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp
rename to src/server/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp b/src/server/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp
rename to src/server/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp
rename to src/server/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp b/src/server/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp
rename to src/server/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp b/src/server/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp
rename to src/server/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/scarlet_monastery.h b/src/server/scripts/eastern_kingdoms/scarlet_monastery/scarlet_monastery.h
similarity index 100%
rename from src/scripts/eastern_kingdoms/scarlet_monastery/scarlet_monastery.h
rename to src/server/scripts/eastern_kingdoms/scarlet_monastery/scarlet_monastery.h
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp
rename to src/server/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp b/src/server/scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp
rename to src/server/scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp
rename to src/server/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp b/src/server/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp
rename to src/server/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp b/src/server/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp
rename to src/server/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp b/src/server/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp
rename to src/server/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp b/src/server/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp
rename to src/server/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp
rename to src/server/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp
rename to src/server/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp
rename to src/server/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp b/src/server/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp
rename to src/server/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_vectus.cpp b/src/server/scripts/eastern_kingdoms/scholomance/boss_vectus.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scholomance/boss_vectus.cpp
rename to src/server/scripts/eastern_kingdoms/scholomance/boss_vectus.cpp
diff --git a/src/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp b/src/server/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp
rename to src/server/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp
diff --git a/src/scripts/eastern_kingdoms/scholomance/scholomance.h b/src/server/scripts/eastern_kingdoms/scholomance/scholomance.h
similarity index 100%
rename from src/scripts/eastern_kingdoms/scholomance/scholomance.h
rename to src/server/scripts/eastern_kingdoms/scholomance/scholomance.h
diff --git a/src/scripts/eastern_kingdoms/searing_gorge.cpp b/src/server/scripts/eastern_kingdoms/searing_gorge.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/searing_gorge.cpp
rename to src/server/scripts/eastern_kingdoms/searing_gorge.cpp
diff --git a/src/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp b/src/server/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp
rename to src/server/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp
diff --git a/src/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp b/src/server/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp
rename to src/server/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp
diff --git a/src/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.h b/src/server/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.h
similarity index 100%
rename from src/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.h
rename to src/server/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.h
diff --git a/src/scripts/eastern_kingdoms/silvermoon_city.cpp b/src/server/scripts/eastern_kingdoms/silvermoon_city.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/silvermoon_city.cpp
rename to src/server/scripts/eastern_kingdoms/silvermoon_city.cpp
diff --git a/src/scripts/eastern_kingdoms/silverpine_forest.cpp b/src/server/scripts/eastern_kingdoms/silverpine_forest.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/silverpine_forest.cpp
rename to src/server/scripts/eastern_kingdoms/silverpine_forest.cpp
diff --git a/src/scripts/eastern_kingdoms/stormwind_city.cpp b/src/server/scripts/eastern_kingdoms/stormwind_city.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/stormwind_city.cpp
rename to src/server/scripts/eastern_kingdoms/stormwind_city.cpp
diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale.cpp b/src/server/scripts/eastern_kingdoms/stranglethorn_vale.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/stranglethorn_vale.cpp
rename to src/server/scripts/eastern_kingdoms/stranglethorn_vale.cpp
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp b/src/server/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp
rename to src/server/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp b/src/server/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp
rename to src/server/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp
rename to src/server/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp
rename to src/server/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp b/src/server/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp
rename to src/server/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp
rename to src/server/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp b/src/server/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp
rename to src/server/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp b/src/server/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp
rename to src/server/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp b/src/server/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp
rename to src/server/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp
rename to src/server/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp b/src/server/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp
rename to src/server/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp
diff --git a/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp b/src/server/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp
rename to src/server/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp
diff --git a/src/scripts/eastern_kingdoms/stratholme/stratholme.cpp b/src/server/scripts/eastern_kingdoms/stratholme/stratholme.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/stratholme/stratholme.cpp
rename to src/server/scripts/eastern_kingdoms/stratholme/stratholme.cpp
diff --git a/src/scripts/eastern_kingdoms/stratholme/stratholme.h b/src/server/scripts/eastern_kingdoms/stratholme/stratholme.h
similarity index 100%
rename from src/scripts/eastern_kingdoms/stratholme/stratholme.h
rename to src/server/scripts/eastern_kingdoms/stratholme/stratholme.h
diff --git a/src/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp b/src/server/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp
rename to src/server/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp
diff --git a/src/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp b/src/server/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp
rename to src/server/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp
diff --git a/src/scripts/eastern_kingdoms/sunken_temple/sunken_temple.h b/src/server/scripts/eastern_kingdoms/sunken_temple/sunken_temple.h
similarity index 100%
rename from src/scripts/eastern_kingdoms/sunken_temple/sunken_temple.h
rename to src/server/scripts/eastern_kingdoms/sunken_temple/sunken_temple.h
diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp b/src/server/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp
rename to src/server/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp
diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp b/src/server/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp
rename to src/server/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp
diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp b/src/server/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp
rename to src/server/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp
diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp b/src/server/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp
rename to src/server/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp
diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp b/src/server/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp
rename to src/server/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp
diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp b/src/server/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp
rename to src/server/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp
diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp b/src/server/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp
rename to src/server/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp
diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.cpp b/src/server/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.cpp
rename to src/server/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.cpp
diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.h b/src/server/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.h
similarity index 100%
rename from src/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.h
rename to src/server/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.h
diff --git a/src/scripts/eastern_kingdoms/tirisfal_glades.cpp b/src/server/scripts/eastern_kingdoms/tirisfal_glades.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/tirisfal_glades.cpp
rename to src/server/scripts/eastern_kingdoms/tirisfal_glades.cpp
diff --git a/src/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp b/src/server/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp
rename to src/server/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp
diff --git a/src/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp b/src/server/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp
rename to src/server/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp
diff --git a/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp b/src/server/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp
rename to src/server/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp
diff --git a/src/scripts/eastern_kingdoms/uldaman/uldaman.cpp b/src/server/scripts/eastern_kingdoms/uldaman/uldaman.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/uldaman/uldaman.cpp
rename to src/server/scripts/eastern_kingdoms/uldaman/uldaman.cpp
diff --git a/src/scripts/eastern_kingdoms/undercity.cpp b/src/server/scripts/eastern_kingdoms/undercity.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/undercity.cpp
rename to src/server/scripts/eastern_kingdoms/undercity.cpp
diff --git a/src/scripts/eastern_kingdoms/western_plaguelands.cpp b/src/server/scripts/eastern_kingdoms/western_plaguelands.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/western_plaguelands.cpp
rename to src/server/scripts/eastern_kingdoms/western_plaguelands.cpp
diff --git a/src/scripts/eastern_kingdoms/westfall.cpp b/src/server/scripts/eastern_kingdoms/westfall.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/westfall.cpp
rename to src/server/scripts/eastern_kingdoms/westfall.cpp
diff --git a/src/scripts/eastern_kingdoms/wetlands.cpp b/src/server/scripts/eastern_kingdoms/wetlands.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/wetlands.cpp
rename to src/server/scripts/eastern_kingdoms/wetlands.cpp
diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp b/src/server/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp
rename to src/server/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp
diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp b/src/server/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp
rename to src/server/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp
diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp b/src/server/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp
rename to src/server/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp
diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp b/src/server/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp
rename to src/server/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp
diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp b/src/server/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp
rename to src/server/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp
diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp b/src/server/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp
rename to src/server/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp
diff --git a/src/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp b/src/server/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp
rename to src/server/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp
diff --git a/src/scripts/eastern_kingdoms/zulaman/zulaman.cpp b/src/server/scripts/eastern_kingdoms/zulaman/zulaman.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulaman/zulaman.cpp
rename to src/server/scripts/eastern_kingdoms/zulaman/zulaman.cpp
diff --git a/src/scripts/eastern_kingdoms/zulaman/zulaman.h b/src/server/scripts/eastern_kingdoms/zulaman/zulaman.h
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulaman/zulaman.h
rename to src/server/scripts/eastern_kingdoms/zulaman/zulaman.h
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp b/src/server/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp
rename to src/server/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp b/src/server/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp
rename to src/server/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp b/src/server/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp
rename to src/server/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp b/src/server/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp
rename to src/server/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp b/src/server/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp
rename to src/server/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp b/src/server/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp
rename to src/server/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp b/src/server/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp
rename to src/server/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp b/src/server/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp
rename to src/server/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp b/src/server/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp
rename to src/server/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp b/src/server/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp
rename to src/server/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp b/src/server/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp
rename to src/server/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp b/src/server/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp
rename to src/server/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp b/src/server/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp
rename to src/server/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp
diff --git a/src/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp b/src/server/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp
rename to src/server/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp
diff --git a/src/scripts/eastern_kingdoms/zulgurub/zulgurub.h b/src/server/scripts/eastern_kingdoms/zulgurub/zulgurub.h
similarity index 100%
rename from src/scripts/eastern_kingdoms/zulgurub/zulgurub.h
rename to src/server/scripts/eastern_kingdoms/zulgurub/zulgurub.h
diff --git a/src/scripts/examples/example_creature.cpp b/src/server/scripts/examples/example_creature.cpp
similarity index 100%
rename from src/scripts/examples/example_creature.cpp
rename to src/server/scripts/examples/example_creature.cpp
diff --git a/src/scripts/examples/example_escort.cpp b/src/server/scripts/examples/example_escort.cpp
similarity index 100%
rename from src/scripts/examples/example_escort.cpp
rename to src/server/scripts/examples/example_escort.cpp
diff --git a/src/scripts/examples/example_gossip_codebox.cpp b/src/server/scripts/examples/example_gossip_codebox.cpp
similarity index 100%
rename from src/scripts/examples/example_gossip_codebox.cpp
rename to src/server/scripts/examples/example_gossip_codebox.cpp
diff --git a/src/scripts/examples/example_misc.cpp b/src/server/scripts/examples/example_misc.cpp
similarity index 100%
rename from src/scripts/examples/example_misc.cpp
rename to src/server/scripts/examples/example_misc.cpp
diff --git a/src/scripts/kalimdor/ashenvale.cpp b/src/server/scripts/kalimdor/ashenvale.cpp
similarity index 100%
rename from src/scripts/kalimdor/ashenvale.cpp
rename to src/server/scripts/kalimdor/ashenvale.cpp
diff --git a/src/scripts/kalimdor/azshara.cpp b/src/server/scripts/kalimdor/azshara.cpp
similarity index 100%
rename from src/scripts/kalimdor/azshara.cpp
rename to src/server/scripts/kalimdor/azshara.cpp
diff --git a/src/scripts/kalimdor/azuremyst_isle.cpp b/src/server/scripts/kalimdor/azuremyst_isle.cpp
similarity index 100%
rename from src/scripts/kalimdor/azuremyst_isle.cpp
rename to src/server/scripts/kalimdor/azuremyst_isle.cpp
diff --git a/src/scripts/kalimdor/blackfathom_depths/blackfathom_deeps.cpp b/src/server/scripts/kalimdor/blackfathom_depths/blackfathom_deeps.cpp
similarity index 100%
rename from src/scripts/kalimdor/blackfathom_depths/blackfathom_deeps.cpp
rename to src/server/scripts/kalimdor/blackfathom_depths/blackfathom_deeps.cpp
diff --git a/src/scripts/kalimdor/blackfathom_depths/blackfathom_deeps.h b/src/server/scripts/kalimdor/blackfathom_depths/blackfathom_deeps.h
similarity index 100%
rename from src/scripts/kalimdor/blackfathom_depths/blackfathom_deeps.h
rename to src/server/scripts/kalimdor/blackfathom_depths/blackfathom_deeps.h
diff --git a/src/scripts/kalimdor/blackfathom_depths/boss_aku_mai.cpp b/src/server/scripts/kalimdor/blackfathom_depths/boss_aku_mai.cpp
similarity index 100%
rename from src/scripts/kalimdor/blackfathom_depths/boss_aku_mai.cpp
rename to src/server/scripts/kalimdor/blackfathom_depths/boss_aku_mai.cpp
diff --git a/src/scripts/kalimdor/blackfathom_depths/boss_gelihast.cpp b/src/server/scripts/kalimdor/blackfathom_depths/boss_gelihast.cpp
similarity index 100%
rename from src/scripts/kalimdor/blackfathom_depths/boss_gelihast.cpp
rename to src/server/scripts/kalimdor/blackfathom_depths/boss_gelihast.cpp
diff --git a/src/scripts/kalimdor/blackfathom_depths/boss_kelris.cpp b/src/server/scripts/kalimdor/blackfathom_depths/boss_kelris.cpp
similarity index 100%
rename from src/scripts/kalimdor/blackfathom_depths/boss_kelris.cpp
rename to src/server/scripts/kalimdor/blackfathom_depths/boss_kelris.cpp
diff --git a/src/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp b/src/server/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp
similarity index 100%
rename from src/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp
rename to src/server/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp
diff --git a/src/scripts/kalimdor/bloodmyst_isle.cpp b/src/server/scripts/kalimdor/bloodmyst_isle.cpp
similarity index 100%
rename from src/scripts/kalimdor/bloodmyst_isle.cpp
rename to src/server/scripts/kalimdor/bloodmyst_isle.cpp
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/caverns_of_time/culling_of_stratholme/boss_epoch.cpp b/src/server/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp b/src/server/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp b/src/server/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp b/src/server/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp b/src/server/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp b/src/server/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.h b/src/server/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.h
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.h
rename to src/server/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.h
diff --git a/src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp b/src/server/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp b/src/server/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp b/src/server/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp b/src/server/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.h b/src/server/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.h
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.h
rename to src/server/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.h
diff --git a/src/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp b/src/server/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp b/src/server/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp b/src/server/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp b/src/server/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp b/src/server/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp b/src/server/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp b/src/server/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal.h b/src/server/scripts/kalimdor/caverns_of_time/hyjal/hyjal.h
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/hyjal/hyjal.h
rename to src/server/scripts/kalimdor/caverns_of_time/hyjal/hyjal.h
diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp b/src/server/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h b/src/server/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h
rename to src/server/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h
diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp b/src/server/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h b/src/server/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h
rename to src/server/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h
diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp b/src/server/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp b/src/server/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp b/src/server/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp b/src/server/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp b/src/server/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp b/src/server/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
rename to src/server/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
diff --git a/src/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.h b/src/server/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.h
similarity index 100%
rename from src/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.h
rename to src/server/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.h
diff --git a/src/scripts/kalimdor/darkshore.cpp b/src/server/scripts/kalimdor/darkshore.cpp
similarity index 100%
rename from src/scripts/kalimdor/darkshore.cpp
rename to src/server/scripts/kalimdor/darkshore.cpp
diff --git a/src/scripts/kalimdor/desolace.cpp b/src/server/scripts/kalimdor/desolace.cpp
similarity index 100%
rename from src/scripts/kalimdor/desolace.cpp
rename to src/server/scripts/kalimdor/desolace.cpp
diff --git a/src/scripts/kalimdor/durotar.cpp b/src/server/scripts/kalimdor/durotar.cpp
similarity index 100%
rename from src/scripts/kalimdor/durotar.cpp
rename to src/server/scripts/kalimdor/durotar.cpp
diff --git a/src/scripts/kalimdor/dustwallow_marsh.cpp b/src/server/scripts/kalimdor/dustwallow_marsh.cpp
similarity index 100%
rename from src/scripts/kalimdor/dustwallow_marsh.cpp
rename to src/server/scripts/kalimdor/dustwallow_marsh.cpp
diff --git a/src/scripts/kalimdor/felwood.cpp b/src/server/scripts/kalimdor/felwood.cpp
similarity index 100%
rename from src/scripts/kalimdor/felwood.cpp
rename to src/server/scripts/kalimdor/felwood.cpp
diff --git a/src/scripts/kalimdor/feralas.cpp b/src/server/scripts/kalimdor/feralas.cpp
similarity index 100%
rename from src/scripts/kalimdor/feralas.cpp
rename to src/server/scripts/kalimdor/feralas.cpp
diff --git a/src/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp
similarity index 100%
rename from src/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp
rename to src/server/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp
diff --git a/src/scripts/kalimdor/maraudon/boss_landslide.cpp b/src/server/scripts/kalimdor/maraudon/boss_landslide.cpp
similarity index 100%
rename from src/scripts/kalimdor/maraudon/boss_landslide.cpp
rename to src/server/scripts/kalimdor/maraudon/boss_landslide.cpp
diff --git a/src/scripts/kalimdor/maraudon/boss_noxxion.cpp b/src/server/scripts/kalimdor/maraudon/boss_noxxion.cpp
similarity index 100%
rename from src/scripts/kalimdor/maraudon/boss_noxxion.cpp
rename to src/server/scripts/kalimdor/maraudon/boss_noxxion.cpp
diff --git a/src/scripts/kalimdor/maraudon/boss_princess_theradras.cpp b/src/server/scripts/kalimdor/maraudon/boss_princess_theradras.cpp
similarity index 100%
rename from src/scripts/kalimdor/maraudon/boss_princess_theradras.cpp
rename to src/server/scripts/kalimdor/maraudon/boss_princess_theradras.cpp
diff --git a/src/scripts/kalimdor/moonglade.cpp b/src/server/scripts/kalimdor/moonglade.cpp
similarity index 100%
rename from src/scripts/kalimdor/moonglade.cpp
rename to src/server/scripts/kalimdor/moonglade.cpp
diff --git a/src/scripts/kalimdor/mulgore.cpp b/src/server/scripts/kalimdor/mulgore.cpp
similarity index 100%
rename from src/scripts/kalimdor/mulgore.cpp
rename to src/server/scripts/kalimdor/mulgore.cpp
diff --git a/src/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp b/src/server/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp
similarity index 100%
rename from src/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp
rename to src/server/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp
diff --git a/src/scripts/kalimdor/onyxias_lair/instance_onyxias_lair.cpp b/src/server/scripts/kalimdor/onyxias_lair/instance_onyxias_lair.cpp
similarity index 100%
rename from src/scripts/kalimdor/onyxias_lair/instance_onyxias_lair.cpp
rename to src/server/scripts/kalimdor/onyxias_lair/instance_onyxias_lair.cpp
diff --git a/src/scripts/kalimdor/onyxias_lair/onyxias_lair.h b/src/server/scripts/kalimdor/onyxias_lair/onyxias_lair.h
similarity index 100%
rename from src/scripts/kalimdor/onyxias_lair/onyxias_lair.h
rename to src/server/scripts/kalimdor/onyxias_lair/onyxias_lair.h
diff --git a/src/scripts/kalimdor/orgrimmar.cpp b/src/server/scripts/kalimdor/orgrimmar.cpp
similarity index 100%
rename from src/scripts/kalimdor/orgrimmar.cpp
rename to src/server/scripts/kalimdor/orgrimmar.cpp
diff --git a/src/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp
similarity index 100%
rename from src/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp
rename to src/server/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp
diff --git a/src/scripts/kalimdor/razorfen_downs/instance_razorfen_downs.cpp b/src/server/scripts/kalimdor/razorfen_downs/instance_razorfen_downs.cpp
similarity index 100%
rename from src/scripts/kalimdor/razorfen_downs/instance_razorfen_downs.cpp
rename to src/server/scripts/kalimdor/razorfen_downs/instance_razorfen_downs.cpp
diff --git a/src/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp b/src/server/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp
similarity index 100%
rename from src/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp
rename to src/server/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp
diff --git a/src/scripts/kalimdor/razorfen_downs/razorfen_downs.h b/src/server/scripts/kalimdor/razorfen_downs/razorfen_downs.h
similarity index 100%
rename from src/scripts/kalimdor/razorfen_downs/razorfen_downs.h
rename to src/server/scripts/kalimdor/razorfen_downs/razorfen_downs.h
diff --git a/src/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp b/src/server/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
similarity index 100%
rename from src/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
rename to src/server/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
diff --git a/src/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp b/src/server/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp
similarity index 100%
rename from src/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp
rename to src/server/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp
diff --git a/src/scripts/kalimdor/razorfen_kraul/razorfen_kraul.h b/src/server/scripts/kalimdor/razorfen_kraul/razorfen_kraul.h
similarity index 100%
rename from src/scripts/kalimdor/razorfen_kraul/razorfen_kraul.h
rename to src/server/scripts/kalimdor/razorfen_kraul/razorfen_kraul.h
diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp b/src/server/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp
similarity index 100%
rename from src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp
rename to src/server/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp
diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp b/src/server/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp
similarity index 100%
rename from src/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp
rename to src/server/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp
diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp b/src/server/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp
similarity index 100%
rename from src/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp
rename to src/server/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp
diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp b/src/server/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
similarity index 100%
rename from src/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
rename to src/server/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp b/src/server/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp
similarity index 100%
rename from src/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp
rename to src/server/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp
diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp b/src/server/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp
similarity index 100%
rename from src/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp
rename to src/server/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp
diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
similarity index 100%
rename from src/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
rename to src/server/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
diff --git a/src/scripts/kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h b/src/server/scripts/kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h
similarity index 100%
rename from src/scripts/kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h
rename to src/server/scripts/kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h
diff --git a/src/scripts/kalimdor/silithus.cpp b/src/server/scripts/kalimdor/silithus.cpp
similarity index 100%
rename from src/scripts/kalimdor/silithus.cpp
rename to src/server/scripts/kalimdor/silithus.cpp
diff --git a/src/scripts/kalimdor/stonetalon_mountains.cpp b/src/server/scripts/kalimdor/stonetalon_mountains.cpp
similarity index 100%
rename from src/scripts/kalimdor/stonetalon_mountains.cpp
rename to src/server/scripts/kalimdor/stonetalon_mountains.cpp
diff --git a/src/scripts/kalimdor/tanaris.cpp b/src/server/scripts/kalimdor/tanaris.cpp
similarity index 100%
rename from src/scripts/kalimdor/tanaris.cpp
rename to src/server/scripts/kalimdor/tanaris.cpp
diff --git a/src/scripts/kalimdor/teldrassil.cpp b/src/server/scripts/kalimdor/teldrassil.cpp
similarity index 100%
rename from src/scripts/kalimdor/teldrassil.cpp
rename to src/server/scripts/kalimdor/teldrassil.cpp
diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp b/src/server/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
similarity index 100%
rename from src/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
rename to src/server/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp b/src/server/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
similarity index 100%
rename from src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
rename to src/server/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp b/src/server/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp
similarity index 100%
rename from src/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp
rename to src/server/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp
diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp b/src/server/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp
similarity index 100%
rename from src/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp
rename to src/server/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp
diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp b/src/server/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp
similarity index 100%
rename from src/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp
rename to src/server/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp
diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp b/src/server/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp
similarity index 100%
rename from src/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp
rename to src/server/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp
diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp b/src/server/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp
similarity index 100%
rename from src/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp
rename to src/server/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp
diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp b/src/server/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
similarity index 100%
rename from src/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
rename to src/server/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_viscidus.cpp b/src/server/scripts/kalimdor/temple_of_ahnqiraj/boss_viscidus.cpp
similarity index 100%
rename from src/scripts/kalimdor/temple_of_ahnqiraj/boss_viscidus.cpp
rename to src/server/scripts/kalimdor/temple_of_ahnqiraj/boss_viscidus.cpp
diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
similarity index 100%
rename from src/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
rename to src/server/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
similarity index 100%
rename from src/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
rename to src/server/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/temple_of_ahnqiraj.h b/src/server/scripts/kalimdor/temple_of_ahnqiraj/temple_of_ahnqiraj.h
similarity index 100%
rename from src/scripts/kalimdor/temple_of_ahnqiraj/temple_of_ahnqiraj.h
rename to src/server/scripts/kalimdor/temple_of_ahnqiraj/temple_of_ahnqiraj.h
diff --git a/src/scripts/kalimdor/the_barrens.cpp b/src/server/scripts/kalimdor/the_barrens.cpp
similarity index 100%
rename from src/scripts/kalimdor/the_barrens.cpp
rename to src/server/scripts/kalimdor/the_barrens.cpp
diff --git a/src/scripts/kalimdor/thousand_needles.cpp b/src/server/scripts/kalimdor/thousand_needles.cpp
similarity index 100%
rename from src/scripts/kalimdor/thousand_needles.cpp
rename to src/server/scripts/kalimdor/thousand_needles.cpp
diff --git a/src/scripts/kalimdor/thunder_bluff.cpp b/src/server/scripts/kalimdor/thunder_bluff.cpp
similarity index 100%
rename from src/scripts/kalimdor/thunder_bluff.cpp
rename to src/server/scripts/kalimdor/thunder_bluff.cpp
diff --git a/src/scripts/kalimdor/ungoro_crater.cpp b/src/server/scripts/kalimdor/ungoro_crater.cpp
similarity index 100%
rename from src/scripts/kalimdor/ungoro_crater.cpp
rename to src/server/scripts/kalimdor/ungoro_crater.cpp
diff --git a/src/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp b/src/server/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp
similarity index 100%
rename from src/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp
rename to src/server/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp
diff --git a/src/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp b/src/server/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp
similarity index 100%
rename from src/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp
rename to src/server/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp
diff --git a/src/scripts/kalimdor/wailing_caverns/wailing_caverns.h b/src/server/scripts/kalimdor/wailing_caverns/wailing_caverns.h
similarity index 100%
rename from src/scripts/kalimdor/wailing_caverns/wailing_caverns.h
rename to src/server/scripts/kalimdor/wailing_caverns/wailing_caverns.h
diff --git a/src/scripts/kalimdor/winterspring.cpp b/src/server/scripts/kalimdor/winterspring.cpp
similarity index 100%
rename from src/scripts/kalimdor/winterspring.cpp
rename to src/server/scripts/kalimdor/winterspring.cpp
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.cpp b/src/server/scripts/kalimdor/zulfarrak/zulfarrak.cpp
similarity index 100%
rename from src/scripts/kalimdor/zulfarrak/zulfarrak.cpp
rename to src/server/scripts/kalimdor/zulfarrak/zulfarrak.cpp
diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/ahnkahet.h b/src/server/scripts/northrend/azjol_nerub/ahnkahet/ahnkahet.h
similarity index 100%
rename from src/scripts/northrend/azjol_nerub/ahnkahet/ahnkahet.h
rename to src/server/scripts/northrend/azjol_nerub/ahnkahet/ahnkahet.h
diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp
similarity index 100%
rename from src/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp
rename to src/server/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp
diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
similarity index 100%
rename from src/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
rename to src/server/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp
similarity index 100%
rename from src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp
rename to src/server/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp
diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp
similarity index 100%
rename from src/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp
rename to src/server/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp
diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
similarity index 100%
rename from src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
rename to src/server/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp
similarity index 100%
rename from src/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp
rename to src/server/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp
diff --git a/src/scripts/northrend/azjol_nerub/azjol_nerub/azjol_nerub.h b/src/server/scripts/northrend/azjol_nerub/azjol_nerub/azjol_nerub.h
similarity index 100%
rename from src/scripts/northrend/azjol_nerub/azjol_nerub/azjol_nerub.h
rename to src/server/scripts/northrend/azjol_nerub/azjol_nerub/azjol_nerub.h
diff --git a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp b/src/server/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp
similarity index 100%
rename from src/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp
rename to src/server/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp
diff --git a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp b/src/server/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp
similarity index 100%
rename from src/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp
rename to src/server/scripts/northrend/azjol_nerub/azjol_nerub/boss_hadronox.cpp
diff --git a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
similarity index 100%
rename from src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
rename to src/server/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
diff --git a/src/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp b/src/server/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp
similarity index 100%
rename from src/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp
rename to src/server/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp
diff --git a/src/scripts/northrend/borean_tundra.cpp b/src/server/scripts/northrend/borean_tundra.cpp
similarity index 100%
rename from src/scripts/northrend/borean_tundra.cpp
rename to src/server/scripts/northrend/borean_tundra.cpp
diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp b/src/server/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp
similarity index 100%
rename from src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp
rename to src/server/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp
diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp b/src/server/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp
similarity index 100%
rename from src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp
rename to src/server/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp
diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp b/src/server/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp
similarity index 100%
rename from src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp
rename to src/server/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp
diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp b/src/server/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp
similarity index 100%
rename from src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp
rename to src/server/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp
diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp b/src/server/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp
similarity index 100%
rename from src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp
rename to src/server/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp
diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.h b/src/server/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.h
similarity index 100%
rename from src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.h
rename to src/server/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.h
diff --git a/src/scripts/northrend/crystalsong_forest.cpp b/src/server/scripts/northrend/crystalsong_forest.cpp
similarity index 100%
rename from src/scripts/northrend/crystalsong_forest.cpp
rename to src/server/scripts/northrend/crystalsong_forest.cpp
diff --git a/src/scripts/northrend/dalaran.cpp b/src/server/scripts/northrend/dalaran.cpp
similarity index 100%
rename from src/scripts/northrend/dalaran.cpp
rename to src/server/scripts/northrend/dalaran.cpp
diff --git a/src/scripts/northrend/dragonblight.cpp b/src/server/scripts/northrend/dragonblight.cpp
similarity index 100%
rename from src/scripts/northrend/dragonblight.cpp
rename to src/server/scripts/northrend/dragonblight.cpp
diff --git a/src/scripts/northrend/draktharon_keep/boss_dred.cpp b/src/server/scripts/northrend/draktharon_keep/boss_dred.cpp
similarity index 100%
rename from src/scripts/northrend/draktharon_keep/boss_dred.cpp
rename to src/server/scripts/northrend/draktharon_keep/boss_dred.cpp
diff --git a/src/scripts/northrend/draktharon_keep/boss_novos.cpp b/src/server/scripts/northrend/draktharon_keep/boss_novos.cpp
similarity index 100%
rename from src/scripts/northrend/draktharon_keep/boss_novos.cpp
rename to src/server/scripts/northrend/draktharon_keep/boss_novos.cpp
diff --git a/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp b/src/server/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp
similarity index 100%
rename from src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp
rename to src/server/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp
diff --git a/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp b/src/server/scripts/northrend/draktharon_keep/boss_trollgore.cpp
similarity index 100%
rename from src/scripts/northrend/draktharon_keep/boss_trollgore.cpp
rename to src/server/scripts/northrend/draktharon_keep/boss_trollgore.cpp
diff --git a/src/scripts/northrend/draktharon_keep/drak_tharon_keep.h b/src/server/scripts/northrend/draktharon_keep/drak_tharon_keep.h
similarity index 100%
rename from src/scripts/northrend/draktharon_keep/drak_tharon_keep.h
rename to src/server/scripts/northrend/draktharon_keep/drak_tharon_keep.h
diff --git a/src/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp b/src/server/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp
similarity index 100%
rename from src/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp
rename to src/server/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp
diff --git a/src/scripts/northrend/frozen_halls/forge_of_souls/boss_bronjahm.cpp b/src/server/scripts/northrend/frozen_halls/forge_of_souls/boss_bronjahm.cpp
similarity index 100%
rename from src/scripts/northrend/frozen_halls/forge_of_souls/boss_bronjahm.cpp
rename to src/server/scripts/northrend/frozen_halls/forge_of_souls/boss_bronjahm.cpp
diff --git a/src/scripts/northrend/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp b/src/server/scripts/northrend/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp
similarity index 100%
rename from src/scripts/northrend/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp
rename to src/server/scripts/northrend/frozen_halls/forge_of_souls/boss_devourer_of_souls.cpp
diff --git a/src/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp b/src/server/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp
similarity index 100%
rename from src/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp
rename to src/server/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.cpp
diff --git a/src/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.h b/src/server/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.h
similarity index 100%
rename from src/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.h
rename to src/server/scripts/northrend/frozen_halls/forge_of_souls/forge_of_souls.h
diff --git a/src/scripts/northrend/frozen_halls/forge_of_souls/instance_forge_of_souls.cpp b/src/server/scripts/northrend/frozen_halls/forge_of_souls/instance_forge_of_souls.cpp
similarity index 100%
rename from src/scripts/northrend/frozen_halls/forge_of_souls/instance_forge_of_souls.cpp
rename to src/server/scripts/northrend/frozen_halls/forge_of_souls/instance_forge_of_souls.cpp
diff --git a/src/scripts/northrend/frozen_halls/halls_of_reflection/boss_falric.cpp b/src/server/scripts/northrend/frozen_halls/halls_of_reflection/boss_falric.cpp
similarity index 100%
rename from src/scripts/northrend/frozen_halls/halls_of_reflection/boss_falric.cpp
rename to src/server/scripts/northrend/frozen_halls/halls_of_reflection/boss_falric.cpp
diff --git a/src/scripts/northrend/frozen_halls/halls_of_reflection/boss_marwyn.cpp b/src/server/scripts/northrend/frozen_halls/halls_of_reflection/boss_marwyn.cpp
similarity index 100%
rename from src/scripts/northrend/frozen_halls/halls_of_reflection/boss_marwyn.cpp
rename to src/server/scripts/northrend/frozen_halls/halls_of_reflection/boss_marwyn.cpp
diff --git a/src/scripts/northrend/frozen_halls/halls_of_reflection/halls_of_reflection.cpp b/src/server/scripts/northrend/frozen_halls/halls_of_reflection/halls_of_reflection.cpp
similarity index 100%
rename from src/scripts/northrend/frozen_halls/halls_of_reflection/halls_of_reflection.cpp
rename to src/server/scripts/northrend/frozen_halls/halls_of_reflection/halls_of_reflection.cpp
diff --git a/src/scripts/northrend/frozen_halls/halls_of_reflection/halls_of_reflection.h b/src/server/scripts/northrend/frozen_halls/halls_of_reflection/halls_of_reflection.h
similarity index 100%
rename from src/scripts/northrend/frozen_halls/halls_of_reflection/halls_of_reflection.h
rename to src/server/scripts/northrend/frozen_halls/halls_of_reflection/halls_of_reflection.h
diff --git a/src/scripts/northrend/frozen_halls/halls_of_reflection/instance_halls_of_reflection.cpp b/src/server/scripts/northrend/frozen_halls/halls_of_reflection/instance_halls_of_reflection.cpp
similarity index 100%
rename from src/scripts/northrend/frozen_halls/halls_of_reflection/instance_halls_of_reflection.cpp
rename to src/server/scripts/northrend/frozen_halls/halls_of_reflection/instance_halls_of_reflection.cpp
diff --git a/src/scripts/northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp b/src/server/scripts/northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp
similarity index 100%
rename from src/scripts/northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp
rename to src/server/scripts/northrend/frozen_halls/pit_of_saron/boss_forgemaster_garfrost.cpp
diff --git a/src/scripts/northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp b/src/server/scripts/northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp
similarity index 100%
rename from src/scripts/northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp
rename to src/server/scripts/northrend/frozen_halls/pit_of_saron/boss_krickandick.cpp
diff --git a/src/scripts/northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp
similarity index 100%
rename from src/scripts/northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp
rename to src/server/scripts/northrend/frozen_halls/pit_of_saron/boss_scourgelord_tyrannus.cpp
diff --git a/src/scripts/northrend/frozen_halls/pit_of_saron/instance_pit_of_saron.cpp b/src/server/scripts/northrend/frozen_halls/pit_of_saron/instance_pit_of_saron.cpp
similarity index 100%
rename from src/scripts/northrend/frozen_halls/pit_of_saron/instance_pit_of_saron.cpp
rename to src/server/scripts/northrend/frozen_halls/pit_of_saron/instance_pit_of_saron.cpp
diff --git a/src/scripts/northrend/frozen_halls/pit_of_saron/pit_of_saron.cpp b/src/server/scripts/northrend/frozen_halls/pit_of_saron/pit_of_saron.cpp
similarity index 100%
rename from src/scripts/northrend/frozen_halls/pit_of_saron/pit_of_saron.cpp
rename to src/server/scripts/northrend/frozen_halls/pit_of_saron/pit_of_saron.cpp
diff --git a/src/scripts/northrend/frozen_halls/pit_of_saron/pit_of_saron.h b/src/server/scripts/northrend/frozen_halls/pit_of_saron/pit_of_saron.h
similarity index 100%
rename from src/scripts/northrend/frozen_halls/pit_of_saron/pit_of_saron.h
rename to src/server/scripts/northrend/frozen_halls/pit_of_saron/pit_of_saron.h
diff --git a/src/scripts/northrend/grizzly_hills.cpp b/src/server/scripts/northrend/grizzly_hills.cpp
similarity index 100%
rename from src/scripts/northrend/grizzly_hills.cpp
rename to src/server/scripts/northrend/grizzly_hills.cpp
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/howling_fjord.cpp b/src/server/scripts/northrend/howling_fjord.cpp
similarity index 100%
rename from src/scripts/northrend/howling_fjord.cpp
rename to src/server/scripts/northrend/howling_fjord.cpp
diff --git a/src/scripts/northrend/icecrown.cpp b/src/server/scripts/northrend/icecrown.cpp
similarity index 100%
rename from src/scripts/northrend/icecrown.cpp
rename to src/server/scripts/northrend/icecrown.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_highlord_mograine.cpp b/src/server/scripts/northrend/naxxramas/boss_highlord_mograine.cpp
similarity index 100%
rename from src/scripts/northrend/naxxramas/boss_highlord_mograine.cpp
rename to src/server/scripts/northrend/naxxramas/boss_highlord_mograine.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/eye_of_eternity/boss_malygos.cpp b/src/server/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp
similarity index 100%
rename from src/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp
rename to src/server/scripts/northrend/nexus/eye_of_eternity/boss_malygos.cpp
diff --git a/src/scripts/northrend/nexus/eye_of_eternity/eye_of_eternity.h b/src/server/scripts/northrend/nexus/eye_of_eternity/eye_of_eternity.h
similarity index 100%
rename from src/scripts/northrend/nexus/eye_of_eternity/eye_of_eternity.h
rename to src/server/scripts/northrend/nexus/eye_of_eternity/eye_of_eternity.h
diff --git a/src/scripts/northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp b/src/server/scripts/northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp
similarity index 100%
rename from src/scripts/northrend/nexus/eye_of_eternity/instance_eye_of_eternity.cpp
rename to src/server/scripts/northrend/nexus/eye_of_eternity/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_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/commander_kolurg.cpp b/src/server/scripts/northrend/nexus/nexus/commander_kolurg.cpp
similarity index 100%
rename from src/scripts/northrend/nexus/nexus/commander_kolurg.cpp
rename to src/server/scripts/northrend/nexus/nexus/commander_kolurg.cpp
diff --git a/src/scripts/northrend/nexus/nexus/commander_stoutbeard.cpp b/src/server/scripts/northrend/nexus/nexus/commander_stoutbeard.cpp
similarity index 100%
rename from src/scripts/northrend/nexus/nexus/commander_stoutbeard.cpp
rename to src/server/scripts/northrend/nexus/nexus/commander_stoutbeard.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/obsidian_sanctum/boss_sartharion.cpp b/src/server/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp
similarity index 100%
rename from src/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp
rename to src/server/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp
diff --git a/src/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp
similarity index 100%
rename from src/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp
rename to src/server/scripts/northrend/obsidian_sanctum/instance_obsidian_sanctum.cpp
diff --git a/src/scripts/northrend/obsidian_sanctum/obsidian_sanctum.h b/src/server/scripts/northrend/obsidian_sanctum/obsidian_sanctum.h
similarity index 100%
rename from src/scripts/northrend/obsidian_sanctum/obsidian_sanctum.h
rename to src/server/scripts/northrend/obsidian_sanctum/obsidian_sanctum.h
diff --git a/src/scripts/northrend/sholazar_basin.cpp b/src/server/scripts/northrend/sholazar_basin.cpp
similarity index 100%
rename from src/scripts/northrend/sholazar_basin.cpp
rename to src/server/scripts/northrend/sholazar_basin.cpp
diff --git a/src/scripts/northrend/storm_peaks.cpp b/src/server/scripts/northrend/storm_peaks.cpp
similarity index 100%
rename from src/scripts/northrend/storm_peaks.cpp
rename to src/server/scripts/northrend/storm_peaks.cpp
diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp b/src/server/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp
similarity index 100%
rename from src/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp
rename to src/server/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp
diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp b/src/server/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp
similarity index 100%
rename from src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp
rename to src/server/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp
diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp b/src/server/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp
similarity index 100%
rename from src/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp
rename to src/server/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp
diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp b/src/server/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp
similarity index 100%
rename from src/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp
rename to src/server/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp
diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/halls_of_lightning.h b/src/server/scripts/northrend/ulduar/halls_of_lightning/halls_of_lightning.h
similarity index 100%
rename from src/scripts/northrend/ulduar/halls_of_lightning/halls_of_lightning.h
rename to src/server/scripts/northrend/ulduar/halls_of_lightning/halls_of_lightning.h
diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp b/src/server/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp
similarity index 100%
rename from src/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp
rename to src/server/scripts/northrend/ulduar/halls_of_lightning/instance_halls_of_lightning.cpp
diff --git a/src/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp b/src/server/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp
similarity index 100%
rename from src/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp
rename to src/server/scripts/northrend/ulduar/halls_of_stone/boss_krystallus.cpp
diff --git a/src/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp b/src/server/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp
similarity index 100%
rename from src/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp
rename to src/server/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp
diff --git a/src/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp b/src/server/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp
similarity index 100%
rename from src/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp
rename to src/server/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp
diff --git a/src/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp b/src/server/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp
similarity index 100%
rename from src/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp
rename to src/server/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp
diff --git a/src/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h b/src/server/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h
similarity index 100%
rename from src/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h
rename to src/server/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h
diff --git a/src/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp b/src/server/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
similarity index 100%
rename from src/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
rename to src/server/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
diff --git a/src/scripts/northrend/ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/northrend/ulduar/ulduar/boss_algalon.cpp
similarity index 100%
rename from src/scripts/northrend/ulduar/ulduar/boss_algalon.cpp
rename to src/server/scripts/northrend/ulduar/ulduar/boss_algalon.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.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/ulduar/ulduar/ulduar_teleporter.cpp b/src/server/scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp
similarity index 100%
rename from src/scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp
rename to src/server/scripts/northrend/ulduar/ulduar/ulduar_teleporter.cpp
diff --git a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
similarity index 100%
rename from src/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
rename to src/server/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
diff --git a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp b/src/server/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp
similarity index 100%
rename from src/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp
rename to src/server/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp
diff --git a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp b/src/server/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
similarity index 100%
rename from src/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
rename to src/server/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
diff --git a/src/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp b/src/server/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
similarity index 100%
rename from src/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
rename to src/server/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
diff --git a/src/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp b/src/server/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp
similarity index 100%
rename from src/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp
rename to src/server/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp
diff --git a/src/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.h b/src/server/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.h
similarity index 100%
rename from src/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.h
rename to src/server/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.h
diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp b/src/server/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp
similarity index 100%
rename from src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp
rename to src/server/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp
diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp b/src/server/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp
similarity index 100%
rename from src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp
rename to src/server/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp
diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp b/src/server/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp
similarity index 100%
rename from src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp
rename to src/server/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp
diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp b/src/server/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp
similarity index 100%
rename from src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp
rename to src/server/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp
diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp b/src/server/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp
similarity index 100%
rename from src/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp
rename to src/server/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp
diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/utgarde_pinnacle.h b/src/server/scripts/northrend/utgarde_keep/utgarde_pinnacle/utgarde_pinnacle.h
similarity index 100%
rename from src/scripts/northrend/utgarde_keep/utgarde_pinnacle/utgarde_pinnacle.h
rename to src/server/scripts/northrend/utgarde_keep/utgarde_pinnacle/utgarde_pinnacle.h
diff --git a/src/scripts/northrend/vault_of_archavon/boss_archavon.cpp b/src/server/scripts/northrend/vault_of_archavon/boss_archavon.cpp
similarity index 100%
rename from src/scripts/northrend/vault_of_archavon/boss_archavon.cpp
rename to src/server/scripts/northrend/vault_of_archavon/boss_archavon.cpp
diff --git a/src/scripts/northrend/vault_of_archavon/boss_emalon.cpp b/src/server/scripts/northrend/vault_of_archavon/boss_emalon.cpp
similarity index 100%
rename from src/scripts/northrend/vault_of_archavon/boss_emalon.cpp
rename to src/server/scripts/northrend/vault_of_archavon/boss_emalon.cpp
diff --git a/src/scripts/northrend/vault_of_archavon/boss_koralon.cpp b/src/server/scripts/northrend/vault_of_archavon/boss_koralon.cpp
similarity index 100%
rename from src/scripts/northrend/vault_of_archavon/boss_koralon.cpp
rename to src/server/scripts/northrend/vault_of_archavon/boss_koralon.cpp
diff --git a/src/scripts/northrend/vault_of_archavon/boss_toravon.cpp b/src/server/scripts/northrend/vault_of_archavon/boss_toravon.cpp
similarity index 100%
rename from src/scripts/northrend/vault_of_archavon/boss_toravon.cpp
rename to src/server/scripts/northrend/vault_of_archavon/boss_toravon.cpp
diff --git a/src/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp b/src/server/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp
similarity index 100%
rename from src/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp
rename to src/server/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp
diff --git a/src/scripts/northrend/vault_of_archavon/vault_of_archavon.h b/src/server/scripts/northrend/vault_of_archavon/vault_of_archavon.h
similarity index 100%
rename from src/scripts/northrend/vault_of_archavon/vault_of_archavon.h
rename to src/server/scripts/northrend/vault_of_archavon/vault_of_archavon.h
diff --git a/src/scripts/northrend/violet_hold/boss_cyanigosa.cpp b/src/server/scripts/northrend/violet_hold/boss_cyanigosa.cpp
similarity index 100%
rename from src/scripts/northrend/violet_hold/boss_cyanigosa.cpp
rename to src/server/scripts/northrend/violet_hold/boss_cyanigosa.cpp
diff --git a/src/scripts/northrend/violet_hold/boss_erekem.cpp b/src/server/scripts/northrend/violet_hold/boss_erekem.cpp
similarity index 100%
rename from src/scripts/northrend/violet_hold/boss_erekem.cpp
rename to src/server/scripts/northrend/violet_hold/boss_erekem.cpp
diff --git a/src/scripts/northrend/violet_hold/boss_ichoron.cpp b/src/server/scripts/northrend/violet_hold/boss_ichoron.cpp
similarity index 100%
rename from src/scripts/northrend/violet_hold/boss_ichoron.cpp
rename to src/server/scripts/northrend/violet_hold/boss_ichoron.cpp
diff --git a/src/scripts/northrend/violet_hold/boss_lavanthor.cpp b/src/server/scripts/northrend/violet_hold/boss_lavanthor.cpp
similarity index 100%
rename from src/scripts/northrend/violet_hold/boss_lavanthor.cpp
rename to src/server/scripts/northrend/violet_hold/boss_lavanthor.cpp
diff --git a/src/scripts/northrend/violet_hold/boss_moragg.cpp b/src/server/scripts/northrend/violet_hold/boss_moragg.cpp
similarity index 100%
rename from src/scripts/northrend/violet_hold/boss_moragg.cpp
rename to src/server/scripts/northrend/violet_hold/boss_moragg.cpp
diff --git a/src/scripts/northrend/violet_hold/boss_xevozz.cpp b/src/server/scripts/northrend/violet_hold/boss_xevozz.cpp
similarity index 100%
rename from src/scripts/northrend/violet_hold/boss_xevozz.cpp
rename to src/server/scripts/northrend/violet_hold/boss_xevozz.cpp
diff --git a/src/scripts/northrend/violet_hold/boss_zuramat.cpp b/src/server/scripts/northrend/violet_hold/boss_zuramat.cpp
similarity index 100%
rename from src/scripts/northrend/violet_hold/boss_zuramat.cpp
rename to src/server/scripts/northrend/violet_hold/boss_zuramat.cpp
diff --git a/src/scripts/northrend/violet_hold/instance_violet_hold.cpp b/src/server/scripts/northrend/violet_hold/instance_violet_hold.cpp
similarity index 100%
rename from src/scripts/northrend/violet_hold/instance_violet_hold.cpp
rename to src/server/scripts/northrend/violet_hold/instance_violet_hold.cpp
diff --git a/src/scripts/northrend/violet_hold/violet_hold.cpp b/src/server/scripts/northrend/violet_hold/violet_hold.cpp
similarity index 100%
rename from src/scripts/northrend/violet_hold/violet_hold.cpp
rename to src/server/scripts/northrend/violet_hold/violet_hold.cpp
diff --git a/src/scripts/northrend/violet_hold/violet_hold.h b/src/server/scripts/northrend/violet_hold/violet_hold.h
similarity index 100%
rename from src/scripts/northrend/violet_hold/violet_hold.h
rename to src/server/scripts/northrend/violet_hold/violet_hold.h
diff --git a/src/scripts/northrend/zuldrak.cpp b/src/server/scripts/northrend/zuldrak.cpp
similarity index 100%
rename from src/scripts/northrend/zuldrak.cpp
rename to src/server/scripts/northrend/zuldrak.cpp
diff --git a/src/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp b/src/server/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
similarity index 100%
rename from src/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
rename to src/server/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
diff --git a/src/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
similarity index 100%
rename from src/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
rename to src/server/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
diff --git a/src/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
similarity index 100%
rename from src/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
rename to src/server/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
diff --git a/src/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp b/src/server/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp
similarity index 100%
rename from src/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp
rename to src/server/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp
diff --git a/src/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp b/src/server/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp
similarity index 100%
rename from src/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp
rename to src/server/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp
diff --git a/src/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp b/src/server/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
similarity index 100%
rename from src/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
rename to src/server/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
diff --git a/src/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp b/src/server/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp
similarity index 100%
rename from src/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp
rename to src/server/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp
diff --git a/src/scripts/outland/auchindoun/sethekk_halls/sethekk_halls.h b/src/server/scripts/outland/auchindoun/sethekk_halls/sethekk_halls.h
similarity index 100%
rename from src/scripts/outland/auchindoun/sethekk_halls/sethekk_halls.h
rename to src/server/scripts/outland/auchindoun/sethekk_halls/sethekk_halls.h
diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
similarity index 100%
rename from src/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
rename to src/server/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
similarity index 100%
rename from src/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
rename to src/server/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
similarity index 100%
rename from src/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
rename to src/server/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp b/src/server/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp
similarity index 100%
rename from src/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp
rename to src/server/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp
diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
similarity index 100%
rename from src/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
rename to src/server/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/shadow_labyrinth.h b/src/server/scripts/outland/auchindoun/shadow_labyrinth/shadow_labyrinth.h
similarity index 100%
rename from src/scripts/outland/auchindoun/shadow_labyrinth/shadow_labyrinth.h
rename to src/server/scripts/outland/auchindoun/shadow_labyrinth/shadow_labyrinth.h
diff --git a/src/scripts/outland/black_temple/black_temple.cpp b/src/server/scripts/outland/black_temple/black_temple.cpp
similarity index 100%
rename from src/scripts/outland/black_temple/black_temple.cpp
rename to src/server/scripts/outland/black_temple/black_temple.cpp
diff --git a/src/scripts/outland/black_temple/black_temple.h b/src/server/scripts/outland/black_temple/black_temple.h
similarity index 100%
rename from src/scripts/outland/black_temple/black_temple.h
rename to src/server/scripts/outland/black_temple/black_temple.h
diff --git a/src/scripts/outland/black_temple/boss_bloodboil.cpp b/src/server/scripts/outland/black_temple/boss_bloodboil.cpp
similarity index 100%
rename from src/scripts/outland/black_temple/boss_bloodboil.cpp
rename to src/server/scripts/outland/black_temple/boss_bloodboil.cpp
diff --git a/src/scripts/outland/black_temple/boss_illidan.cpp b/src/server/scripts/outland/black_temple/boss_illidan.cpp
similarity index 100%
rename from src/scripts/outland/black_temple/boss_illidan.cpp
rename to src/server/scripts/outland/black_temple/boss_illidan.cpp
diff --git a/src/scripts/outland/black_temple/boss_mother_shahraz.cpp b/src/server/scripts/outland/black_temple/boss_mother_shahraz.cpp
similarity index 100%
rename from src/scripts/outland/black_temple/boss_mother_shahraz.cpp
rename to src/server/scripts/outland/black_temple/boss_mother_shahraz.cpp
diff --git a/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp b/src/server/scripts/outland/black_temple/boss_reliquary_of_souls.cpp
similarity index 100%
rename from src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp
rename to src/server/scripts/outland/black_temple/boss_reliquary_of_souls.cpp
diff --git a/src/scripts/outland/black_temple/boss_shade_of_akama.cpp b/src/server/scripts/outland/black_temple/boss_shade_of_akama.cpp
similarity index 100%
rename from src/scripts/outland/black_temple/boss_shade_of_akama.cpp
rename to src/server/scripts/outland/black_temple/boss_shade_of_akama.cpp
diff --git a/src/scripts/outland/black_temple/boss_supremus.cpp b/src/server/scripts/outland/black_temple/boss_supremus.cpp
similarity index 100%
rename from src/scripts/outland/black_temple/boss_supremus.cpp
rename to src/server/scripts/outland/black_temple/boss_supremus.cpp
diff --git a/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp b/src/server/scripts/outland/black_temple/boss_teron_gorefiend.cpp
similarity index 100%
rename from src/scripts/outland/black_temple/boss_teron_gorefiend.cpp
rename to src/server/scripts/outland/black_temple/boss_teron_gorefiend.cpp
diff --git a/src/scripts/outland/black_temple/boss_warlord_najentus.cpp b/src/server/scripts/outland/black_temple/boss_warlord_najentus.cpp
similarity index 100%
rename from src/scripts/outland/black_temple/boss_warlord_najentus.cpp
rename to src/server/scripts/outland/black_temple/boss_warlord_najentus.cpp
diff --git a/src/scripts/outland/black_temple/illidari_council.cpp b/src/server/scripts/outland/black_temple/illidari_council.cpp
similarity index 100%
rename from src/scripts/outland/black_temple/illidari_council.cpp
rename to src/server/scripts/outland/black_temple/illidari_council.cpp
diff --git a/src/scripts/outland/black_temple/instance_black_temple.cpp b/src/server/scripts/outland/black_temple/instance_black_temple.cpp
similarity index 100%
rename from src/scripts/outland/black_temple/instance_black_temple.cpp
rename to src/server/scripts/outland/black_temple/instance_black_temple.cpp
diff --git a/src/scripts/outland/blades_edge_mountains.cpp b/src/server/scripts/outland/blades_edge_mountains.cpp
similarity index 100%
rename from src/scripts/outland/blades_edge_mountains.cpp
rename to src/server/scripts/outland/blades_edge_mountains.cpp
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/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp b/src/server/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
similarity index 100%
rename from src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
rename to src/server/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp b/src/server/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
similarity index 100%
rename from src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
rename to src/server/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/server/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
similarity index 100%
rename from src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
rename to src/server/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/server/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
similarity index 100%
rename from src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
rename to src/server/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp b/src/server/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
similarity index 100%
rename from src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
rename to src/server/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
similarity index 100%
rename from src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
rename to src/server/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp b/src/server/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
similarity index 100%
rename from src/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
rename to src/server/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/serpent_shrine.h b/src/server/scripts/outland/coilfang_resevoir/serpent_shrine/serpent_shrine.h
similarity index 100%
rename from src/scripts/outland/coilfang_resevoir/serpent_shrine/serpent_shrine.h
rename to src/server/scripts/outland/coilfang_resevoir/serpent_shrine/serpent_shrine.h
diff --git a/src/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp b/src/server/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp
similarity index 100%
rename from src/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp
rename to src/server/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp
diff --git a/src/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp
similarity index 100%
rename from src/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp
rename to src/server/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp
diff --git a/src/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp b/src/server/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp
similarity index 100%
rename from src/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp
rename to src/server/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp
diff --git a/src/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp b/src/server/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
similarity index 100%
rename from src/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
rename to src/server/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
diff --git a/src/scripts/outland/coilfang_resevoir/steam_vault/steam_vault.h b/src/server/scripts/outland/coilfang_resevoir/steam_vault/steam_vault.h
similarity index 100%
rename from src/scripts/outland/coilfang_resevoir/steam_vault/steam_vault.h
rename to src/server/scripts/outland/coilfang_resevoir/steam_vault/steam_vault.h
diff --git a/src/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp b/src/server/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp
similarity index 100%
rename from src/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp
rename to src/server/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp
diff --git a/src/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp
similarity index 100%
rename from src/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp
rename to src/server/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp
diff --git a/src/scripts/outland/gruuls_lair/boss_gruul.cpp b/src/server/scripts/outland/gruuls_lair/boss_gruul.cpp
similarity index 100%
rename from src/scripts/outland/gruuls_lair/boss_gruul.cpp
rename to src/server/scripts/outland/gruuls_lair/boss_gruul.cpp
diff --git a/src/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp b/src/server/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp
similarity index 100%
rename from src/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp
rename to src/server/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp
diff --git a/src/scripts/outland/gruuls_lair/gruuls_lair.h b/src/server/scripts/outland/gruuls_lair/gruuls_lair.h
similarity index 100%
rename from src/scripts/outland/gruuls_lair/gruuls_lair.h
rename to src/server/scripts/outland/gruuls_lair/gruuls_lair.h
diff --git a/src/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp b/src/server/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp
similarity index 100%
rename from src/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp
rename to src/server/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp
diff --git a/src/scripts/outland/hellfire_citadel/blood_furnace/blood_furnace.h b/src/server/scripts/outland/hellfire_citadel/blood_furnace/blood_furnace.h
similarity index 100%
rename from src/scripts/outland/hellfire_citadel/blood_furnace/blood_furnace.h
rename to src/server/scripts/outland/hellfire_citadel/blood_furnace/blood_furnace.h
diff --git a/src/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp b/src/server/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp
similarity index 100%
rename from src/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp
rename to src/server/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp
diff --git a/src/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
similarity index 100%
rename from src/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
rename to src/server/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
diff --git a/src/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp b/src/server/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp
similarity index 100%
rename from src/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp
rename to src/server/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp
diff --git a/src/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp b/src/server/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
similarity index 100%
rename from src/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
rename to src/server/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
diff --git a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp b/src/server/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp
similarity index 100%
rename from src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp
rename to src/server/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp
diff --git a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp b/src/server/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp
similarity index 100%
rename from src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp
rename to src/server/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp
diff --git a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp
similarity index 100%
rename from src/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp
rename to src/server/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp
diff --git a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/hellfire_ramparts.h b/src/server/scripts/outland/hellfire_citadel/hellfire_ramparts/hellfire_ramparts.h
similarity index 100%
rename from src/scripts/outland/hellfire_citadel/hellfire_ramparts/hellfire_ramparts.h
rename to src/server/scripts/outland/hellfire_citadel/hellfire_ramparts/hellfire_ramparts.h
diff --git a/src/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp b/src/server/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp
similarity index 100%
rename from src/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp
rename to src/server/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp
diff --git a/src/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp b/src/server/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
similarity index 100%
rename from src/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
rename to src/server/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
diff --git a/src/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp b/src/server/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
similarity index 100%
rename from src/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
rename to src/server/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
diff --git a/src/scripts/outland/hellfire_citadel/magtheridons_lair/magtheridons_lair.h b/src/server/scripts/outland/hellfire_citadel/magtheridons_lair/magtheridons_lair.h
similarity index 100%
rename from src/scripts/outland/hellfire_citadel/magtheridons_lair/magtheridons_lair.h
rename to src/server/scripts/outland/hellfire_citadel/magtheridons_lair/magtheridons_lair.h
diff --git a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp b/src/server/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
similarity index 100%
rename from src/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
rename to src/server/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
diff --git a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp b/src/server/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
similarity index 100%
rename from src/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
rename to src/server/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
diff --git a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
similarity index 100%
rename from src/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
rename to src/server/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
diff --git a/src/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp b/src/server/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
similarity index 100%
rename from src/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
rename to src/server/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
diff --git a/src/scripts/outland/hellfire_citadel/shattered_halls/shattered_halls.h b/src/server/scripts/outland/hellfire_citadel/shattered_halls/shattered_halls.h
similarity index 100%
rename from src/scripts/outland/hellfire_citadel/shattered_halls/shattered_halls.h
rename to src/server/scripts/outland/hellfire_citadel/shattered_halls/shattered_halls.h
diff --git a/src/scripts/outland/hellfire_peninsula.cpp b/src/server/scripts/outland/hellfire_peninsula.cpp
similarity index 100%
rename from src/scripts/outland/hellfire_peninsula.cpp
rename to src/server/scripts/outland/hellfire_peninsula.cpp
diff --git a/src/scripts/outland/nagrand.cpp b/src/server/scripts/outland/nagrand.cpp
similarity index 100%
rename from src/scripts/outland/nagrand.cpp
rename to src/server/scripts/outland/nagrand.cpp
diff --git a/src/scripts/outland/netherstorm.cpp b/src/server/scripts/outland/netherstorm.cpp
similarity index 100%
rename from src/scripts/outland/netherstorm.cpp
rename to src/server/scripts/outland/netherstorm.cpp
diff --git a/src/scripts/outland/shadowmoon_valley.cpp b/src/server/scripts/outland/shadowmoon_valley.cpp
similarity index 100%
rename from src/scripts/outland/shadowmoon_valley.cpp
rename to src/server/scripts/outland/shadowmoon_valley.cpp
diff --git a/src/scripts/outland/shattrath_city.cpp b/src/server/scripts/outland/shattrath_city.cpp
similarity index 100%
rename from src/scripts/outland/shattrath_city.cpp
rename to src/server/scripts/outland/shattrath_city.cpp
diff --git a/src/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp b/src/server/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp
similarity index 100%
rename from src/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp
rename to src/server/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp
diff --git a/src/scripts/outland/tempest_keep/arcatraz/arcatraz.h b/src/server/scripts/outland/tempest_keep/arcatraz/arcatraz.h
similarity index 100%
rename from src/scripts/outland/tempest_keep/arcatraz/arcatraz.h
rename to src/server/scripts/outland/tempest_keep/arcatraz/arcatraz.h
diff --git a/src/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
similarity index 100%
rename from src/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
rename to src/server/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
diff --git a/src/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp
similarity index 100%
rename from src/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp
rename to src/server/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp
diff --git a/src/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp
similarity index 100%
rename from src/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp
rename to src/server/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp
diff --git a/src/scripts/outland/tempest_keep/botanica/boss_laj.cpp b/src/server/scripts/outland/tempest_keep/botanica/boss_laj.cpp
similarity index 100%
rename from src/scripts/outland/tempest_keep/botanica/boss_laj.cpp
rename to src/server/scripts/outland/tempest_keep/botanica/boss_laj.cpp
diff --git a/src/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp b/src/server/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp
similarity index 100%
rename from src/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp
rename to src/server/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp
diff --git a/src/scripts/outland/tempest_keep/the_eye/boss_alar.cpp b/src/server/scripts/outland/tempest_keep/the_eye/boss_alar.cpp
similarity index 100%
rename from src/scripts/outland/tempest_keep/the_eye/boss_alar.cpp
rename to src/server/scripts/outland/tempest_keep/the_eye/boss_alar.cpp
diff --git a/src/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp b/src/server/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp
similarity index 100%
rename from src/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp
rename to src/server/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp
diff --git a/src/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp b/src/server/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp
similarity index 100%
rename from src/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp
rename to src/server/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp
diff --git a/src/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp b/src/server/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp
similarity index 100%
rename from src/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp
rename to src/server/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp
diff --git a/src/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp b/src/server/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp
similarity index 100%
rename from src/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp
rename to src/server/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp
diff --git a/src/scripts/outland/tempest_keep/the_eye/the_eye.cpp b/src/server/scripts/outland/tempest_keep/the_eye/the_eye.cpp
similarity index 100%
rename from src/scripts/outland/tempest_keep/the_eye/the_eye.cpp
rename to src/server/scripts/outland/tempest_keep/the_eye/the_eye.cpp
diff --git a/src/scripts/outland/tempest_keep/the_eye/the_eye.h b/src/server/scripts/outland/tempest_keep/the_eye/the_eye.h
similarity index 100%
rename from src/scripts/outland/tempest_keep/the_eye/the_eye.h
rename to src/server/scripts/outland/tempest_keep/the_eye/the_eye.h
diff --git a/src/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp
similarity index 100%
rename from src/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp
rename to src/server/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp
diff --git a/src/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp
similarity index 100%
rename from src/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp
rename to src/server/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp
diff --git a/src/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
similarity index 100%
rename from src/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
rename to src/server/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
diff --git a/src/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
similarity index 100%
rename from src/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
rename to src/server/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
diff --git a/src/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp b/src/server/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp
similarity index 100%
rename from src/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp
rename to src/server/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp
diff --git a/src/scripts/outland/tempest_keep/the_mechanar/mechanar.h b/src/server/scripts/outland/tempest_keep/the_mechanar/mechanar.h
similarity index 100%
rename from src/scripts/outland/tempest_keep/the_mechanar/mechanar.h
rename to src/server/scripts/outland/tempest_keep/the_mechanar/mechanar.h
diff --git a/src/scripts/outland/terokkar_forest.cpp b/src/server/scripts/outland/terokkar_forest.cpp
similarity index 100%
rename from src/scripts/outland/terokkar_forest.cpp
rename to src/server/scripts/outland/terokkar_forest.cpp
diff --git a/src/scripts/outland/zangarmarsh.cpp b/src/server/scripts/outland/zangarmarsh.cpp
similarity index 100%
rename from src/scripts/outland/zangarmarsh.cpp
rename to src/server/scripts/outland/zangarmarsh.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_emeriss.cpp b/src/server/scripts/world/boss_emeriss.cpp
similarity index 100%
rename from src/scripts/world/boss_emeriss.cpp
rename to src/server/scripts/world/boss_emeriss.cpp
diff --git a/src/scripts/world/boss_lethon.cpp b/src/server/scripts/world/boss_lethon.cpp
similarity index 100%
rename from src/scripts/world/boss_lethon.cpp
rename to src/server/scripts/world/boss_lethon.cpp
diff --git a/src/scripts/world/boss_taerar.cpp b/src/server/scripts/world/boss_taerar.cpp
similarity index 100%
rename from src/scripts/world/boss_taerar.cpp
rename to src/server/scripts/world/boss_taerar.cpp
diff --git a/src/scripts/world/boss_ysondre.cpp b/src/server/scripts/world/boss_ysondre.cpp
similarity index 100%
rename from src/scripts/world/boss_ysondre.cpp
rename to src/server/scripts/world/boss_ysondre.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/shared/Auth/AuthCrypt.cpp b/src/server/shared/Auth/AuthCrypt.cpp
similarity index 100%
rename from src/shared/Auth/AuthCrypt.cpp
rename to src/server/shared/Auth/AuthCrypt.cpp
diff --git a/src/shared/Auth/AuthCrypt.h b/src/server/shared/Auth/AuthCrypt.h
similarity index 100%
rename from src/shared/Auth/AuthCrypt.h
rename to src/server/shared/Auth/AuthCrypt.h
diff --git a/src/shared/Auth/BigNumber.cpp b/src/server/shared/Auth/BigNumber.cpp
similarity index 100%
rename from src/shared/Auth/BigNumber.cpp
rename to src/server/shared/Auth/BigNumber.cpp
diff --git a/src/shared/Auth/BigNumber.h b/src/server/shared/Auth/BigNumber.h
similarity index 100%
rename from src/shared/Auth/BigNumber.h
rename to src/server/shared/Auth/BigNumber.h
diff --git a/src/shared/Auth/CMakeLists.txt b/src/server/shared/Auth/CMakeLists.txt
similarity index 100%
rename from src/shared/Auth/CMakeLists.txt
rename to src/server/shared/Auth/CMakeLists.txt
diff --git a/src/shared/Auth/Hmac.cpp b/src/server/shared/Auth/Hmac.cpp
similarity index 100%
rename from src/shared/Auth/Hmac.cpp
rename to src/server/shared/Auth/Hmac.cpp
diff --git a/src/shared/Auth/Hmac.h b/src/server/shared/Auth/Hmac.h
similarity index 100%
rename from src/shared/Auth/Hmac.h
rename to src/server/shared/Auth/Hmac.h
diff --git a/src/shared/Auth/SARC4.cpp b/src/server/shared/Auth/SARC4.cpp
similarity index 100%
rename from src/shared/Auth/SARC4.cpp
rename to src/server/shared/Auth/SARC4.cpp
diff --git a/src/shared/Auth/SARC4.h b/src/server/shared/Auth/SARC4.h
similarity index 100%
rename from src/shared/Auth/SARC4.h
rename to src/server/shared/Auth/SARC4.h
diff --git a/src/shared/Auth/Sha1.cpp b/src/server/shared/Auth/Sha1.cpp
similarity index 100%
rename from src/shared/Auth/Sha1.cpp
rename to src/server/shared/Auth/Sha1.cpp
diff --git a/src/shared/Auth/Sha1.h b/src/server/shared/Auth/Sha1.h
similarity index 100%
rename from src/shared/Auth/Sha1.h
rename to src/server/shared/Auth/Sha1.h
diff --git a/src/shared/Auth/md5.c b/src/server/shared/Auth/md5.c
similarity index 100%
rename from src/shared/Auth/md5.c
rename to src/server/shared/Auth/md5.c
diff --git a/src/shared/Auth/md5.h b/src/server/shared/Auth/md5.h
similarity index 100%
rename from src/shared/Auth/md5.h
rename to src/server/shared/Auth/md5.h
diff --git a/src/shared/ByteBuffer.h b/src/server/shared/ByteBuffer.h
similarity index 100%
rename from src/shared/ByteBuffer.h
rename to src/server/shared/ByteBuffer.h
diff --git a/src/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
similarity index 100%
rename from src/shared/CMakeLists.txt
rename to src/server/shared/CMakeLists.txt
diff --git a/src/shared/Common.cpp b/src/server/shared/Common.cpp
similarity index 100%
rename from src/shared/Common.cpp
rename to src/server/shared/Common.cpp
diff --git a/src/shared/Common.h b/src/server/shared/Common.h
similarity index 100%
rename from src/shared/Common.h
rename to src/server/shared/Common.h
diff --git a/src/shared/Config/CMakeLists.txt b/src/server/shared/Config/CMakeLists.txt
similarity index 100%
rename from src/shared/Config/CMakeLists.txt
rename to src/server/shared/Config/CMakeLists.txt
diff --git a/src/shared/Config/Config.cpp b/src/server/shared/Config/Config.cpp
similarity index 100%
rename from src/shared/Config/Config.cpp
rename to src/server/shared/Config/Config.cpp
diff --git a/src/shared/Config/Config.h b/src/server/shared/Config/Config.h
similarity index 100%
rename from src/shared/Config/Config.h
rename to src/server/shared/Config/Config.h
diff --git a/src/shared/Config/ConfigEnv.h b/src/server/shared/Config/ConfigEnv.h
similarity index 100%
rename from src/shared/Config/ConfigEnv.h
rename to src/server/shared/Config/ConfigEnv.h
diff --git a/src/shared/Config/ConfigLibrary.vcproj b/src/server/shared/Config/ConfigLibrary.vcproj
similarity index 100%
rename from src/shared/Config/ConfigLibrary.vcproj
rename to src/server/shared/Config/ConfigLibrary.vcproj
diff --git a/src/shared/Config/dotconfpp/dotconfpp.cpp b/src/server/shared/Config/dotconfpp/dotconfpp.cpp
similarity index 100%
rename from src/shared/Config/dotconfpp/dotconfpp.cpp
rename to src/server/shared/Config/dotconfpp/dotconfpp.cpp
diff --git a/src/shared/Config/dotconfpp/dotconfpp.h b/src/server/shared/Config/dotconfpp/dotconfpp.h
similarity index 100%
rename from src/shared/Config/dotconfpp/dotconfpp.h
rename to src/server/shared/Config/dotconfpp/dotconfpp.h
diff --git a/src/shared/Config/dotconfpp/mempool.cpp b/src/server/shared/Config/dotconfpp/mempool.cpp
similarity index 100%
rename from src/shared/Config/dotconfpp/mempool.cpp
rename to src/server/shared/Config/dotconfpp/mempool.cpp
diff --git a/src/shared/Config/dotconfpp/mempool.h b/src/server/shared/Config/dotconfpp/mempool.h
similarity index 100%
rename from src/shared/Config/dotconfpp/mempool.h
rename to src/server/shared/Config/dotconfpp/mempool.h
diff --git a/src/shared/Database/CMakeLists.txt b/src/server/shared/Database/CMakeLists.txt
similarity index 100%
rename from src/shared/Database/CMakeLists.txt
rename to src/server/shared/Database/CMakeLists.txt
diff --git a/src/shared/Database/DBCFileLoader.cpp b/src/server/shared/Database/DBCFileLoader.cpp
similarity index 100%
rename from src/shared/Database/DBCFileLoader.cpp
rename to src/server/shared/Database/DBCFileLoader.cpp
diff --git a/src/shared/Database/DBCFileLoader.h b/src/server/shared/Database/DBCFileLoader.h
similarity index 100%
rename from src/shared/Database/DBCFileLoader.h
rename to src/server/shared/Database/DBCFileLoader.h
diff --git a/src/shared/Database/DBCStore.h b/src/server/shared/Database/DBCStore.h
similarity index 100%
rename from src/shared/Database/DBCStore.h
rename to src/server/shared/Database/DBCStore.h
diff --git a/src/shared/Database/Database.cpp b/src/server/shared/Database/Database.cpp
similarity index 100%
rename from src/shared/Database/Database.cpp
rename to src/server/shared/Database/Database.cpp
diff --git a/src/shared/Database/Database.h b/src/server/shared/Database/Database.h
similarity index 100%
rename from src/shared/Database/Database.h
rename to src/server/shared/Database/Database.h
diff --git a/src/shared/Database/DatabaseEnv.h b/src/server/shared/Database/DatabaseEnv.h
similarity index 100%
rename from src/shared/Database/DatabaseEnv.h
rename to src/server/shared/Database/DatabaseEnv.h
diff --git a/src/shared/Database/DatabaseImpl.h b/src/server/shared/Database/DatabaseImpl.h
similarity index 100%
rename from src/shared/Database/DatabaseImpl.h
rename to src/server/shared/Database/DatabaseImpl.h
diff --git a/src/shared/Database/Field.cpp b/src/server/shared/Database/Field.cpp
similarity index 100%
rename from src/shared/Database/Field.cpp
rename to src/server/shared/Database/Field.cpp
diff --git a/src/shared/Database/Field.h b/src/server/shared/Database/Field.h
similarity index 100%
rename from src/shared/Database/Field.h
rename to src/server/shared/Database/Field.h
diff --git a/src/shared/Database/QueryResult.cpp b/src/server/shared/Database/QueryResult.cpp
similarity index 100%
rename from src/shared/Database/QueryResult.cpp
rename to src/server/shared/Database/QueryResult.cpp
diff --git a/src/shared/Database/QueryResult.h b/src/server/shared/Database/QueryResult.h
similarity index 100%
rename from src/shared/Database/QueryResult.h
rename to src/server/shared/Database/QueryResult.h
diff --git a/src/shared/Database/SQLStorage.cpp b/src/server/shared/Database/SQLStorage.cpp
similarity index 100%
rename from src/shared/Database/SQLStorage.cpp
rename to src/server/shared/Database/SQLStorage.cpp
diff --git a/src/shared/Database/SQLStorage.h b/src/server/shared/Database/SQLStorage.h
similarity index 100%
rename from src/shared/Database/SQLStorage.h
rename to src/server/shared/Database/SQLStorage.h
diff --git a/src/shared/Database/SQLStorageImpl.h b/src/server/shared/Database/SQLStorageImpl.h
similarity index 100%
rename from src/shared/Database/SQLStorageImpl.h
rename to src/server/shared/Database/SQLStorageImpl.h
diff --git a/src/shared/Database/SqlDelayThread.cpp b/src/server/shared/Database/SqlDelayThread.cpp
similarity index 100%
rename from src/shared/Database/SqlDelayThread.cpp
rename to src/server/shared/Database/SqlDelayThread.cpp
diff --git a/src/shared/Database/SqlDelayThread.h b/src/server/shared/Database/SqlDelayThread.h
similarity index 100%
rename from src/shared/Database/SqlDelayThread.h
rename to src/server/shared/Database/SqlDelayThread.h
diff --git a/src/shared/Database/SqlOperations.cpp b/src/server/shared/Database/SqlOperations.cpp
similarity index 100%
rename from src/shared/Database/SqlOperations.cpp
rename to src/server/shared/Database/SqlOperations.cpp
diff --git a/src/shared/Database/SqlOperations.h b/src/server/shared/Database/SqlOperations.h
similarity index 100%
rename from src/shared/Database/SqlOperations.h
rename to src/server/shared/Database/SqlOperations.h
diff --git a/src/shared/DelayExecutor.cpp b/src/server/shared/DelayExecutor.cpp
similarity index 100%
rename from src/shared/DelayExecutor.cpp
rename to src/server/shared/DelayExecutor.cpp
diff --git a/src/shared/DelayExecutor.h b/src/server/shared/DelayExecutor.h
similarity index 100%
rename from src/shared/DelayExecutor.h
rename to src/server/shared/DelayExecutor.h
diff --git a/src/shared/Errors.h b/src/server/shared/Errors.h
similarity index 100%
rename from src/shared/Errors.h
rename to src/server/shared/Errors.h
diff --git a/src/shared/LockedQueue.h b/src/server/shared/LockedQueue.h
similarity index 100%
rename from src/shared/LockedQueue.h
rename to src/server/shared/LockedQueue.h
diff --git a/src/shared/Log.cpp b/src/server/shared/Log.cpp
similarity index 100%
rename from src/shared/Log.cpp
rename to src/server/shared/Log.cpp
diff --git a/src/shared/Log.h b/src/server/shared/Log.h
similarity index 100%
rename from src/shared/Log.h
rename to src/server/shared/Log.h
diff --git a/src/shared/MemoryLeaks.cpp b/src/server/shared/MemoryLeaks.cpp
similarity index 100%
rename from src/shared/MemoryLeaks.cpp
rename to src/server/shared/MemoryLeaks.cpp
diff --git a/src/shared/MemoryLeaks.h b/src/server/shared/MemoryLeaks.h
similarity index 100%
rename from src/shared/MemoryLeaks.h
rename to src/server/shared/MemoryLeaks.h
diff --git a/src/shared/PacketLog.cpp b/src/server/shared/PacketLog.cpp
similarity index 100%
rename from src/shared/PacketLog.cpp
rename to src/server/shared/PacketLog.cpp
diff --git a/src/shared/PacketLog.h b/src/server/shared/PacketLog.h
similarity index 100%
rename from src/shared/PacketLog.h
rename to src/server/shared/PacketLog.h
diff --git a/src/shared/ProgressBar.cpp b/src/server/shared/ProgressBar.cpp
similarity index 100%
rename from src/shared/ProgressBar.cpp
rename to src/server/shared/ProgressBar.cpp
diff --git a/src/shared/ProgressBar.h b/src/server/shared/ProgressBar.h
similarity index 100%
rename from src/shared/ProgressBar.h
rename to src/server/shared/ProgressBar.h
diff --git a/src/shared/ServiceWin32.cpp b/src/server/shared/ServiceWin32.cpp
similarity index 100%
rename from src/shared/ServiceWin32.cpp
rename to src/server/shared/ServiceWin32.cpp
diff --git a/src/shared/ServiceWin32.h b/src/server/shared/ServiceWin32.h
similarity index 100%
rename from src/shared/ServiceWin32.h
rename to src/server/shared/ServiceWin32.h
diff --git a/src/shared/SignalHandler.h b/src/server/shared/SignalHandler.h
similarity index 100%
rename from src/shared/SignalHandler.h
rename to src/server/shared/SignalHandler.h
diff --git a/src/shared/SystemConfig.h b/src/server/shared/SystemConfig.h
similarity index 100%
rename from src/shared/SystemConfig.h
rename to src/server/shared/SystemConfig.h
diff --git a/src/shared/Threading.cpp b/src/server/shared/Threading.cpp
similarity index 100%
rename from src/shared/Threading.cpp
rename to src/server/shared/Threading.cpp
diff --git a/src/shared/Threading.h b/src/server/shared/Threading.h
similarity index 100%
rename from src/shared/Threading.h
rename to src/server/shared/Threading.h
diff --git a/src/shared/Timer.h b/src/server/shared/Timer.h
similarity index 100%
rename from src/shared/Timer.h
rename to src/server/shared/Timer.h
diff --git a/src/shared/Util.cpp b/src/server/shared/Util.cpp
similarity index 100%
rename from src/shared/Util.cpp
rename to src/server/shared/Util.cpp
diff --git a/src/shared/Util.h b/src/server/shared/Util.h
similarity index 100%
rename from src/shared/Util.h
rename to src/server/shared/Util.h
diff --git a/src/shared/WheatyExceptionReport.cpp b/src/server/shared/WheatyExceptionReport.cpp
similarity index 100%
rename from src/shared/WheatyExceptionReport.cpp
rename to src/server/shared/WheatyExceptionReport.cpp
diff --git a/src/shared/WheatyExceptionReport.h b/src/server/shared/WheatyExceptionReport.h
similarity index 100%
rename from src/shared/WheatyExceptionReport.h
rename to src/server/shared/WheatyExceptionReport.h
diff --git a/src/shared/WorldPacket.h b/src/server/shared/WorldPacket.h
similarity index 100%
rename from src/shared/WorldPacket.h
rename to src/server/shared/WorldPacket.h
diff --git a/src/shared/vmap/BIH.cpp b/src/server/shared/vmap/BIH.cpp
similarity index 100%
rename from src/shared/vmap/BIH.cpp
rename to src/server/shared/vmap/BIH.cpp
diff --git a/src/shared/vmap/BIH.h b/src/server/shared/vmap/BIH.h
similarity index 100%
rename from src/shared/vmap/BIH.h
rename to src/server/shared/vmap/BIH.h
diff --git a/src/shared/vmap/CMakeLists.txt b/src/server/shared/vmap/CMakeLists.txt
similarity index 100%
rename from src/shared/vmap/CMakeLists.txt
rename to src/server/shared/vmap/CMakeLists.txt
diff --git a/src/shared/vmap/IVMapManager.h b/src/server/shared/vmap/IVMapManager.h
similarity index 100%
rename from src/shared/vmap/IVMapManager.h
rename to src/server/shared/vmap/IVMapManager.h
diff --git a/src/shared/vmap/MapTree.cpp b/src/server/shared/vmap/MapTree.cpp
similarity index 100%
rename from src/shared/vmap/MapTree.cpp
rename to src/server/shared/vmap/MapTree.cpp
diff --git a/src/shared/vmap/MapTree.h b/src/server/shared/vmap/MapTree.h
similarity index 100%
rename from src/shared/vmap/MapTree.h
rename to src/server/shared/vmap/MapTree.h
diff --git a/src/shared/vmap/ModelInstance.cpp b/src/server/shared/vmap/ModelInstance.cpp
similarity index 100%
rename from src/shared/vmap/ModelInstance.cpp
rename to src/server/shared/vmap/ModelInstance.cpp
diff --git a/src/shared/vmap/ModelInstance.h b/src/server/shared/vmap/ModelInstance.h
similarity index 100%
rename from src/shared/vmap/ModelInstance.h
rename to src/server/shared/vmap/ModelInstance.h
diff --git a/src/shared/vmap/TileAssembler.cpp b/src/server/shared/vmap/TileAssembler.cpp
similarity index 100%
rename from src/shared/vmap/TileAssembler.cpp
rename to src/server/shared/vmap/TileAssembler.cpp
diff --git a/src/shared/vmap/TileAssembler.h b/src/server/shared/vmap/TileAssembler.h
similarity index 100%
rename from src/shared/vmap/TileAssembler.h
rename to src/server/shared/vmap/TileAssembler.h
diff --git a/src/shared/vmap/VMapDefinitions.h b/src/server/shared/vmap/VMapDefinitions.h
similarity index 100%
rename from src/shared/vmap/VMapDefinitions.h
rename to src/server/shared/vmap/VMapDefinitions.h
diff --git a/src/shared/vmap/VMapFactory.cpp b/src/server/shared/vmap/VMapFactory.cpp
similarity index 100%
rename from src/shared/vmap/VMapFactory.cpp
rename to src/server/shared/vmap/VMapFactory.cpp
diff --git a/src/shared/vmap/VMapFactory.h b/src/server/shared/vmap/VMapFactory.h
similarity index 100%
rename from src/shared/vmap/VMapFactory.h
rename to src/server/shared/vmap/VMapFactory.h
diff --git a/src/shared/vmap/VMapManager2.cpp b/src/server/shared/vmap/VMapManager2.cpp
similarity index 100%
rename from src/shared/vmap/VMapManager2.cpp
rename to src/server/shared/vmap/VMapManager2.cpp
diff --git a/src/shared/vmap/VMapManager2.h b/src/server/shared/vmap/VMapManager2.h
similarity index 100%
rename from src/shared/vmap/VMapManager2.h
rename to src/server/shared/vmap/VMapManager2.h
diff --git a/src/shared/vmap/VMapTools.h b/src/server/shared/vmap/VMapTools.h
similarity index 100%
rename from src/shared/vmap/VMapTools.h
rename to src/server/shared/vmap/VMapTools.h
diff --git a/src/shared/vmap/WorldModel.cpp b/src/server/shared/vmap/WorldModel.cpp
similarity index 100%
rename from src/shared/vmap/WorldModel.cpp
rename to src/server/shared/vmap/WorldModel.cpp
diff --git a/src/shared/vmap/WorldModel.h b/src/server/shared/vmap/WorldModel.h
similarity index 100%
rename from src/shared/vmap/WorldModel.h
rename to src/server/shared/vmap/WorldModel.h
diff --git a/src/trinitycore/CMakeLists.txt b/src/server/trinitycore/CMakeLists.txt
similarity index 100%
rename from src/trinitycore/CMakeLists.txt
rename to src/server/trinitycore/CMakeLists.txt
diff --git a/src/trinitycore/CliRunnable.cpp b/src/server/trinitycore/CliRunnable.cpp
similarity index 100%
rename from src/trinitycore/CliRunnable.cpp
rename to src/server/trinitycore/CliRunnable.cpp
diff --git a/src/trinitycore/CliRunnable.h b/src/server/trinitycore/CliRunnable.h
similarity index 100%
rename from src/trinitycore/CliRunnable.h
rename to src/server/trinitycore/CliRunnable.h
diff --git a/src/trinitycore/Main.cpp b/src/server/trinitycore/Main.cpp
similarity index 100%
rename from src/trinitycore/Main.cpp
rename to src/server/trinitycore/Main.cpp
diff --git a/src/trinitycore/Master.cpp b/src/server/trinitycore/Master.cpp
similarity index 100%
rename from src/trinitycore/Master.cpp
rename to src/server/trinitycore/Master.cpp
diff --git a/src/trinitycore/Master.h b/src/server/trinitycore/Master.h
similarity index 100%
rename from src/trinitycore/Master.h
rename to src/server/trinitycore/Master.h
diff --git a/src/trinitycore/RASocket.cpp b/src/server/trinitycore/RASocket.cpp
similarity index 100%
rename from src/trinitycore/RASocket.cpp
rename to src/server/trinitycore/RASocket.cpp
diff --git a/src/trinitycore/RASocket.h b/src/server/trinitycore/RASocket.h
similarity index 100%
rename from src/trinitycore/RASocket.h
rename to src/server/trinitycore/RASocket.h
diff --git a/src/trinitycore/TrinityCore.ico b/src/server/trinitycore/TrinityCore.ico
similarity index 100%
rename from src/trinitycore/TrinityCore.ico
rename to src/server/trinitycore/TrinityCore.ico
diff --git a/src/trinitycore/TrinityCore.rc b/src/server/trinitycore/TrinityCore.rc
similarity index 100%
rename from src/trinitycore/TrinityCore.rc
rename to src/server/trinitycore/TrinityCore.rc
diff --git a/src/trinitycore/WorldRunnable.cpp b/src/server/trinitycore/WorldRunnable.cpp
similarity index 100%
rename from src/trinitycore/WorldRunnable.cpp
rename to src/server/trinitycore/WorldRunnable.cpp
diff --git a/src/trinitycore/WorldRunnable.h b/src/server/trinitycore/WorldRunnable.h
similarity index 100%
rename from src/trinitycore/WorldRunnable.h
rename to src/server/trinitycore/WorldRunnable.h
diff --git a/src/trinitycore/resource.h b/src/server/trinitycore/resource.h
similarity index 100%
rename from src/trinitycore/resource.h
rename to src/server/trinitycore/resource.h
diff --git a/src/trinitycore/trinitycore.conf.dist b/src/server/trinitycore/trinitycore.conf.dist
similarity index 100%
rename from src/trinitycore/trinitycore.conf.dist
rename to src/server/trinitycore/trinitycore.conf.dist
diff --git a/src/trinityrealm/AuthCodes.cpp b/src/server/trinityrealm/AuthCodes.cpp
similarity index 100%
rename from src/trinityrealm/AuthCodes.cpp
rename to src/server/trinityrealm/AuthCodes.cpp
diff --git a/src/trinityrealm/AuthCodes.h b/src/server/trinityrealm/AuthCodes.h
similarity index 100%
rename from src/trinityrealm/AuthCodes.h
rename to src/server/trinityrealm/AuthCodes.h
diff --git a/src/trinityrealm/AuthSocket.cpp b/src/server/trinityrealm/AuthSocket.cpp
similarity index 100%
rename from src/trinityrealm/AuthSocket.cpp
rename to src/server/trinityrealm/AuthSocket.cpp
diff --git a/src/trinityrealm/AuthSocket.h b/src/server/trinityrealm/AuthSocket.h
similarity index 100%
rename from src/trinityrealm/AuthSocket.h
rename to src/server/trinityrealm/AuthSocket.h
diff --git a/src/trinityrealm/CMakeLists.txt b/src/server/trinityrealm/CMakeLists.txt
similarity index 100%
rename from src/trinityrealm/CMakeLists.txt
rename to src/server/trinityrealm/CMakeLists.txt
diff --git a/src/trinityrealm/Main.cpp b/src/server/trinityrealm/Main.cpp
similarity index 100%
rename from src/trinityrealm/Main.cpp
rename to src/server/trinityrealm/Main.cpp
diff --git a/src/trinityrealm/RealmAcceptor.h b/src/server/trinityrealm/RealmAcceptor.h
similarity index 100%
rename from src/trinityrealm/RealmAcceptor.h
rename to src/server/trinityrealm/RealmAcceptor.h
diff --git a/src/trinityrealm/RealmList.cpp b/src/server/trinityrealm/RealmList.cpp
similarity index 100%
rename from src/trinityrealm/RealmList.cpp
rename to src/server/trinityrealm/RealmList.cpp
diff --git a/src/trinityrealm/RealmList.h b/src/server/trinityrealm/RealmList.h
similarity index 100%
rename from src/trinityrealm/RealmList.h
rename to src/server/trinityrealm/RealmList.h
diff --git a/src/trinityrealm/RealmSocket.cpp b/src/server/trinityrealm/RealmSocket.cpp
similarity index 100%
rename from src/trinityrealm/RealmSocket.cpp
rename to src/server/trinityrealm/RealmSocket.cpp
diff --git a/src/trinityrealm/RealmSocket.h b/src/server/trinityrealm/RealmSocket.h
similarity index 100%
rename from src/trinityrealm/RealmSocket.h
rename to src/server/trinityrealm/RealmSocket.h
diff --git a/src/trinityrealm/TrinityRealm.ico b/src/server/trinityrealm/TrinityRealm.ico
similarity index 100%
rename from src/trinityrealm/TrinityRealm.ico
rename to src/server/trinityrealm/TrinityRealm.ico
diff --git a/src/trinityrealm/TrinityRealm.rc b/src/server/trinityrealm/TrinityRealm.rc
similarity index 100%
rename from src/trinityrealm/TrinityRealm.rc
rename to src/server/trinityrealm/TrinityRealm.rc
diff --git a/src/trinityrealm/resource.h b/src/server/trinityrealm/resource.h
similarity index 100%
rename from src/trinityrealm/resource.h
rename to src/server/trinityrealm/resource.h
diff --git a/src/trinityrealm/trinityrealm.conf.dist b/src/server/trinityrealm/trinityrealm.conf.dist
similarity index 100%
rename from src/trinityrealm/trinityrealm.conf.dist
rename to src/server/trinityrealm/trinityrealm.conf.dist