* More cleanup

--HG--
branch : trunk

14 files changed, 31 insertions, 31 deletions

diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp
index 19d5b5d8354..f4da814e86b 100644
--- a/src/server/game/AI/CoreAI/GuardAI.cpp
+++ b/src/server/game/AI/CoreAI/GuardAI.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "GuardAI.h"
-#include "Errors.h"
+#include "Debugging/Errors.h"
 #include "Player.h"
 #include "ObjectAccessor.h"
 #include "World.h"
diff --git a/src/server/game/AI/CoreAI/GuardAI.h b/src/server/game/AI/CoreAI/GuardAI.h
index 73e3692a770..3d884e28906 100644
--- a/src/server/game/AI/CoreAI/GuardAI.h
+++ b/src/server/game/AI/CoreAI/GuardAI.h
@@ -22,7 +22,7 @@
 #define TRINITY_GUARDAI_H
 
 #include "CreatureAI.h"
-#include "Timer.h"
+#include "Utilities/Timer.h"
 
 class Creature;
 
diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp
index 09ec8fae53f..72f0db20cb5 100644
--- a/src/server/game/AI/CoreAI/PetAI.cpp
+++ b/src/server/game/AI/CoreAI/PetAI.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "PetAI.h"
-#include "Errors.h"
+#include "Debugging/Errors.h"
 #include "Pet.h"
 #include "Player.h"
 #include "DBCStores.h"
@@ -28,7 +28,7 @@
 #include "SpellMgr.h"
 #include "Creature.h"
 #include "World.h"
