* Nope still won't build yet

--HG--
branch : trunk

28 files changed, 61 insertions, 61 deletions

diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index 0fc0d1251f5..480aceb26e6 100644
--- a/src/server/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
@@ -22,8 +22,8 @@
 #define TRINITY_DBCSTRUCTURE_H
 
 #include "DBCEnums.h"
-#include "Platform/Define.h"
-#include "Util.h"
+#include "Define.h"
+#include "Utilities/Util.h"
 
 #include <map>
 #include <set>
diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h
index c5a412c3ab7..edeac0a20ef 100644
--- a/src/server/game/Entities/Object/Object.h
+++ b/src/server/game/Entities/Object/Object.h
@@ -22,11 +22,11 @@
 #define _OBJECT_H
 
 #include "Common.h"
-#include "UpdateFields.h"
-#include "UpdateData.h"
-#include "GameSystem/GridReference.h"
+#include "Updates/UpdateFields.h"
+#include "Updates/UpdateData.h"
+#include "Grids/GridReference.h"
 #include "ObjectDefines.h"
-#include "GridDefines.h"
+#include "Grids/GridDefines.h"
 #include "Map.h"
 
 #include <set>
diff --git a/src/server/game/Entities/Object/ObjectDefines.h b/src/server/game/Entities/Object/ObjectDefines.h
index a0e5ac1952d..15ce30d9a81 100644
--- a/src/server/game/Entities/Object/ObjectDefines.h
+++ b/src/server/game/Entities/Object/ObjectDefines.h
@@ -21,7 +21,7 @@
 #ifndef TRINITY_OBJECTDEFINES_H
 #define TRINITY_OBJECTDEFINES_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 
 // used for creating values for respawn for example
 #define MAKE_PAIR64(l, h)  uint64(uint32(l) | (uint64(h) << 32))
diff --git a/src/server/game/Entities/Object/Updates/UpdateData.h b/src/server/game/Entities/Object/Updates/UpdateData.h
index e560db842f5..eb10696a26e 100644
--- a/src/server/game/Entities/Object/Updates/UpdateData.h
+++ b/src/server/game/Entities/Object/Updates/UpdateData.h
@@ -21,7 +21,7 @@
 #ifndef __UPDATEDATA_H
 #define __UPDATEDATA_H
 
-#include "ByteBuffer.h"
+#include "Packets/ByteBuffer.h"
 class WorldPacket;
 
 enum OBJECT_UPDATE_TYPE
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index a2f4b2cd388..c41a00f2e43 100644
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -23,7 +23,7 @@
 
 #include "Common.h"
 #include "Object.h"
-#include "Opcodes.h"
+#include "Server/Protocol/Opcodes.h"
 #include "SpellAuraDefines.h"
 #include "UpdateFields.h"
 #include "SharedDefines.h"
diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h
index 8e64eb48fa0..1f865229d42 100644
--- a/src/server/game/Globals/ObjectAccessor.h
+++ b/src/server/game/Globals/ObjectAccessor.h
@@ -21,15 +21,15 @@
 #ifndef TRINITY_OBJECTACCESSOR_H
 #define TRINITY_OBJECTACCESSOR_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "Policies/Singleton.h"
 #include <ace/Thread_Mutex.h>
-#include "Utilities/UnorderedMap.h"
+#include "Dynamic/UnorderedMap.h"
 #include "Policies/ThreadingModel.h"
 
-#include "UpdateData.h"
+#include "Updates/UpdateData.h"
 
-#include "GridDefines.h"
+#include "Grids/GridDefines.h"
 #include "Object.h"
 #include "Player.h"
 
diff --git a/src/server/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h
index 49e0329ace6..657cc403e2a 100644
--- a/src/server/game/Grids/Cells/Cell.h
+++ b/src/server/game/Grids/Cells/Cell.h
@@ -23,10 +23,10 @@
 
 #include <cmath>
 
-#include "GameSystem/TypeContainer.h"
-#include "GameSystem/TypeContainerVisitor.h"
+#include "Dynamic/TypeContainer.h"
+#include "Dynamic/TypeContainerVisitor.h"
 