-#include "Util.h"
+#include "Utilities/Util.h"
 
 int PetAI::Permissible(const Creature *creature)
 {
diff --git a/src/server/game/AI/CoreAI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h
index f6087a129ae..52568999cd1 100644
--- a/src/server/game/AI/CoreAI/PetAI.h
+++ b/src/server/game/AI/CoreAI/PetAI.h
@@ -22,7 +22,7 @@
 #define TRINITY_PETAI_H
 
 #include "CreatureAI.h"
-#include "Timer.h"
+#include "Utilities/Timer.h"
 
 class Creature;
 class Spell;
diff --git a/src/server/game/AI/CoreAI/ReactorAI.cpp b/src/server/game/AI/CoreAI/ReactorAI.cpp
index fdca6314747..f5e3739ccbf 100644
--- a/src/server/game/AI/CoreAI/ReactorAI.cpp
+++ b/src/server/game/AI/CoreAI/ReactorAI.cpp
@@ -18,10 +18,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "ByteBuffer.h"
+#include "Packets/ByteBuffer.h"
 #include "ReactorAI.h"
-#include "Errors.h"
-#include "Log.h"
+#include "Debugging/Errors.h"
+#include "Logging/Log.h"
 #include "ObjectAccessor.h"
 #include "CreatureAIImpl.h"
 
diff --git a/src/server/game/AI/CoreAI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp
index a6464f189e8..58045153efd 100644
--- a/src/server/game/AI/CoreAI/TotemAI.cpp
+++ b/src/server/game/AI/CoreAI/TotemAI.cpp
@@ -25,9 +25,9 @@
 #include "ObjectAccessor.h"
 #include "SpellMgr.h"
 
-#include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
-#include "CellImpl.h"
+#include "Grids/Notifiers/GridNotifiers.h"
+#include "Grids/Notifiers/GridNotifiersImpl.h"
+#include "Grids/Cells/CellImpl.h"
 
 int
 TotemAI::Permissible(const Creature *creature)
diff --git a/src/server/game/AI/CoreAI/TotemAI.h b/src/server/game/AI/CoreAI/TotemAI.h
index 34f4dfa9945..63459ace023 100644
--- a/src/server/game/AI/CoreAI/TotemAI.h
+++ b/src/server/game/AI/CoreAI/TotemAI.h
@@ -22,7 +22,7 @@
 #define TRINITY_TOTEMAI_H
 
 #include "CreatureAI.h"
-#include "Timer.h"
+#include "Utilities/Timer.h"
 
 class Creature;
 class Totem;
diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h
index 62b7090a2d0..3033f0556db 100644
--- a/src/server/game/AI/CoreAI/UnitAI.h
+++ b/src/server/game/AI/CoreAI/UnitAI.h
@@ -21,7 +21,7 @@
 #ifndef TRINITY_UNITAI_H
 #define TRINITY_UNITAI_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 #include <list>
 #include "Unit.h"
 
diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h
index c03d3dd09d0..58020c785dd 100644
--- a/src/server/game/AI/CreatureAI.h
+++ b/src/server/game/AI/CreatureAI.h
@@ -21,7 +21,7 @@
 #ifndef TRINITY_CREATUREAI_H
 #define TRINITY_CREATUREAI_H
 
-#include "UnitAI.h"
+#include "AI/CoreAI/UnitAI.h"
 #include "Common.h"
 
 class WorldObject;
diff --git a/src/server/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h
index d2f96ffcabc..0f05d233891 100644
--- a/src/server/game/AI/CreatureAIImpl.h
+++ b/src/server/game/AI/CreatureAIImpl.h
@@ -19,7 +19,7 @@
 #define CREATUREAIIMPL_H
 
 #include "Common.h"
-#include "Platform/Define.h"
+#include "Define.h"
 #include "TemporarySummon.h"
 #include "CreatureAI.h"
 #include "SpellMgr.h"
diff --git a/src/server/game/AI/CreatureAIRegistry.cpp b/src/server/game/AI/CreatureAIRegistry.cpp
index 9db30a0a5c4..7b96e7a97d1 100644
--- a/src/server/game/AI/CreatureAIRegistry.cpp
+++ b/src/server/game/AI/CreatureAIRegistry.cpp
@@ -18,15 +18,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "PassiveAI.h"
-#include "ReactorAI.h"
-#include "CombatAI.h"
-#include "GuardAI.h"
-#include "PetAI.h"
-#include "TotemAI.h"
-#include "CreatureEventAI.h"
-#include "RandomMovementGenerator.h"
-#include "MovementGeneratorImpl.h"
+#include "CoreAI/PassiveAI.h"
+#include "CoreAI/ReactorAI.h"
+#include "CoreAI/CombatAI.h"
+#include "CoreAI/GuardAI.h"
+#include "CoreAI/PetAI.h"
+#include "CoreAI/TotemAI.h"
+#include "EventAI/CreatureEventAI.h"
+#include "Movement/MovementGenerators/RandomMovementGenerator.h"
+#include "Movement/MovementGeneratorImpl.h"
 #include "CreatureAIRegistry.h"
 #include "WaypointMovementGenerator.h"
 #include "CreatureAIFactory.h"
diff --git a/src/server/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp
index d3fd5a8aed9..6985edaaf2b 100644
--- a/src/server/game/AI/CreatureAISelector.cpp
+++ b/src/server/game/AI/CreatureAISelector.cpp
@@ -20,7 +20,7 @@
 
 #include "Creature.h"
 #include "CreatureAISelector.h"
-#include "PassiveAI.h"
+#include "AI/CoreAI/PassiveAI.h"
 #include "Policies/SingletonImp.h"
 #include "MovementGenerator.h"
 #include "Pet.h"
diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp
index 47c8e9e6ad8..4162a002d99 100644
--- a/src/server/game/AI/EventAI/CreatureEventAI.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp
@@ -24,11 +24,11 @@
 #include "ObjectMgr.h"
 #include "Spell.h"
 #include "World.h"
-#include "Cell.h"
-#include "CellImpl.h"
+#include "Grids/Cells/Cell.h"
+#include "Grids/Cells/CellImpl.h"
 #include "GameEventMgr.h"
-#include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
+#include "Grids/Notifiers/GridNotifiers.h"
+#include "Grids/Notifiers/GridNotifiersImpl.h"
 #include "InstanceData.h"
 #include "SpellMgr.h"
 #include "CreatureAIImpl.h"
diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
index 83d62ca74dc..f24226ee913 100644
--- a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
@@ -22,10 +22,10 @@
 #include "CreatureEventAI.h"
 #include "CreatureEventAIMgr.h"
 #include "ObjectMgr.h"
-#include "ProgressBar.h"
+#include "Utilities/ProgressBar.h"
 #include "Policies/SingletonImp.h"
 #include "ObjectDefines.h"
-#include "GridDefines.h"
+#include "Grids/GridDefines.h"
 #include "ConditionMgr.h"
 
 INSTANTIATE_SINGLETON_1(CreatureEventAIMgr);