-#include "GridDefines.h"
+#include "Grids/GridDefines.h"
 
 class Map;
 class WorldObject;
diff --git a/src/server/game/Grids/Grid.h b/src/server/game/Grids/Grid.h
index 65bf3c92f9d..0085bc70152 100644
--- a/src/server/game/Grids/Grid.h
+++ b/src/server/game/Grids/Grid.h
@@ -32,10 +32,10 @@
   Grid's perspective, the loader meets its API requirement is suffice.
 */
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "Policies/ThreadingModel.h"
-#include "TypeContainer.h"
-#include "TypeContainerVisitor.h"
+#include "Dynamic/TypeContainer.h"
+#include "Dynamic/TypeContainerVisitor.h"
 
 // forward declaration
 template<class A, class T, class O> class GridLoader;
diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h
index 5269d0a094d..e27ebec4a46 100644
--- a/src/server/game/Grids/GridDefines.h
+++ b/src/server/game/Grids/GridDefines.h
@@ -22,7 +22,7 @@
 #define TRINITY_GRIDDEFINES_H
 
 #include "Common.h"
-#include "GameSystem/NGrid.h"
+#include "Grids/NGrid.h"
 #include <cmath>
 
 // Forward class definitions
diff --git a/src/server/game/Grids/GridRefManager.h b/src/server/game/Grids/GridRefManager.h
index 79799105fb7..8f3430a0b4a 100644
--- a/src/server/game/Grids/GridRefManager.h
+++ b/src/server/game/Grids/GridRefManager.h
@@ -21,7 +21,7 @@
 #ifndef _GRIDREFMANAGER
 #define _GRIDREFMANAGER
 
-#include "Utilities/LinkedReference/RefManager.h"
+#include "Dynamic/LinkedReference/RefManager.h"
 
 template<class OBJECT>
 class GridReference;
diff --git a/src/server/game/Grids/GridReference.h b/src/server/game/Grids/GridReference.h
index d2e3a455895..ac7c8e154b2 100644
--- a/src/server/game/Grids/GridReference.h
+++ b/src/server/game/Grids/GridReference.h
@@ -21,7 +21,7 @@
 #ifndef _GRIDREFERENCE_H
 #define _GRIDREFERENCE_H
 
-#include "Utilities/LinkedReference/Reference.h"
+#include "Dynamic/LinkedReference/Reference.h"
 
 template<class OBJECT>
 class GridRefManager;
diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h
index 3810286e123..1d8967e4d9a 100644
--- a/src/server/game/Grids/NGrid.h
+++ b/src/server/game/Grids/NGrid.h
@@ -24,10 +24,10 @@
 /** NGrid is nothing more than a wrapper of the Grid with an NxN cells
  */
 
-#include "GameSystem/Grid.h"
-#include "GameSystem/GridReference.h"
-#include "Timer.h"
-#include "Util.h"
+#include "Grids/Grid.h"
+#include "Grids/GridReference.h"
+#include "Utilities/Timer.h"
+#include "Utilities/Util.h"
 
 #define DEFAULT_VISIBILITY_NOTIFY_PERIOD      1000
 
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index ceb526b8244..a0e3a2a93f8 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -21,18 +21,18 @@
 #ifndef TRINITY_MAP_H
 #define TRINITY_MAP_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "Policies/ThreadingModel.h"
 #include "ace/RW_Thread_Mutex.h"
 #include "ace/Thread_Mutex.h"
 
 #include "DBCStructure.h"
-#include "GridDefines.h"
-#include "Cell.h"
-#include "Timer.h"
-#include "SharedDefines.h"
-#include "GameSystem/GridRefManager.h"
-#include "MapRefManager.h"
+#include "Grids/GridDefines.h"
+#include "Grids/Cells/Cell.h"
+#include "Utilities/Timer.h"
+#include "Miscellaneous/SharedDefines.h"
+#include "Grids/GridRefManager.h"
+#include "Maps/MapRefManager.h"
 #include "mersennetwister/MersenneTwister.h"
 
 #include <bitset>
diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h
index d94f9fced0e..891e95d75f9 100644
--- a/src/server/game/Maps/MapManager.h
+++ b/src/server/game/Maps/MapManager.h
@@ -21,12 +21,12 @@
 #ifndef TRINITY_MAPMANAGER_H
 #define TRINITY_MAPMANAGER_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include "Policies/Singleton.h"
 #include "ace/Thread_Mutex.h"
 #include "Common.h"
 #include "Map.h"
-#include "GridStates.h"
+#include "Grids/GridStates.h"
 #include "MapUpdater.h"
 
 class Transport;
diff --git a/src/server/game/Maps/MapRefManager.h b/src/server/game/Maps/MapRefManager.h
index 4337aa75fd9..8712d343958 100644
--- a/src/server/game/Maps/MapRefManager.h
+++ b/src/server/game/Maps/MapRefManager.h
@@ -19,7 +19,7 @@
 #ifndef _MAPREFMANAGER
 #define _MAPREFMANAGER
 
-#include "Utilities/LinkedReference/RefManager.h"
+#include "Dynamic/LinkedReference/RefManager.h"
 
 class MapReference;
 
diff --git a/src/server/game/Maps/MapUpdater.h b/src/server/game/Maps/MapUpdater.h
index f301b15ca2f..48cd8db0c36 100644
--- a/src/server/game/Maps/MapUpdater.h
+++ b/src/server/game/Maps/MapUpdater.h
@@ -4,7 +4,7 @@
 #include <ace/Thread_Mutex.h>
 #include <ace/Condition_Thread_Mutex.h>
 
-#include "DelayExecutor.h"
+#include "Threading/DelayExecutor.h"
 
 class Map;
 
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index 903dd4b09ca..381114c6f38 100644
--- a/src/server/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
@@ -21,7 +21,7 @@
 #ifndef TRINITY_SHAREDDEFINES_H
 #define TRINITY_SHAREDDEFINES_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include <cassert>
 
 // loot modes for creatures and gameobjects, bitmask!
diff --git a/src/server/game/PrecompiledHeaders/NixCorePCH.h b/src/server/game/PrecompiledHeaders/NixCorePCH.h
index 7252e980e7d..cb42e4138e4 100644
--- a/src/server/game/PrecompiledHeaders/NixCorePCH.h
+++ b/src/server/game/PrecompiledHeaders/NixCorePCH.h
@@ -1,9 +1,9 @@
 //add here most rarely modified headers to speed up debug build compilation
-#include "WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
+#include "Server/WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
 #include "Common.h"
 
 #include "MapManager.h"
-#include "Log.h"
+#include "Logging/Log.h"
 #include "ObjectAccessor.h"
 #include "ObjectDefines.h"
 #include "Database/SQLStorage.h"
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index 4ae6931c3f5..67f2026f1f5 100644
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -31,7 +31,7 @@
 //       if this class definition not complite then VS for x64 release use different size for
 //       struct OpcodeHandler in this header and Opcode.cpp and get totally wrong data from
 //       table opcodeTable in source when Opcode.h included but WorldSession.h not included
-#include "WorldSession.h"
+#include "Server/WorldSession.h"
 
 /// List of Opcodes
 enum Opcodes
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index c17f3e3f3e6..d2e8f6cdada 100644
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -26,10 +26,10 @@
 #define __WORLDSESSION_H
 
 #include "Common.h"
-#include "SharedDefines.h"
-#include "AddonMgr.h"
-#include "QueryResult.h"
-#include "World.h"
+#include "Miscellaneous/SharedDefines.h"
+#include "Addons/AddonMgr.h"
+#include "Database/QueryResult.h"
+#include "World/World.h"
 
 struct ItemPrototype;
 struct AuctionEntry;
diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h
index 70654274215..61158799bec 100644
--- a/src/server/game/Server/WorldSocket.h
+++ b/src/server/game/Server/WorldSocket.h
@@ -43,7 +43,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "Common.h"
-#include "Auth/AuthCrypt.h"
+#include "Cryptography/Authentication/AuthCrypt.h"
 
 class ACE_Message_Block;
 class WorldPacket;
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index 1a95253fa03..dfd13e60d46 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -26,11 +26,11 @@
 #define __WORLD_H
 
 #include "Common.h"
-#include "Timer.h"
+#include "Utilities/Timer.h"
 #include "Policies/Singleton.h"
-#include "SharedDefines.h"
+#include "Miscellaneous/SharedDefines.h"
 #include "ace/Atomic_Op.h"
-#include "QueryResult.h"
+#include "Database/QueryResult.h"
 
 #include <map>
 #include <set>
diff --git a/src/server/shared/Dynamic/LinkedReference/RefManager.h b/src/server/shared/Dynamic/LinkedReference/RefManager.h
index 7e294b4f5f0..ea79d5e1784 100644
--- a/src/server/shared/Dynamic/LinkedReference/RefManager.h
+++ b/src/server/shared/Dynamic/LinkedReference/RefManager.h
@@ -22,8 +22,8 @@
 #define _REFMANAGER_H
 //=====================================================
 
-#include "Utilities/LinkedList.h"
-#include "Utilities/LinkedReference/Reference.h"
+#include "Dynamic/LinkedList.h"
+#include "Dynamic/LinkedReference/Reference.h"
 
 template <class TO, class FROM> class RefManager : public LinkedListHead
 {
diff --git a/src/server/shared/Dynamic/LinkedReference/Reference.h b/src/server/shared/Dynamic/LinkedReference/Reference.h
index 4a1545f8f12..8891199a5eb 100644
--- a/src/server/shared/Dynamic/LinkedReference/Reference.h
+++ b/src/server/shared/Dynamic/LinkedReference/Reference.h
@@ -21,7 +21,7 @@
 #ifndef _REFERENCE_H
 #define _REFERENCE_H
 
-#include "Utilities/LinkedList.h"
+#include "Dynamic/LinkedList.h"
 
 //=====================================================
 
diff --git a/src/server/shared/Dynamic/TypeContainer.h b/src/server/shared/Dynamic/TypeContainer.h
index c2c9b4fcdea..0fa61f5e562 100644
--- a/src/server/shared/Dynamic/TypeContainer.h
+++ b/src/server/shared/Dynamic/TypeContainer.h
@@ -28,9 +28,9 @@
 
 #include <map>
 #include <vector>
-#include "Platform/Define.h"
-#include "Utilities/TypeList.h"
-#include "GameSystem/GridRefManager.h"
+#include "Define.h"
+#include "Dynamic/TypeList.h"
+#include "Grids/GridRefManager.h"
 
 /*
  * @class ContainerMapList is a mulit-type container for map elements
diff --git a/src/server/shared/Dynamic/TypeContainerFunctions.h b/src/server/shared/Dynamic/TypeContainerFunctions.h
index edfbb40e659..7ab2151461e 100644
--- a/src/server/shared/Dynamic/TypeContainerFunctions.h
+++ b/src/server/shared/Dynamic/TypeContainerFunctions.h
@@ -27,8 +27,8 @@
  * to access or mutate the container.
  */
 
-#include "Platform/Define.h"
-#include "Utilities/TypeList.h"
+#include "Define.h"
+#include "Dynamic/TypeList.h"
 #include <map>
 
 namespace Trinity
diff --git a/src/server/shared/Dynamic/TypeContainerVisitor.h b/src/server/shared/Dynamic/TypeContainerVisitor.h
index f15075e5afd..6057eb32fc3 100644
--- a/src/server/shared/Dynamic/TypeContainerVisitor.h
+++ b/src/server/shared/Dynamic/TypeContainerVisitor.h
@@ -27,8 +27,8 @@
  * to overload its types as a visit method is called.
  */
 
-#include "Platform/Define.h"
-#include "TypeContainer.h"
+#include "Define.h"
+#include "Dynamic/TypeContainer.h"
 
 // forward declaration
 template<class T, class Y> class TypeContainerVisitor;
diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h
index ba0240fb58b..98709a5b0e0 100644
--- a/src/server/shared/Packets/ByteBuffer.h
+++ b/src/server/shared/Packets/ByteBuffer.h
@@ -22,8 +22,8 @@
 #define _BYTEBUFFER_H
 
 #include "Common.h"
-#include "Errors.h"
-#include "Log.h"
+#include "Debugging/Errors.h"
+#include "Logging/Log.h"
 #include "Utilities/ByteConverter.h"
 
 class ByteBufferException