diff --git a/src/PlayerbotAIConfig.cpp b/src/Config/PlayerbotAIConfig.cpp
similarity index 99%
rename from src/PlayerbotAIConfig.cpp
rename to src/Config/PlayerbotAIConfig.cpp
index d8a8b0b4..b9ef257d 100644
--- a/src/PlayerbotAIConfig.cpp
+++ b/src/Config/PlayerbotAIConfig.cpp
@@ -7,7 +7,7 @@
 #include <iostream>
 #include "Config.h"
 #include "NewRpgInfo.h"
-#include "PlayerbotDungeonSuggestionMgr.h"
+#include "PlayerbotDungeonRepository.h"
 #include "PlayerbotFactory.h"
 #include "Playerbots.h"
 #include "PlayerbotGuildMgr.h"
@@ -678,7 +678,7 @@ bool PlayerbotAIConfig::Initialize()
 
     if (sPlayerbotAIConfig->randomBotSuggestDungeons)
     {
-        sPlayerbotDungeonSuggestionMgr->LoadDungeonSuggestions();
+        sPlayerbotDungeonRepository->LoadDungeonSuggestions();
     }
 
     excludedHunterPetFamilies.clear();
diff --git a/src/PlayerbotAIConfig.h b/src/Config/PlayerbotAIConfig.h
similarity index 100%
rename from src/PlayerbotAIConfig.h
rename to src/Config/PlayerbotAIConfig.h
diff --git a/src/AiFactory.cpp b/src/Core/Ai/AiFactory.cpp
similarity index 100%
rename from src/AiFactory.cpp
rename to src/Core/Ai/AiFactory.cpp
diff --git a/src/AiFactory.h b/src/Core/Ai/AiFactory.h
similarity index 100%
rename from src/AiFactory.h
rename to src/Core/Ai/AiFactory.h
diff --git a/src/strategy/Action.cpp b/src/Core/Ai/Engine/Action/Action.cpp
similarity index 100%
rename from src/strategy/Action.cpp
rename to src/Core/Ai/Engine/Action/Action.cpp
diff --git a/src/strategy/Action.h b/src/Core/Ai/Engine/Action/Action.h
similarity index 100%
rename from src/strategy/Action.h
rename to src/Core/Ai/Engine/Action/Action.h
diff --git a/src/strategy/AiObject.cpp b/src/Core/Ai/Engine/AiObject.cpp
similarity index 100%
rename from src/strategy/AiObject.cpp
rename to src/Core/Ai/Engine/AiObject.cpp
diff --git a/src/strategy/AiObject.h b/src/Core/Ai/Engine/AiObject.h
similarity index 100%
rename from src/strategy/AiObject.h
rename to src/Core/Ai/Engine/AiObject.h
diff --git a/src/strategy/AiObjectContext.cpp b/src/Core/Ai/Engine/AiObjectContext.cpp
similarity index 85%
rename from src/strategy/AiObjectContext.cpp
rename to src/Core/Ai/Engine/AiObjectContext.cpp
index aa6a67cd..8ce9b60b 100644
--- a/src/strategy/AiObjectContext.cpp
+++ b/src/Core/Ai/Engine/AiObjectContext.cpp
@@ -27,32 +27,32 @@
 #include "WarriorAiObjectContext.h"
 #include "WorldPacketActionContext.h"
 #include "WorldPacketTriggerContext.h"
-#include "dungeons/DungeonStrategyContext.h"
-#include "dungeons/wotlk/WotlkDungeonActionContext.h"
-#include "dungeons/wotlk/WotlkDungeonTriggerContext.h"
-#include "raids/RaidStrategyContext.h"
-#include "raids/aq20/RaidAq20ActionContext.h"
-#include "raids/aq20/RaidAq20TriggerContext.h"
-#include "raids/moltencore/RaidMcActionContext.h"
-#include "raids/moltencore/RaidMcTriggerContext.h"
-#include "raids/blackwinglair/RaidBwlActionContext.h"
-#include "raids/blackwinglair/RaidBwlTriggerContext.h"
-#include "raids/karazhan/RaidKarazhanActionContext.h"
-#include "raids/karazhan/RaidKarazhanTriggerContext.h"
-#include "raids/magtheridon/RaidMagtheridonActionContext.h"
-#include "raids/magtheridon/RaidMagtheridonTriggerContext.h"
-#include "raids/gruulslair/RaidGruulsLairActionContext.h"
-#include "raids/gruulslair/RaidGruulsLairTriggerContext.h"
-#include "raids/eyeofeternity/RaidEoEActionContext.h"
-#include "raids/eyeofeternity/RaidEoETriggerContext.h"
-#include "raids/vaultofarchavon/RaidVoAActionContext.h"
-#include "raids/vaultofarchavon/RaidVoATriggerContext.h"
-#include "raids/obsidiansanctum/RaidOsActionContext.h"
-#include "raids/obsidiansanctum/RaidOsTriggerContext.h"
-#include "raids/onyxia/RaidOnyxiaActionContext.h"
-#include "raids/onyxia/RaidOnyxiaTriggerContext.h"
-#include "raids/icecrown/RaidIccActionContext.h"
-#include "raids/icecrown/RaidIccTriggerContext.h"
+#include "Extend/DungeonAi/DungeonStrategyContext.h"
+#include "Extend/DungeonAi/Wotlk/WotlkDungeonActionContext.h"
+#include "Extend/DungeonAi/Wotlk/WotlkDungeonTriggerContext.h"
+#include "Extend/RaidAi/RaidStrategyContext.h"
+#include "Extend/RaidAi/Aq20/RaidAq20ActionContext.h"
+#include "Extend/RaidAi/Aq20/RaidAq20TriggerContext.h"
+#include "Extend/RaidAi/MoltenCore/RaidMcActionContext.h"
+#include "Extend/RaidAi/MoltenCore/RaidMcTriggerContext.h"
+#include "Extend/RaidAi/BlackwingLair/RaidBwlActionContext.h"
+#include "Extend/RaidAi/BlackwingLair/RaidBwlTriggerContext.h"
+#include "Extend/RaidAi/Karazhan/RaidKarazhanActionContext.h"
+#include "Extend/RaidAi/Karazhan/RaidKarazhanTriggerContext.h"
+#include "Extend/RaidAi/Magtheridon/RaidMagtheridonActionContext.h"
+#include "Extend/RaidAi/Magtheridon/RaidMagtheridonTriggerContext.h"
+#include "Extend/RaidAi/GruulsLair/RaidGruulsLairActionContext.h"
+#include "Extend/RaidAi/GruulsLair/RaidGruulsLairTriggerContext.h"
+#include "Extend/RaidAi/EyeOfEternity/RaidEoEActionContext.h"
+#include "Extend/RaidAi/EyeOfEternity/RaidEoETriggerContext.h"
+#include "Extend/RaidAi/VaultOfArchavon/RaidVoAActionContext.h"
+#include "Extend/RaidAi/VaultOfArchavon/RaidVoATriggerContext.h"
+#include "Extend/RaidAi/ObsidianSanctum/RaidOsActionContext.h"
+#include "Extend/RaidAi/ObsidianSanctum/RaidOsTriggerContext.h"
+#include "Extend/RaidAi/Onyxia/RaidOnyxiaActionContext.h"
+#include "Extend/RaidAi/Onyxia/RaidOnyxiaTriggerContext.h"
+#include "Extend/RaidAi/Icecrown/RaidIccActionContext.h"
+#include "Extend/RaidAi/Icecrown/RaidIccTriggerContext.h"
 
 SharedNamedObjectContextList<Strategy> AiObjectContext::sharedStrategyContexts;
 SharedNamedObjectContextList<Action> AiObjectContext::sharedActionContexts;
diff --git a/src/strategy/AiObjectContext.h b/src/Core/Ai/Engine/AiObjectContext.h
similarity index 100%
rename from src/strategy/AiObjectContext.h
rename to src/Core/Ai/Engine/AiObjectContext.h
diff --git a/src/strategy/Engine.cpp b/src/Core/Ai/Engine/Engine.cpp
similarity index 97%
rename from src/strategy/Engine.cpp
rename to src/Core/Ai/Engine/Engine.cpp
index 76350375..6ed61a1a 100644
--- a/src/strategy/Engine.cpp
+++ b/src/Core/Ai/Engine/Engine.cpp
@@ -7,7 +7,7 @@
 
 #include "Action.h"
 #include "Event.h"
-#include "PerformanceMonitor.h"
+#include "PerfMonitor.h"
 #include "Playerbots.h"
 #include "Queue.h"
 #include "Strategy.h"
@@ -204,7 +204,7 @@ bool Engine::DoNextAction(Unit* unit, uint32 depth, bool minimal)
                     }
                 }
 
-                PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(PERF_MON_ACTION, action->getName(), &aiObjectContext->performanceStack);
+                PerfMonitorOperation* pmo = sPerfMonitor->start(PERF_MON_ACTION, action->getName(), &aiObjectContext->performanceStack);
                 actionExecuted = ListenAndExecute(action, event);
                 if (pmo)
                     pmo->finish();
@@ -456,8 +456,8 @@ void Engine::ProcessTriggers(bool minimal)
             if (minimal && node->getFirstRelevance() < 100)
                 continue;
 
-            PerformanceMonitorOperation* pmo =
-                sPerformanceMonitor->start(PERF_MON_TRIGGER, trigger->getName(), &aiObjectContext->performanceStack);
+            PerfMonitorOperation* pmo =
+                sPerfMonitor->start(PERF_MON_TRIGGER, trigger->getName(), &aiObjectContext->performanceStack);
             Event event = trigger->Check();
             if (pmo)
                 pmo->finish();
diff --git a/src/strategy/Engine.h b/src/Core/Ai/Engine/Engine.h
similarity index 100%
rename from src/strategy/Engine.h
rename to src/Core/Ai/Engine/Engine.h
diff --git a/src/strategy/ExternalEventHelper.cpp b/src/Core/Ai/Engine/ExternalEventHelper.cpp
similarity index 100%
rename from src/strategy/ExternalEventHelper.cpp
rename to src/Core/Ai/Engine/ExternalEventHelper.cpp
diff --git a/src/strategy/ExternalEventHelper.h b/src/Core/Ai/Engine/ExternalEventHelper.h
similarity index 100%
rename from src/strategy/ExternalEventHelper.h
rename to src/Core/Ai/Engine/ExternalEventHelper.h
diff --git a/src/strategy/Multiplier.h b/src/Core/Ai/Engine/Multiplier.h
similarity index 100%
rename from src/strategy/Multiplier.h
rename to src/Core/Ai/Engine/Multiplier.h
diff --git a/src/strategy/NamedObjectContext.cpp b/src/Core/Ai/Engine/NamedObjectContext.cpp
similarity index 100%
rename from src/strategy/NamedObjectContext.cpp
rename to src/Core/Ai/Engine/NamedObjectContext.cpp
diff --git a/src/strategy/NamedObjectContext.h b/src/Core/Ai/Engine/NamedObjectContext.h
similarity index 100%
rename from src/strategy/NamedObjectContext.h
rename to src/Core/Ai/Engine/NamedObjectContext.h
diff --git a/src/strategy/PassiveMultiplier.cpp b/src/Core/Ai/Engine/PassiveMultiplier.cpp
similarity index 100%
rename from src/strategy/PassiveMultiplier.cpp
rename to src/Core/Ai/Engine/PassiveMultiplier.cpp
diff --git a/src/strategy/PassiveMultiplier.h b/src/Core/Ai/Engine/PassiveMultiplier.h
similarity index 100%
rename from src/strategy/PassiveMultiplier.h
rename to src/Core/Ai/Engine/PassiveMultiplier.h
diff --git a/src/PlayerbotAIAware.h b/src/Core/Ai/Engine/PlayerbotAIAware.h
similarity index 100%
rename from src/PlayerbotAIAware.h
rename to src/Core/Ai/Engine/PlayerbotAIAware.h
diff --git a/src/PlayerbotAIBase.cpp b/src/Core/Ai/Engine/PlayerbotAIBase.cpp
similarity index 94%
rename from src/PlayerbotAIBase.cpp
rename to src/Core/Ai/Engine/PlayerbotAIBase.cpp
index 992e8349..c0349793 100644
--- a/src/PlayerbotAIBase.cpp
+++ b/src/Core/Ai/Engine/PlayerbotAIBase.cpp
@@ -14,7 +14,7 @@ void PlayerbotAIBase::UpdateAI(uint32 elapsed, bool minimal)
     if (totalPmo)
         totalPmo->finish();
 
-    totalPmo = sPerformanceMonitor->start(PERF_MON_TOTAL, "PlayerbotAIBase::FullTick");
+    totalPmo = sPerfMonitor->start(PERF_MON_TOTAL, "PlayerbotAIBase::FullTick");
 
     if (nextAICheckDelay > elapsed)
         nextAICheckDelay -= elapsed;
diff --git a/src/PlayerbotAIBase.h b/src/Core/Ai/Engine/PlayerbotAIBase.h
similarity index 93%
rename from src/PlayerbotAIBase.h
rename to src/Core/Ai/Engine/PlayerbotAIBase.h
index 2b1f6d3f..03c762a5 100644
--- a/src/PlayerbotAIBase.h
+++ b/src/Core/Ai/Engine/PlayerbotAIBase.h
@@ -25,7 +25,7 @@ public:
 
 protected:
     uint32 nextAICheckDelay;
-    class PerformanceMonitorOperation* totalPmo = nullptr;
+    class PerfMonitorOperation* totalPmo = nullptr;
 
 private:
     bool _isBotAI;
diff --git a/src/strategy/CustomStrategy.cpp b/src/Core/Ai/Engine/Strategy/CustomStrategy.cpp
similarity index 100%
rename from src/strategy/CustomStrategy.cpp
rename to src/Core/Ai/Engine/Strategy/CustomStrategy.cpp
diff --git a/src/strategy/CustomStrategy.h b/src/Core/Ai/Engine/Strategy/CustomStrategy.h
similarity index 100%
rename from src/strategy/CustomStrategy.h
rename to src/Core/Ai/Engine/Strategy/CustomStrategy.h
diff --git a/src/strategy/Strategy.cpp b/src/Core/Ai/Engine/Strategy/Strategy.cpp
similarity index 100%
rename from src/strategy/Strategy.cpp
rename to src/Core/Ai/Engine/Strategy/Strategy.cpp
diff --git a/src/strategy/Strategy.h b/src/Core/Ai/Engine/Strategy/Strategy.h
similarity index 100%
rename from src/strategy/Strategy.h
rename to src/Core/Ai/Engine/Strategy/Strategy.h
diff --git a/src/strategy/Trigger.cpp b/src/Core/Ai/Engine/Trigger/Trigger.cpp
similarity index 100%
rename from src/strategy/Trigger.cpp
rename to src/Core/Ai/Engine/Trigger/Trigger.cpp
diff --git a/src/strategy/Trigger.h b/src/Core/Ai/Engine/Trigger/Trigger.h
similarity index 100%
rename from src/strategy/Trigger.h
rename to src/Core/Ai/Engine/Trigger/Trigger.h
diff --git a/src/strategy/Value.cpp b/src/Core/Ai/Engine/Value/Value.cpp
similarity index 95%
rename from src/strategy/Value.cpp
rename to src/Core/Ai/Engine/Value/Value.cpp
index ac10774c..c559e038 100644
--- a/src/strategy/Value.cpp
+++ b/src/Core/Ai/Engine/Value/Value.cpp
@@ -5,7 +5,7 @@
 
 #include "Value.h"
 
-#include "PerformanceMonitor.h"
+#include "PerfMonitor.h"
 #include "Playerbots.h"
 #include "Timer.h"
 
@@ -123,7 +123,7 @@ Unit* UnitCalculatedValue::Get()
 {
     if (checkInterval < 2)
     {
-        PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(
+        PerfMonitorOperation* pmo = sPerfMonitor->start(
             PERF_MON_VALUE, this->getName(), this->context ? &this->context->performanceStack : nullptr);
         value = Calculate();
         if (pmo)
@@ -135,7 +135,7 @@ Unit* UnitCalculatedValue::Get()
         if (!lastCheckTime || now - lastCheckTime >= checkInterval)
         {
             lastCheckTime = now;
-            PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(
+            PerfMonitorOperation* pmo = sPerfMonitor->start(
                 PERF_MON_VALUE, this->getName(), this->context ? &this->context->performanceStack : nullptr);
             value = Calculate();
             if (pmo)
diff --git a/src/strategy/Value.h b/src/Core/Ai/Engine/Value/Value.h
similarity index 95%
rename from src/strategy/Value.h
rename to src/Core/Ai/Engine/Value/Value.h
index 8c370226..b37e1620 100644
--- a/src/strategy/Value.h
+++ b/src/Core/Ai/Engine/Value/Value.h
@@ -10,7 +10,7 @@
 
 #include "AiObject.h"
 #include "ObjectGuid.h"
-#include "PerformanceMonitor.h"
+#include "PerfMonitor.h"
 #include "Timer.h"
 #include "Unit.h"
 
@@ -72,7 +72,7 @@ public:
     {
         if (checkInterval < 2)
         {
-            // PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(PERF_MON_VALUE, this->getName(),
+            // PerfMonitorOperation* pmo = sPerfMonitor->start(PERF_MON_VALUE, this->getName(),
             // this->context ? &this->context->performanceStack : nullptr);
             value = Calculate();
             // if (pmo)
@@ -84,7 +84,7 @@ public:
             if (!lastCheckTime || now - lastCheckTime >= checkInterval)
             {
                 lastCheckTime = now;
-                // PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(PERF_MON_VALUE, this->getName(),
+                // PerfMonitorOperation* pmo = sPerfMonitor->start(PERF_MON_VALUE, this->getName(),
                 // this->context ? &this->context->performanceStack : nullptr);
                 value = Calculate();
                 // if (pmo)
@@ -105,7 +105,7 @@ public:
     {
         if (checkInterval < 2)
         {
-            // PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(PERF_MON_VALUE, this->getName(),
+            // PerfMonitorOperation* pmo = sPerfMonitor->start(PERF_MON_VALUE, this->getName(),
             // this->context ? &this->context->performanceStack : nullptr);
             value = Calculate();
             // if (pmo)
@@ -117,7 +117,7 @@ public:
             if (!lastCheckTime || now - lastCheckTime >= checkInterval)
             {
                 lastCheckTime = now;
-                // PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(PERF_MON_VALUE, this->getName(),
+                // PerfMonitorOperation* pmo = sPerfMonitor->start(PERF_MON_VALUE, this->getName(),
                 // this->context ? &this->context->performanceStack : nullptr);
                 value = Calculate();
                 // if (pmo)
@@ -154,7 +154,7 @@ public:
         {
             this->lastCheckTime = now;
 
-            PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(
+            PerfMonitorOperation* pmo = sPerfMonitor->start(
                 PERF_MON_VALUE, this->getName(), this->context ? &this->context->performanceStack : nullptr);
             this->value = this->Calculate();
             if (pmo)
diff --git a/src/strategy/Event.cpp b/src/Core/Ai/Engine/WorldPacket/Event.cpp
similarity index 100%
rename from src/strategy/Event.cpp
rename to src/Core/Ai/Engine/WorldPacket/Event.cpp
diff --git a/src/strategy/Event.h b/src/Core/Ai/Engine/WorldPacket/Event.h
similarity index 100%
rename from src/strategy/Event.h
rename to src/Core/Ai/Engine/WorldPacket/Event.h
diff --git a/src/strategy/actions/ActionContext.h b/src/Core/Ai/Generic/ActionContext.h
similarity index 100%
rename from src/strategy/actions/ActionContext.h
rename to src/Core/Ai/Generic/ActionContext.h
diff --git a/src/strategy/actions/AcceptBattlegroundInvitationAction.cpp b/src/Core/Ai/Generic/Actions/AcceptBattlegroundInvitationAction.cpp
similarity index 100%
rename from src/strategy/actions/AcceptBattlegroundInvitationAction.cpp
rename to src/Core/Ai/Generic/Actions/AcceptBattlegroundInvitationAction.cpp
diff --git a/src/strategy/actions/AcceptBattlegroundInvitationAction.h b/src/Core/Ai/Generic/Actions/AcceptBattlegroundInvitationAction.h
similarity index 100%
rename from src/strategy/actions/AcceptBattlegroundInvitationAction.h
rename to src/Core/Ai/Generic/Actions/AcceptBattlegroundInvitationAction.h
diff --git a/src/strategy/actions/AcceptDuelAction.cpp b/src/Core/Ai/Generic/Actions/AcceptDuelAction.cpp
similarity index 100%
rename from src/strategy/actions/AcceptDuelAction.cpp
rename to src/Core/Ai/Generic/Actions/AcceptDuelAction.cpp
diff --git a/src/strategy/actions/AcceptDuelAction.h b/src/Core/Ai/Generic/Actions/AcceptDuelAction.h
similarity index 100%
rename from src/strategy/actions/AcceptDuelAction.h
rename to src/Core/Ai/Generic/Actions/AcceptDuelAction.h
diff --git a/src/strategy/actions/AcceptInvitationAction.cpp b/src/Core/Ai/Generic/Actions/AcceptInvitationAction.cpp
similarity index 97%
rename from src/strategy/actions/AcceptInvitationAction.cpp
rename to src/Core/Ai/Generic/Actions/AcceptInvitationAction.cpp
index 45861370..5e0bffc4 100644
--- a/src/strategy/actions/AcceptInvitationAction.cpp
+++ b/src/Core/Ai/Generic/Actions/AcceptInvitationAction.cpp
@@ -49,7 +49,7 @@ bool AcceptInvitationAction::Execute(Event event)
     if (sRandomPlayerbotMgr->IsRandomBot(bot))
         botAI->SetMaster(inviter);
     // else
-    // sPlayerbotDbStore->Save(botAI);
+    // sPlayerbotRepository->Save(botAI);
 
     botAI->ResetStrategies();
     botAI->ChangeStrategy("+follow,-lfg,-bg", BOT_STATE_NON_COMBAT);
diff --git a/src/strategy/actions/AcceptInvitationAction.h b/src/Core/Ai/Generic/Actions/AcceptInvitationAction.h
similarity index 100%
rename from src/strategy/actions/AcceptInvitationAction.h
rename to src/Core/Ai/Generic/Actions/AcceptInvitationAction.h
diff --git a/src/strategy/actions/AcceptQuestAction.cpp b/src/Core/Ai/Generic/Actions/AcceptQuestAction.cpp
similarity index 100%
rename from src/strategy/actions/AcceptQuestAction.cpp
rename to src/Core/Ai/Generic/Actions/AcceptQuestAction.cpp
diff --git a/src/strategy/actions/AcceptQuestAction.h b/src/Core/Ai/Generic/Actions/AcceptQuestAction.h
similarity index 100%
rename from src/strategy/actions/AcceptQuestAction.h
rename to src/Core/Ai/Generic/Actions/AcceptQuestAction.h
diff --git a/src/strategy/actions/AcceptResurrectAction.cpp b/src/Core/Ai/Generic/Actions/AcceptResurrectAction.cpp
similarity index 100%
rename from src/strategy/actions/AcceptResurrectAction.cpp
rename to src/Core/Ai/Generic/Actions/AcceptResurrectAction.cpp
diff --git a/src/strategy/actions/AcceptResurrectAction.h b/src/Core/Ai/Generic/Actions/AcceptResurrectAction.h
similarity index 100%
rename from src/strategy/actions/AcceptResurrectAction.h
rename to src/Core/Ai/Generic/Actions/AcceptResurrectAction.h
diff --git a/src/strategy/actions/AddLootAction.cpp b/src/Core/Ai/Generic/Actions/AddLootAction.cpp
similarity index 100%
rename from src/strategy/actions/AddLootAction.cpp
rename to src/Core/Ai/Generic/Actions/AddLootAction.cpp
diff --git a/src/strategy/actions/AddLootAction.h b/src/Core/Ai/Generic/Actions/AddLootAction.h
similarity index 100%
rename from src/strategy/actions/AddLootAction.h
rename to src/Core/Ai/Generic/Actions/AddLootAction.h
diff --git a/src/strategy/actions/AreaTriggerAction.cpp b/src/Core/Ai/Generic/Actions/AreaTriggerAction.cpp
similarity index 100%
rename from src/strategy/actions/AreaTriggerAction.cpp
rename to src/Core/Ai/Generic/Actions/AreaTriggerAction.cpp
diff --git a/src/strategy/actions/AreaTriggerAction.h b/src/Core/Ai/Generic/Actions/AreaTriggerAction.h
similarity index 100%
rename from src/strategy/actions/AreaTriggerAction.h
rename to src/Core/Ai/Generic/Actions/AreaTriggerAction.h
diff --git a/src/strategy/actions/ArenaTeamActions.cpp b/src/Core/Ai/Generic/Actions/ArenaTeamActions.cpp
similarity index 100%
rename from src/strategy/actions/ArenaTeamActions.cpp
rename to src/Core/Ai/Generic/Actions/ArenaTeamActions.cpp
diff --git a/src/strategy/actions/ArenaTeamActions.h b/src/Core/Ai/Generic/Actions/ArenaTeamActions.h
similarity index 100%
rename from src/strategy/actions/ArenaTeamActions.h
rename to src/Core/Ai/Generic/Actions/ArenaTeamActions.h
diff --git a/src/strategy/actions/AttackAction.cpp b/src/Core/Ai/Generic/Actions/AttackAction.cpp
similarity index 100%
rename from src/strategy/actions/AttackAction.cpp
rename to src/Core/Ai/Generic/Actions/AttackAction.cpp
diff --git a/src/strategy/actions/AttackAction.h b/src/Core/Ai/Generic/Actions/AttackAction.h
similarity index 100%
rename from src/strategy/actions/AttackAction.h
rename to src/Core/Ai/Generic/Actions/AttackAction.h
diff --git a/src/strategy/actions/AutoMaintenanceOnLevelupAction.cpp b/src/Core/Ai/Generic/Actions/AutoMaintenanceOnLevelupAction.cpp
similarity index 100%
rename from src/strategy/actions/AutoMaintenanceOnLevelupAction.cpp
rename to src/Core/Ai/Generic/Actions/AutoMaintenanceOnLevelupAction.cpp
diff --git a/src/strategy/actions/AutoMaintenanceOnLevelupAction.h b/src/Core/Ai/Generic/Actions/AutoMaintenanceOnLevelupAction.h
similarity index 100%
rename from src/strategy/actions/AutoMaintenanceOnLevelupAction.h
rename to src/Core/Ai/Generic/Actions/AutoMaintenanceOnLevelupAction.h
diff --git a/src/strategy/actions/BankAction.cpp b/src/Core/Ai/Generic/Actions/BankAction.cpp
similarity index 100%
rename from src/strategy/actions/BankAction.cpp
rename to src/Core/Ai/Generic/Actions/BankAction.cpp
diff --git a/src/strategy/actions/BankAction.h b/src/Core/Ai/Generic/Actions/BankAction.h
similarity index 100%
rename from src/strategy/actions/BankAction.h
rename to src/Core/Ai/Generic/Actions/BankAction.h
diff --git a/src/strategy/actions/BattleGroundJoinAction.cpp b/src/Core/Ai/Generic/Actions/BattleGroundJoinAction.cpp
similarity index 100%
rename from src/strategy/actions/BattleGroundJoinAction.cpp
rename to src/Core/Ai/Generic/Actions/BattleGroundJoinAction.cpp
diff --git a/src/strategy/actions/BattleGroundJoinAction.h b/src/Core/Ai/Generic/Actions/BattleGroundJoinAction.h
similarity index 100%
rename from src/strategy/actions/BattleGroundJoinAction.h
rename to src/Core/Ai/Generic/Actions/BattleGroundJoinAction.h
diff --git a/src/strategy/actions/BattleGroundTactics.cpp b/src/Core/Ai/Generic/Actions/BattleGroundTactics.cpp
similarity index 100%
rename from src/strategy/actions/BattleGroundTactics.cpp
rename to src/Core/Ai/Generic/Actions/BattleGroundTactics.cpp
diff --git a/src/strategy/actions/BattleGroundTactics.h b/src/Core/Ai/Generic/Actions/BattleGroundTactics.h
similarity index 100%
rename from src/strategy/actions/BattleGroundTactics.h
rename to src/Core/Ai/Generic/Actions/BattleGroundTactics.h
diff --git a/src/strategy/actions/BossAuraActions.cpp b/src/Core/Ai/Generic/Actions/BossAuraActions.cpp
similarity index 100%
rename from src/strategy/actions/BossAuraActions.cpp
rename to src/Core/Ai/Generic/Actions/BossAuraActions.cpp
diff --git a/src/strategy/actions/BossAuraActions.h b/src/Core/Ai/Generic/Actions/BossAuraActions.h
similarity index 100%
rename from src/strategy/actions/BossAuraActions.h
rename to src/Core/Ai/Generic/Actions/BossAuraActions.h
diff --git a/src/strategy/actions/BuffAction.cpp b/src/Core/Ai/Generic/Actions/BuffAction.cpp
similarity index 100%
rename from src/strategy/actions/BuffAction.cpp
rename to src/Core/Ai/Generic/Actions/BuffAction.cpp
diff --git a/src/strategy/actions/BuffAction.h b/src/Core/Ai/Generic/Actions/BuffAction.h
similarity index 100%
rename from src/strategy/actions/BuffAction.h
rename to src/Core/Ai/Generic/Actions/BuffAction.h
diff --git a/src/strategy/actions/BuyAction.cpp b/src/Core/Ai/Generic/Actions/BuyAction.cpp
similarity index 100%
rename from src/strategy/actions/BuyAction.cpp
rename to src/Core/Ai/Generic/Actions/BuyAction.cpp
diff --git a/src/strategy/actions/BuyAction.h b/src/Core/Ai/Generic/Actions/BuyAction.h
similarity index 100%
rename from src/strategy/actions/BuyAction.h
rename to src/Core/Ai/Generic/Actions/BuyAction.h
diff --git a/src/strategy/actions/CancelChannelAction.cpp b/src/Core/Ai/Generic/Actions/CancelChannelAction.cpp
similarity index 100%
rename from src/strategy/actions/CancelChannelAction.cpp
rename to src/Core/Ai/Generic/Actions/CancelChannelAction.cpp
diff --git a/src/strategy/actions/CancelChannelAction.h b/src/Core/Ai/Generic/Actions/CancelChannelAction.h
similarity index 100%
rename from src/strategy/actions/CancelChannelAction.h
rename to src/Core/Ai/Generic/Actions/CancelChannelAction.h
diff --git a/src/strategy/actions/CastCustomSpellAction.cpp b/src/Core/Ai/Generic/Actions/CastCustomSpellAction.cpp
similarity index 100%
rename from src/strategy/actions/CastCustomSpellAction.cpp
rename to src/Core/Ai/Generic/Actions/CastCustomSpellAction.cpp
diff --git a/src/strategy/actions/CastCustomSpellAction.h b/src/Core/Ai/Generic/Actions/CastCustomSpellAction.h
similarity index 100%
rename from src/strategy/actions/CastCustomSpellAction.h
rename to src/Core/Ai/Generic/Actions/CastCustomSpellAction.h
diff --git a/src/strategy/actions/ChangeChatAction.cpp b/src/Core/Ai/Generic/Actions/ChangeChatAction.cpp
similarity index 100%
rename from src/strategy/actions/ChangeChatAction.cpp
rename to src/Core/Ai/Generic/Actions/ChangeChatAction.cpp
diff --git a/src/strategy/actions/ChangeChatAction.h b/src/Core/Ai/Generic/Actions/ChangeChatAction.h
similarity index 100%
rename from src/strategy/actions/ChangeChatAction.h
rename to src/Core/Ai/Generic/Actions/ChangeChatAction.h
diff --git a/src/strategy/actions/ChangeStrategyAction.cpp b/src/Core/Ai/Generic/Actions/ChangeStrategyAction.cpp
similarity index 94%
rename from src/strategy/actions/ChangeStrategyAction.cpp
rename to src/Core/Ai/Generic/Actions/ChangeStrategyAction.cpp
index 6d410c0d..d17cd005 100644
--- a/src/strategy/actions/ChangeStrategyAction.cpp
+++ b/src/Core/Ai/Generic/Actions/ChangeStrategyAction.cpp
@@ -6,7 +6,7 @@
 #include "ChangeStrategyAction.h"
 
 #include "Event.h"
-#include "PlayerbotDbStore.h"
+#include "PlayerbotRepository.h"
 #include "Playerbots.h"
 
 bool ChangeCombatStrategyAction::Execute(Event event)
@@ -24,7 +24,7 @@ bool ChangeCombatStrategyAction::Execute(Event event)
                 case '+':
                 case '-':
                 case '~':
-                    sPlayerbotDbStore->Save(botAI);
+                    sPlayerbotRepository->Save(botAI);
                     break;
                 case '?':
                     break;
@@ -62,7 +62,7 @@ bool ChangeNonCombatStrategyAction::Execute(Event event)
                 case '+':
                 case '-':
                 case '~':
-                    sPlayerbotDbStore->Save(botAI);
+                    sPlayerbotRepository->Save(botAI);
                     break;
                 case '?':
                     break;
diff --git a/src/strategy/actions/ChangeStrategyAction.h b/src/Core/Ai/Generic/Actions/ChangeStrategyAction.h
similarity index 100%
rename from src/strategy/actions/ChangeStrategyAction.h
rename to src/Core/Ai/Generic/Actions/ChangeStrategyAction.h
diff --git a/src/strategy/actions/ChangeTalentsAction.cpp b/src/Core/Ai/Generic/Actions/ChangeTalentsAction.cpp
similarity index 100%
rename from src/strategy/actions/ChangeTalentsAction.cpp
rename to src/Core/Ai/Generic/Actions/ChangeTalentsAction.cpp
diff --git a/src/strategy/actions/ChangeTalentsAction.h b/src/Core/Ai/Generic/Actions/ChangeTalentsAction.h
similarity index 100%
rename from src/strategy/actions/ChangeTalentsAction.h
rename to src/Core/Ai/Generic/Actions/ChangeTalentsAction.h
diff --git a/src/strategy/actions/ChatShortcutActions.cpp b/src/Core/Ai/Generic/Actions/ChatShortcutActions.cpp
similarity index 100%
rename from src/strategy/actions/ChatShortcutActions.cpp
rename to src/Core/Ai/Generic/Actions/ChatShortcutActions.cpp
diff --git a/src/strategy/actions/ChatShortcutActions.h b/src/Core/Ai/Generic/Actions/ChatShortcutActions.h
similarity index 100%
rename from src/strategy/actions/ChatShortcutActions.h
rename to src/Core/Ai/Generic/Actions/ChatShortcutActions.h
diff --git a/src/strategy/actions/CheatAction.cpp b/src/Core/Ai/Generic/Actions/CheatAction.cpp
similarity index 100%
rename from src/strategy/actions/CheatAction.cpp
rename to src/Core/Ai/Generic/Actions/CheatAction.cpp
diff --git a/src/strategy/actions/CheatAction.h b/src/Core/Ai/Generic/Actions/CheatAction.h
similarity index 100%
rename from src/strategy/actions/CheatAction.h
rename to src/Core/Ai/Generic/Actions/CheatAction.h
diff --git a/src/strategy/actions/CheckMailAction.cpp b/src/Core/Ai/Generic/Actions/CheckMailAction.cpp
similarity index 100%
rename from src/strategy/actions/CheckMailAction.cpp
rename to src/Core/Ai/Generic/Actions/CheckMailAction.cpp
diff --git a/src/strategy/actions/CheckMailAction.h b/src/Core/Ai/Generic/Actions/CheckMailAction.h
similarity index 100%
rename from src/strategy/actions/CheckMailAction.h
rename to src/Core/Ai/Generic/Actions/CheckMailAction.h
diff --git a/src/strategy/actions/CheckMountStateAction.cpp b/src/Core/Ai/Generic/Actions/CheckMountStateAction.cpp
similarity index 100%
rename from src/strategy/actions/CheckMountStateAction.cpp
rename to src/Core/Ai/Generic/Actions/CheckMountStateAction.cpp
diff --git a/src/strategy/actions/CheckMountStateAction.h b/src/Core/Ai/Generic/Actions/CheckMountStateAction.h
similarity index 100%
rename from src/strategy/actions/CheckMountStateAction.h
rename to src/Core/Ai/Generic/Actions/CheckMountStateAction.h
diff --git a/src/strategy/actions/CheckValuesAction.cpp b/src/Core/Ai/Generic/Actions/CheckValuesAction.cpp
similarity index 100%
rename from src/strategy/actions/CheckValuesAction.cpp
rename to src/Core/Ai/Generic/Actions/CheckValuesAction.cpp
diff --git a/src/strategy/actions/CheckValuesAction.h b/src/Core/Ai/Generic/Actions/CheckValuesAction.h
similarity index 100%
rename from src/strategy/actions/CheckValuesAction.h
rename to src/Core/Ai/Generic/Actions/CheckValuesAction.h
diff --git a/src/strategy/actions/ChooseRpgTargetAction.cpp b/src/Core/Ai/Generic/Actions/ChooseRpgTargetAction.cpp
similarity index 100%
rename from src/strategy/actions/ChooseRpgTargetAction.cpp
rename to src/Core/Ai/Generic/Actions/ChooseRpgTargetAction.cpp
diff --git a/src/strategy/actions/ChooseRpgTargetAction.h b/src/Core/Ai/Generic/Actions/ChooseRpgTargetAction.h
similarity index 100%
rename from src/strategy/actions/ChooseRpgTargetAction.h
rename to src/Core/Ai/Generic/Actions/ChooseRpgTargetAction.h
diff --git a/src/strategy/actions/ChooseTargetActions.cpp b/src/Core/Ai/Generic/Actions/ChooseTargetActions.cpp
similarity index 100%
rename from src/strategy/actions/ChooseTargetActions.cpp
rename to src/Core/Ai/Generic/Actions/ChooseTargetActions.cpp
diff --git a/src/strategy/actions/ChooseTargetActions.h b/src/Core/Ai/Generic/Actions/ChooseTargetActions.h
similarity index 100%
rename from src/strategy/actions/ChooseTargetActions.h
rename to src/Core/Ai/Generic/Actions/ChooseTargetActions.h
diff --git a/src/strategy/actions/ChooseTravelTargetAction.cpp b/src/Core/Ai/Generic/Actions/ChooseTravelTargetAction.cpp
similarity index 100%
rename from src/strategy/actions/ChooseTravelTargetAction.cpp
rename to src/Core/Ai/Generic/Actions/ChooseTravelTargetAction.cpp
diff --git a/src/strategy/actions/ChooseTravelTargetAction.h b/src/Core/Ai/Generic/Actions/ChooseTravelTargetAction.h
similarity index 100%
rename from src/strategy/actions/ChooseTravelTargetAction.h
rename to src/Core/Ai/Generic/Actions/ChooseTravelTargetAction.h
diff --git a/src/strategy/actions/CombatActions.cpp b/src/Core/Ai/Generic/Actions/CombatActions.cpp
similarity index 100%
rename from src/strategy/actions/CombatActions.cpp
rename to src/Core/Ai/Generic/Actions/CombatActions.cpp
diff --git a/src/strategy/actions/CombatActions.h b/src/Core/Ai/Generic/Actions/CombatActions.h
similarity index 100%
rename from src/strategy/actions/CombatActions.h
rename to src/Core/Ai/Generic/Actions/CombatActions.h
diff --git a/src/strategy/actions/CustomStrategyEditAction.cpp b/src/Core/Ai/Generic/Actions/CustomStrategyEditAction.cpp
similarity index 100%
rename from src/strategy/actions/CustomStrategyEditAction.cpp
rename to src/Core/Ai/Generic/Actions/CustomStrategyEditAction.cpp
diff --git a/src/strategy/actions/CustomStrategyEditAction.h b/src/Core/Ai/Generic/Actions/CustomStrategyEditAction.h
similarity index 100%
rename from src/strategy/actions/CustomStrategyEditAction.h
rename to src/Core/Ai/Generic/Actions/CustomStrategyEditAction.h
diff --git a/src/strategy/actions/DebugAction.cpp b/src/Core/Ai/Generic/Actions/DebugAction.cpp
similarity index 100%
rename from src/strategy/actions/DebugAction.cpp
rename to src/Core/Ai/Generic/Actions/DebugAction.cpp
diff --git a/src/strategy/actions/DebugAction.h b/src/Core/Ai/Generic/Actions/DebugAction.h
similarity index 100%
rename from src/strategy/actions/DebugAction.h
rename to src/Core/Ai/Generic/Actions/DebugAction.h
diff --git a/src/strategy/actions/DelayAction.cpp b/src/Core/Ai/Generic/Actions/DelayAction.cpp
similarity index 100%
rename from src/strategy/actions/DelayAction.cpp
rename to src/Core/Ai/Generic/Actions/DelayAction.cpp
diff --git a/src/strategy/actions/DelayAction.h b/src/Core/Ai/Generic/Actions/DelayAction.h
similarity index 100%
rename from src/strategy/actions/DelayAction.h
rename to src/Core/Ai/Generic/Actions/DelayAction.h
diff --git a/src/strategy/actions/DestroyItemAction.cpp b/src/Core/Ai/Generic/Actions/DestroyItemAction.cpp
similarity index 100%
rename from src/strategy/actions/DestroyItemAction.cpp
rename to src/Core/Ai/Generic/Actions/DestroyItemAction.cpp
diff --git a/src/strategy/actions/DestroyItemAction.h b/src/Core/Ai/Generic/Actions/DestroyItemAction.h
similarity index 100%
rename from src/strategy/actions/DestroyItemAction.h
rename to src/Core/Ai/Generic/Actions/DestroyItemAction.h
diff --git a/src/strategy/actions/DropQuestAction.cpp b/src/Core/Ai/Generic/Actions/DropQuestAction.cpp
similarity index 100%
rename from src/strategy/actions/DropQuestAction.cpp
rename to src/Core/Ai/Generic/Actions/DropQuestAction.cpp
diff --git a/src/strategy/actions/DropQuestAction.h b/src/Core/Ai/Generic/Actions/DropQuestAction.h
similarity index 100%
rename from src/strategy/actions/DropQuestAction.h
rename to src/Core/Ai/Generic/Actions/DropQuestAction.h
diff --git a/src/strategy/actions/EmoteAction.cpp b/src/Core/Ai/Generic/Actions/EmoteAction.cpp
similarity index 100%
rename from src/strategy/actions/EmoteAction.cpp
rename to src/Core/Ai/Generic/Actions/EmoteAction.cpp
diff --git a/src/strategy/actions/EmoteAction.h b/src/Core/Ai/Generic/Actions/EmoteAction.h
similarity index 100%
rename from src/strategy/actions/EmoteAction.h
rename to src/Core/Ai/Generic/Actions/EmoteAction.h
diff --git a/src/strategy/actions/EquipAction.cpp b/src/Core/Ai/Generic/Actions/EquipAction.cpp
similarity index 100%
rename from src/strategy/actions/EquipAction.cpp
rename to src/Core/Ai/Generic/Actions/EquipAction.cpp
diff --git a/src/strategy/actions/EquipAction.h b/src/Core/Ai/Generic/Actions/EquipAction.h
similarity index 100%
rename from src/strategy/actions/EquipAction.h
rename to src/Core/Ai/Generic/Actions/EquipAction.h
diff --git a/src/strategy/actions/EquipGlyphsAction.cpp b/src/Core/Ai/Generic/Actions/EquipGlyphsAction.cpp
similarity index 100%
rename from src/strategy/actions/EquipGlyphsAction.cpp
rename to src/Core/Ai/Generic/Actions/EquipGlyphsAction.cpp
diff --git a/src/strategy/actions/EquipGlyphsAction.h b/src/Core/Ai/Generic/Actions/EquipGlyphsAction.h
similarity index 100%
rename from src/strategy/actions/EquipGlyphsAction.h
rename to src/Core/Ai/Generic/Actions/EquipGlyphsAction.h
diff --git a/src/strategy/actions/FishingAction.cpp b/src/Core/Ai/Generic/Actions/FishingAction.cpp
similarity index 100%
rename from src/strategy/actions/FishingAction.cpp
rename to src/Core/Ai/Generic/Actions/FishingAction.cpp
diff --git a/src/strategy/actions/FishingAction.h b/src/Core/Ai/Generic/Actions/FishingAction.h
similarity index 100%
rename from src/strategy/actions/FishingAction.h
rename to src/Core/Ai/Generic/Actions/FishingAction.h
diff --git a/src/strategy/actions/FlagAction.cpp b/src/Core/Ai/Generic/Actions/FlagAction.cpp
similarity index 100%
rename from src/strategy/actions/FlagAction.cpp
rename to src/Core/Ai/Generic/Actions/FlagAction.cpp
diff --git a/src/strategy/actions/FlagAction.h b/src/Core/Ai/Generic/Actions/FlagAction.h
similarity index 100%
rename from src/strategy/actions/FlagAction.h
rename to src/Core/Ai/Generic/Actions/FlagAction.h
diff --git a/src/strategy/actions/FollowActions.cpp b/src/Core/Ai/Generic/Actions/FollowActions.cpp
similarity index 100%
rename from src/strategy/actions/FollowActions.cpp
rename to src/Core/Ai/Generic/Actions/FollowActions.cpp
diff --git a/src/strategy/actions/FollowActions.h b/src/Core/Ai/Generic/Actions/FollowActions.h
similarity index 100%
rename from src/strategy/actions/FollowActions.h
rename to src/Core/Ai/Generic/Actions/FollowActions.h
diff --git a/src/strategy/actions/GenericActions.cpp b/src/Core/Ai/Generic/Actions/GenericActions.cpp
similarity index 100%
rename from src/strategy/actions/GenericActions.cpp
rename to src/Core/Ai/Generic/Actions/GenericActions.cpp
diff --git a/src/strategy/actions/GenericActions.h b/src/Core/Ai/Generic/Actions/GenericActions.h
similarity index 100%
rename from src/strategy/actions/GenericActions.h
rename to src/Core/Ai/Generic/Actions/GenericActions.h
diff --git a/src/strategy/actions/GenericBuffUtils.cpp b/src/Core/Ai/Generic/Actions/GenericBuffUtils.cpp
similarity index 100%
rename from src/strategy/actions/GenericBuffUtils.cpp
rename to src/Core/Ai/Generic/Actions/GenericBuffUtils.cpp
diff --git a/src/strategy/actions/GenericBuffUtils.h b/src/Core/Ai/Generic/Actions/GenericBuffUtils.h
similarity index 100%
rename from src/strategy/actions/GenericBuffUtils.h
rename to src/Core/Ai/Generic/Actions/GenericBuffUtils.h
diff --git a/src/strategy/actions/GenericSpellActions.cpp b/src/Core/Ai/Generic/Actions/GenericSpellActions.cpp
similarity index 100%
rename from src/strategy/actions/GenericSpellActions.cpp
rename to src/Core/Ai/Generic/Actions/GenericSpellActions.cpp
diff --git a/src/strategy/actions/GenericSpellActions.h b/src/Core/Ai/Generic/Actions/GenericSpellActions.h
similarity index 100%
rename from src/strategy/actions/GenericSpellActions.h
rename to src/Core/Ai/Generic/Actions/GenericSpellActions.h
diff --git a/src/strategy/actions/GiveItemAction.cpp b/src/Core/Ai/Generic/Actions/GiveItemAction.cpp
similarity index 100%
rename from src/strategy/actions/GiveItemAction.cpp
rename to src/Core/Ai/Generic/Actions/GiveItemAction.cpp
diff --git a/src/strategy/actions/GiveItemAction.h b/src/Core/Ai/Generic/Actions/GiveItemAction.h
similarity index 100%
rename from src/strategy/actions/GiveItemAction.h
rename to src/Core/Ai/Generic/Actions/GiveItemAction.h
diff --git a/src/strategy/actions/GoAction.cpp b/src/Core/Ai/Generic/Actions/GoAction.cpp
similarity index 100%
rename from src/strategy/actions/GoAction.cpp
rename to src/Core/Ai/Generic/Actions/GoAction.cpp
diff --git a/src/strategy/actions/GoAction.h b/src/Core/Ai/Generic/Actions/GoAction.h
similarity index 100%
rename from src/strategy/actions/GoAction.h
rename to src/Core/Ai/Generic/Actions/GoAction.h
diff --git a/src/strategy/actions/GossipHelloAction.cpp b/src/Core/Ai/Generic/Actions/GossipHelloAction.cpp
similarity index 100%
rename from src/strategy/actions/GossipHelloAction.cpp
rename to src/Core/Ai/Generic/Actions/GossipHelloAction.cpp
diff --git a/src/strategy/actions/GossipHelloAction.h b/src/Core/Ai/Generic/Actions/GossipHelloAction.h
similarity index 100%
rename from src/strategy/actions/GossipHelloAction.h
rename to src/Core/Ai/Generic/Actions/GossipHelloAction.h
diff --git a/src/strategy/actions/GreetAction.cpp b/src/Core/Ai/Generic/Actions/GreetAction.cpp
similarity index 100%
rename from src/strategy/actions/GreetAction.cpp
rename to src/Core/Ai/Generic/Actions/GreetAction.cpp
diff --git a/src/strategy/actions/GreetAction.h b/src/Core/Ai/Generic/Actions/GreetAction.h
similarity index 100%
rename from src/strategy/actions/GreetAction.h
rename to src/Core/Ai/Generic/Actions/GreetAction.h
diff --git a/src/strategy/actions/GuildAcceptAction.cpp b/src/Core/Ai/Generic/Actions/GuildAcceptAction.cpp
similarity index 100%
rename from src/strategy/actions/GuildAcceptAction.cpp
rename to src/Core/Ai/Generic/Actions/GuildAcceptAction.cpp
diff --git a/src/strategy/actions/GuildAcceptAction.h b/src/Core/Ai/Generic/Actions/GuildAcceptAction.h
similarity index 100%
rename from src/strategy/actions/GuildAcceptAction.h
rename to src/Core/Ai/Generic/Actions/GuildAcceptAction.h
diff --git a/src/strategy/actions/GuildBankAction.cpp b/src/Core/Ai/Generic/Actions/GuildBankAction.cpp
similarity index 100%
rename from src/strategy/actions/GuildBankAction.cpp
rename to src/Core/Ai/Generic/Actions/GuildBankAction.cpp
diff --git a/src/strategy/actions/GuildBankAction.h b/src/Core/Ai/Generic/Actions/GuildBankAction.h
similarity index 100%
rename from src/strategy/actions/GuildBankAction.h
rename to src/Core/Ai/Generic/Actions/GuildBankAction.h
diff --git a/src/strategy/actions/GuildCreateActions.cpp b/src/Core/Ai/Generic/Actions/GuildCreateActions.cpp
similarity index 100%
rename from src/strategy/actions/GuildCreateActions.cpp
rename to src/Core/Ai/Generic/Actions/GuildCreateActions.cpp
diff --git a/src/strategy/actions/GuildCreateActions.h b/src/Core/Ai/Generic/Actions/GuildCreateActions.h
similarity index 100%
rename from src/strategy/actions/GuildCreateActions.h
rename to src/Core/Ai/Generic/Actions/GuildCreateActions.h
diff --git a/src/strategy/actions/GuildManagementActions.cpp b/src/Core/Ai/Generic/Actions/GuildManagementActions.cpp
similarity index 100%
rename from src/strategy/actions/GuildManagementActions.cpp
rename to src/Core/Ai/Generic/Actions/GuildManagementActions.cpp
diff --git a/src/strategy/actions/GuildManagementActions.h b/src/Core/Ai/Generic/Actions/GuildManagementActions.h
similarity index 100%
rename from src/strategy/actions/GuildManagementActions.h
rename to src/Core/Ai/Generic/Actions/GuildManagementActions.h
diff --git a/src/strategy/actions/HelpAction.cpp b/src/Core/Ai/Generic/Actions/HelpAction.cpp
similarity index 100%
rename from src/strategy/actions/HelpAction.cpp
rename to src/Core/Ai/Generic/Actions/HelpAction.cpp
diff --git a/src/strategy/actions/HelpAction.h b/src/Core/Ai/Generic/Actions/HelpAction.h
similarity index 100%
rename from src/strategy/actions/HelpAction.h
rename to src/Core/Ai/Generic/Actions/HelpAction.h
diff --git a/src/strategy/actions/HireAction.cpp b/src/Core/Ai/Generic/Actions/HireAction.cpp
similarity index 100%
rename from src/strategy/actions/HireAction.cpp
rename to src/Core/Ai/Generic/Actions/HireAction.cpp
diff --git a/src/strategy/actions/HireAction.h b/src/Core/Ai/Generic/Actions/HireAction.h
similarity index 100%
rename from src/strategy/actions/HireAction.h
rename to src/Core/Ai/Generic/Actions/HireAction.h
diff --git a/src/strategy/actions/ImbueAction.cpp b/src/Core/Ai/Generic/Actions/ImbueAction.cpp
similarity index 100%
rename from src/strategy/actions/ImbueAction.cpp
rename to src/Core/Ai/Generic/Actions/ImbueAction.cpp
diff --git a/src/strategy/actions/ImbueAction.h b/src/Core/Ai/Generic/Actions/ImbueAction.h
similarity index 100%
rename from src/strategy/actions/ImbueAction.h
rename to src/Core/Ai/Generic/Actions/ImbueAction.h
diff --git a/src/strategy/actions/InventoryAction.cpp b/src/Core/Ai/Generic/Actions/InventoryAction.cpp
similarity index 100%
rename from src/strategy/actions/InventoryAction.cpp
rename to src/Core/Ai/Generic/Actions/InventoryAction.cpp
diff --git a/src/strategy/actions/InventoryAction.h b/src/Core/Ai/Generic/Actions/InventoryAction.h
similarity index 100%
rename from src/strategy/actions/InventoryAction.h
rename to src/Core/Ai/Generic/Actions/InventoryAction.h
diff --git a/src/strategy/actions/InventoryChangeFailureAction.cpp b/src/Core/Ai/Generic/Actions/InventoryChangeFailureAction.cpp
similarity index 100%
rename from src/strategy/actions/InventoryChangeFailureAction.cpp
rename to src/Core/Ai/Generic/Actions/InventoryChangeFailureAction.cpp
diff --git a/src/strategy/actions/InventoryChangeFailureAction.h b/src/Core/Ai/Generic/Actions/InventoryChangeFailureAction.h
similarity index 100%
rename from src/strategy/actions/InventoryChangeFailureAction.h
rename to src/Core/Ai/Generic/Actions/InventoryChangeFailureAction.h
diff --git a/src/strategy/actions/InviteToGroupAction.cpp b/src/Core/Ai/Generic/Actions/InviteToGroupAction.cpp
similarity index 100%
rename from src/strategy/actions/InviteToGroupAction.cpp
rename to src/Core/Ai/Generic/Actions/InviteToGroupAction.cpp
diff --git a/src/strategy/actions/InviteToGroupAction.h b/src/Core/Ai/Generic/Actions/InviteToGroupAction.h
similarity index 100%
rename from src/strategy/actions/InviteToGroupAction.h
rename to src/Core/Ai/Generic/Actions/InviteToGroupAction.h
diff --git a/src/strategy/actions/LeaveGroupAction.cpp b/src/Core/Ai/Generic/Actions/LeaveGroupAction.cpp
similarity index 100%
rename from src/strategy/actions/LeaveGroupAction.cpp
rename to src/Core/Ai/Generic/Actions/LeaveGroupAction.cpp
diff --git a/src/strategy/actions/LeaveGroupAction.h b/src/Core/Ai/Generic/Actions/LeaveGroupAction.h
similarity index 100%
rename from src/strategy/actions/LeaveGroupAction.h
rename to src/Core/Ai/Generic/Actions/LeaveGroupAction.h
diff --git a/src/strategy/actions/LfgActions.cpp b/src/Core/Ai/Generic/Actions/LfgActions.cpp
similarity index 100%
rename from src/strategy/actions/LfgActions.cpp
rename to src/Core/Ai/Generic/Actions/LfgActions.cpp
diff --git a/src/strategy/actions/LfgActions.h b/src/Core/Ai/Generic/Actions/LfgActions.h
similarity index 100%
rename from src/strategy/actions/LfgActions.h
rename to src/Core/Ai/Generic/Actions/LfgActions.h
diff --git a/src/strategy/actions/ListQuestsActions.cpp b/src/Core/Ai/Generic/Actions/ListQuestsActions.cpp
similarity index 100%
rename from src/strategy/actions/ListQuestsActions.cpp
rename to src/Core/Ai/Generic/Actions/ListQuestsActions.cpp
diff --git a/src/strategy/actions/ListQuestsActions.h b/src/Core/Ai/Generic/Actions/ListQuestsActions.h
similarity index 100%
rename from src/strategy/actions/ListQuestsActions.h
rename to src/Core/Ai/Generic/Actions/ListQuestsActions.h
diff --git a/src/strategy/actions/ListSpellsAction.cpp b/src/Core/Ai/Generic/Actions/ListSpellsAction.cpp
similarity index 98%
rename from src/strategy/actions/ListSpellsAction.cpp
rename to src/Core/Ai/Generic/Actions/ListSpellsAction.cpp
index 6d774115..6f67aef1 100644
--- a/src/strategy/actions/ListSpellsAction.cpp
+++ b/src/Core/Ai/Generic/Actions/ListSpellsAction.cpp
@@ -7,7 +7,7 @@
 
 #include "Event.h"
 #include "Playerbots.h"
-#include "PlayerbotSpellCache.h"
+#include "PlayerbotSpellRepository.h"
 
 using SpellListEntry = std::pair<uint32, std::string>;
 
@@ -136,7 +136,7 @@ std::vector<std::pair<uint32, std::string>> ListSpellsAction::GetSpellList(std::
         if (spellInfo->IsPassive())
             continue;
 
-        SkillLineAbilityEntry const* skillLine = sPlayerbotSpellCache->GetSkillLine(itr->first);
+        SkillLineAbilityEntry const* skillLine = sPlayerbotSpellRepository->GetSkillLine(itr->first);
         if (skill != SKILL_NONE && (!skillLine || skillLine->SkillLine != skill))
             continue;
 
@@ -175,7 +175,7 @@ std::vector<std::pair<uint32, std::string>> ListSpellsAction::GetSpellList(std::
 
                     FindItemByIdVisitor visitor(itemid);
                     uint32 reagentsInInventory = InventoryAction::GetItemCount(&visitor);
-                    bool buyable = sPlayerbotSpellCache->IsItemBuyable(itemid);
+                    bool buyable = sPlayerbotSpellRepository->IsItemBuyable(itemid);
                     if (!buyable)
                     {
                         uint32 craftable = reagentsInInventory / reagentsRequired;
diff --git a/src/strategy/actions/ListSpellsAction.h b/src/Core/Ai/Generic/Actions/ListSpellsAction.h
similarity index 100%
rename from src/strategy/actions/ListSpellsAction.h
rename to src/Core/Ai/Generic/Actions/ListSpellsAction.h
diff --git a/src/strategy/actions/LogLevelAction.cpp b/src/Core/Ai/Generic/Actions/LogLevelAction.cpp
similarity index 100%
rename from src/strategy/actions/LogLevelAction.cpp
rename to src/Core/Ai/Generic/Actions/LogLevelAction.cpp
diff --git a/src/strategy/actions/LogLevelAction.h b/src/Core/Ai/Generic/Actions/LogLevelAction.h
similarity index 100%
rename from src/strategy/actions/LogLevelAction.h
rename to src/Core/Ai/Generic/Actions/LogLevelAction.h
diff --git a/src/strategy/actions/LootAction.cpp b/src/Core/Ai/Generic/Actions/LootAction.cpp
similarity index 100%
rename from src/strategy/actions/LootAction.cpp
rename to src/Core/Ai/Generic/Actions/LootAction.cpp
diff --git a/src/strategy/actions/LootAction.h b/src/Core/Ai/Generic/Actions/LootAction.h
similarity index 100%
rename from src/strategy/actions/LootAction.h
rename to src/Core/Ai/Generic/Actions/LootAction.h
diff --git a/src/strategy/actions/LootRollAction.cpp b/src/Core/Ai/Generic/Actions/LootRollAction.cpp
similarity index 100%
rename from src/strategy/actions/LootRollAction.cpp
rename to src/Core/Ai/Generic/Actions/LootRollAction.cpp
diff --git a/src/strategy/actions/LootRollAction.h b/src/Core/Ai/Generic/Actions/LootRollAction.h
similarity index 100%
rename from src/strategy/actions/LootRollAction.h
rename to src/Core/Ai/Generic/Actions/LootRollAction.h
diff --git a/src/strategy/actions/LootStrategyAction.cpp b/src/Core/Ai/Generic/Actions/LootStrategyAction.cpp
similarity index 100%
rename from src/strategy/actions/LootStrategyAction.cpp
rename to src/Core/Ai/Generic/Actions/LootStrategyAction.cpp
diff --git a/src/strategy/actions/LootStrategyAction.h b/src/Core/Ai/Generic/Actions/LootStrategyAction.h
similarity index 100%
rename from src/strategy/actions/LootStrategyAction.h
rename to src/Core/Ai/Generic/Actions/LootStrategyAction.h
diff --git a/src/strategy/actions/MailAction.cpp b/src/Core/Ai/Generic/Actions/MailAction.cpp
similarity index 100%
rename from src/strategy/actions/MailAction.cpp
rename to src/Core/Ai/Generic/Actions/MailAction.cpp
diff --git a/src/strategy/actions/MailAction.h b/src/Core/Ai/Generic/Actions/MailAction.h
similarity index 100%
rename from src/strategy/actions/MailAction.h
rename to src/Core/Ai/Generic/Actions/MailAction.h
diff --git a/src/strategy/actions/MoveToRpgTargetAction.cpp b/src/Core/Ai/Generic/Actions/MoveToRpgTargetAction.cpp
similarity index 100%
rename from src/strategy/actions/MoveToRpgTargetAction.cpp
rename to src/Core/Ai/Generic/Actions/MoveToRpgTargetAction.cpp
diff --git a/src/strategy/actions/MoveToRpgTargetAction.h b/src/Core/Ai/Generic/Actions/MoveToRpgTargetAction.h
similarity index 100%
rename from src/strategy/actions/MoveToRpgTargetAction.h
rename to src/Core/Ai/Generic/Actions/MoveToRpgTargetAction.h
diff --git a/src/strategy/actions/MoveToTravelTargetAction.cpp b/src/Core/Ai/Generic/Actions/MoveToTravelTargetAction.cpp
similarity index 100%
rename from src/strategy/actions/MoveToTravelTargetAction.cpp
rename to src/Core/Ai/Generic/Actions/MoveToTravelTargetAction.cpp
diff --git a/src/strategy/actions/MoveToTravelTargetAction.h b/src/Core/Ai/Generic/Actions/MoveToTravelTargetAction.h
similarity index 100%
rename from src/strategy/actions/MoveToTravelTargetAction.h
rename to src/Core/Ai/Generic/Actions/MoveToTravelTargetAction.h
diff --git a/src/strategy/actions/MovementActions.cpp b/src/Core/Ai/Generic/Actions/MovementActions.cpp
similarity index 100%
rename from src/strategy/actions/MovementActions.cpp
rename to src/Core/Ai/Generic/Actions/MovementActions.cpp
diff --git a/src/strategy/actions/MovementActions.h b/src/Core/Ai/Generic/Actions/MovementActions.h
similarity index 100%
rename from src/strategy/actions/MovementActions.h
rename to src/Core/Ai/Generic/Actions/MovementActions.h
diff --git a/src/strategy/actions/NonCombatActions.cpp b/src/Core/Ai/Generic/Actions/NonCombatActions.cpp
similarity index 100%
rename from src/strategy/actions/NonCombatActions.cpp
rename to src/Core/Ai/Generic/Actions/NonCombatActions.cpp
diff --git a/src/strategy/actions/NonCombatActions.h b/src/Core/Ai/Generic/Actions/NonCombatActions.h
similarity index 100%
rename from src/strategy/actions/NonCombatActions.h
rename to src/Core/Ai/Generic/Actions/NonCombatActions.h
diff --git a/src/strategy/actions/OpenItemAction.cpp b/src/Core/Ai/Generic/Actions/OpenItemAction.cpp
similarity index 100%
rename from src/strategy/actions/OpenItemAction.cpp
rename to src/Core/Ai/Generic/Actions/OpenItemAction.cpp
diff --git a/src/strategy/actions/OpenItemAction.h b/src/Core/Ai/Generic/Actions/OpenItemAction.h
similarity index 100%
rename from src/strategy/actions/OpenItemAction.h
rename to src/Core/Ai/Generic/Actions/OpenItemAction.h
diff --git a/src/strategy/actions/OutfitAction.cpp b/src/Core/Ai/Generic/Actions/OutfitAction.cpp
similarity index 100%
rename from src/strategy/actions/OutfitAction.cpp
rename to src/Core/Ai/Generic/Actions/OutfitAction.cpp
diff --git a/src/strategy/actions/OutfitAction.h b/src/Core/Ai/Generic/Actions/OutfitAction.h
similarity index 100%
rename from src/strategy/actions/OutfitAction.h
rename to src/Core/Ai/Generic/Actions/OutfitAction.h
diff --git a/src/strategy/actions/PassLeadershipToMasterAction.cpp b/src/Core/Ai/Generic/Actions/PassLeadershipToMasterAction.cpp
similarity index 100%
rename from src/strategy/actions/PassLeadershipToMasterAction.cpp
rename to src/Core/Ai/Generic/Actions/PassLeadershipToMasterAction.cpp
diff --git a/src/strategy/actions/PassLeadershipToMasterAction.h b/src/Core/Ai/Generic/Actions/PassLeadershipToMasterAction.h
similarity index 100%
rename from src/strategy/actions/PassLeadershipToMasterAction.h
rename to src/Core/Ai/Generic/Actions/PassLeadershipToMasterAction.h
diff --git a/src/strategy/actions/PetitionSignAction.cpp b/src/Core/Ai/Generic/Actions/PetitionSignAction.cpp
similarity index 100%
rename from src/strategy/actions/PetitionSignAction.cpp
rename to src/Core/Ai/Generic/Actions/PetitionSignAction.cpp
diff --git a/src/strategy/actions/PetitionSignAction.h b/src/Core/Ai/Generic/Actions/PetitionSignAction.h
similarity index 100%
rename from src/strategy/actions/PetitionSignAction.h
rename to src/Core/Ai/Generic/Actions/PetitionSignAction.h
diff --git a/src/strategy/actions/PetsAction.cpp b/src/Core/Ai/Generic/Actions/PetsAction.cpp
similarity index 100%
rename from src/strategy/actions/PetsAction.cpp
rename to src/Core/Ai/Generic/Actions/PetsAction.cpp
diff --git a/src/strategy/actions/PetsAction.h b/src/Core/Ai/Generic/Actions/PetsAction.h
similarity index 100%
rename from src/strategy/actions/PetsAction.h
rename to src/Core/Ai/Generic/Actions/PetsAction.h
diff --git a/src/strategy/actions/PositionAction.cpp b/src/Core/Ai/Generic/Actions/PositionAction.cpp
similarity index 100%
rename from src/strategy/actions/PositionAction.cpp
rename to src/Core/Ai/Generic/Actions/PositionAction.cpp
diff --git a/src/strategy/actions/PositionAction.h b/src/Core/Ai/Generic/Actions/PositionAction.h
similarity index 100%
rename from src/strategy/actions/PositionAction.h
rename to src/Core/Ai/Generic/Actions/PositionAction.h
diff --git a/src/strategy/actions/QueryItemUsageAction.cpp b/src/Core/Ai/Generic/Actions/QueryItemUsageAction.cpp
similarity index 100%
rename from src/strategy/actions/QueryItemUsageAction.cpp
rename to src/Core/Ai/Generic/Actions/QueryItemUsageAction.cpp
diff --git a/src/strategy/actions/QueryItemUsageAction.h b/src/Core/Ai/Generic/Actions/QueryItemUsageAction.h
similarity index 100%
rename from src/strategy/actions/QueryItemUsageAction.h
rename to src/Core/Ai/Generic/Actions/QueryItemUsageAction.h
diff --git a/src/strategy/actions/QueryQuestAction.cpp b/src/Core/Ai/Generic/Actions/QueryQuestAction.cpp
similarity index 100%
rename from src/strategy/actions/QueryQuestAction.cpp
rename to src/Core/Ai/Generic/Actions/QueryQuestAction.cpp
diff --git a/src/strategy/actions/QueryQuestAction.h b/src/Core/Ai/Generic/Actions/QueryQuestAction.h
similarity index 100%
rename from src/strategy/actions/QueryQuestAction.h
rename to src/Core/Ai/Generic/Actions/QueryQuestAction.h
diff --git a/src/strategy/actions/QuestAction.cpp b/src/Core/Ai/Generic/Actions/QuestAction.cpp
similarity index 100%
rename from src/strategy/actions/QuestAction.cpp
rename to src/Core/Ai/Generic/Actions/QuestAction.cpp
diff --git a/src/strategy/actions/QuestAction.h b/src/Core/Ai/Generic/Actions/QuestAction.h
similarity index 100%
rename from src/strategy/actions/QuestAction.h
rename to src/Core/Ai/Generic/Actions/QuestAction.h
diff --git a/src/strategy/actions/QuestConfirmAcceptAction.cpp b/src/Core/Ai/Generic/Actions/QuestConfirmAcceptAction.cpp
similarity index 100%
rename from src/strategy/actions/QuestConfirmAcceptAction.cpp
rename to src/Core/Ai/Generic/Actions/QuestConfirmAcceptAction.cpp
diff --git a/src/strategy/actions/QuestConfirmAcceptAction.h b/src/Core/Ai/Generic/Actions/QuestConfirmAcceptAction.h
similarity index 100%
rename from src/strategy/actions/QuestConfirmAcceptAction.h
rename to src/Core/Ai/Generic/Actions/QuestConfirmAcceptAction.h
diff --git a/src/strategy/actions/RandomBotUpdateAction.cpp b/src/Core/Ai/Generic/Actions/RandomBotUpdateAction.cpp
similarity index 100%
rename from src/strategy/actions/RandomBotUpdateAction.cpp
rename to src/Core/Ai/Generic/Actions/RandomBotUpdateAction.cpp
diff --git a/src/strategy/actions/RandomBotUpdateAction.h b/src/Core/Ai/Generic/Actions/RandomBotUpdateAction.h
similarity index 100%
rename from src/strategy/actions/RandomBotUpdateAction.h
rename to src/Core/Ai/Generic/Actions/RandomBotUpdateAction.h
diff --git a/src/strategy/actions/RangeAction.cpp b/src/Core/Ai/Generic/Actions/RangeAction.cpp
similarity index 100%
rename from src/strategy/actions/RangeAction.cpp
rename to src/Core/Ai/Generic/Actions/RangeAction.cpp
diff --git a/src/strategy/actions/RangeAction.h b/src/Core/Ai/Generic/Actions/RangeAction.h
similarity index 100%
rename from src/strategy/actions/RangeAction.h
rename to src/Core/Ai/Generic/Actions/RangeAction.h
diff --git a/src/strategy/actions/ReachTargetActions.cpp b/src/Core/Ai/Generic/Actions/ReachTargetActions.cpp
similarity index 100%
rename from src/strategy/actions/ReachTargetActions.cpp
rename to src/Core/Ai/Generic/Actions/ReachTargetActions.cpp
diff --git a/src/strategy/actions/ReachTargetActions.h b/src/Core/Ai/Generic/Actions/ReachTargetActions.h
similarity index 100%
rename from src/strategy/actions/ReachTargetActions.h
rename to src/Core/Ai/Generic/Actions/ReachTargetActions.h
diff --git a/src/strategy/actions/ReadyCheckAction.cpp b/src/Core/Ai/Generic/Actions/ReadyCheckAction.cpp
similarity index 100%
rename from src/strategy/actions/ReadyCheckAction.cpp
rename to src/Core/Ai/Generic/Actions/ReadyCheckAction.cpp
diff --git a/src/strategy/actions/ReadyCheckAction.h b/src/Core/Ai/Generic/Actions/ReadyCheckAction.h
similarity index 100%
rename from src/strategy/actions/ReadyCheckAction.h
rename to src/Core/Ai/Generic/Actions/ReadyCheckAction.h
diff --git a/src/strategy/actions/ReleaseSpiritAction.cpp b/src/Core/Ai/Generic/Actions/ReleaseSpiritAction.cpp
similarity index 100%
rename from src/strategy/actions/ReleaseSpiritAction.cpp
rename to src/Core/Ai/Generic/Actions/ReleaseSpiritAction.cpp
diff --git a/src/strategy/actions/ReleaseSpiritAction.h b/src/Core/Ai/Generic/Actions/ReleaseSpiritAction.h
similarity index 100%
rename from src/strategy/actions/ReleaseSpiritAction.h
rename to src/Core/Ai/Generic/Actions/ReleaseSpiritAction.h
diff --git a/src/strategy/actions/RememberTaxiAction.cpp b/src/Core/Ai/Generic/Actions/RememberTaxiAction.cpp
similarity index 100%
rename from src/strategy/actions/RememberTaxiAction.cpp
rename to src/Core/Ai/Generic/Actions/RememberTaxiAction.cpp
diff --git a/src/strategy/actions/RememberTaxiAction.h b/src/Core/Ai/Generic/Actions/RememberTaxiAction.h
similarity index 100%
rename from src/strategy/actions/RememberTaxiAction.h
rename to src/Core/Ai/Generic/Actions/RememberTaxiAction.h
diff --git a/src/strategy/actions/RemoveAuraAction.cpp b/src/Core/Ai/Generic/Actions/RemoveAuraAction.cpp
similarity index 100%
rename from src/strategy/actions/RemoveAuraAction.cpp
rename to src/Core/Ai/Generic/Actions/RemoveAuraAction.cpp
diff --git a/src/strategy/actions/RemoveAuraAction.h b/src/Core/Ai/Generic/Actions/RemoveAuraAction.h
similarity index 100%
rename from src/strategy/actions/RemoveAuraAction.h
rename to src/Core/Ai/Generic/Actions/RemoveAuraAction.h
diff --git a/src/strategy/actions/RepairAllAction.cpp b/src/Core/Ai/Generic/Actions/RepairAllAction.cpp
similarity index 100%
rename from src/strategy/actions/RepairAllAction.cpp
rename to src/Core/Ai/Generic/Actions/RepairAllAction.cpp
diff --git a/src/strategy/actions/RepairAllAction.h b/src/Core/Ai/Generic/Actions/RepairAllAction.h
similarity index 100%
rename from src/strategy/actions/RepairAllAction.h
rename to src/Core/Ai/Generic/Actions/RepairAllAction.h
diff --git a/src/strategy/actions/ResetAiAction.cpp b/src/Core/Ai/Generic/Actions/ResetAiAction.cpp
similarity index 94%
rename from src/strategy/actions/ResetAiAction.cpp
rename to src/Core/Ai/Generic/Actions/ResetAiAction.cpp
index e97d0905..3df6bbcd 100644
--- a/src/strategy/actions/ResetAiAction.cpp
+++ b/src/Core/Ai/Generic/Actions/ResetAiAction.cpp
@@ -8,7 +8,7 @@
 #include "Event.h"
 #include "Group.h"
 #include "ObjectGuid.h"
-#include "PlayerbotDbStore.h"
+#include "PlayerbotRepository.h"
 #include "Playerbots.h"
 #include "WorldPacket.h"
 
@@ -44,7 +44,7 @@ bool ResetAiAction::Execute(Event event)
             }
         }
     }
-    sPlayerbotDbStore->Reset(botAI);
+    sPlayerbotRepository->Reset(botAI);
     botAI->ResetStrategies(false);
     botAI->TellMaster("AI was reset to defaults");
     return true;
diff --git a/src/strategy/actions/ResetAiAction.h b/src/Core/Ai/Generic/Actions/ResetAiAction.h
similarity index 100%
rename from src/strategy/actions/ResetAiAction.h
rename to src/Core/Ai/Generic/Actions/ResetAiAction.h
diff --git a/src/strategy/actions/ResetInstancesAction.cpp b/src/Core/Ai/Generic/Actions/ResetInstancesAction.cpp
similarity index 100%
rename from src/strategy/actions/ResetInstancesAction.cpp
rename to src/Core/Ai/Generic/Actions/ResetInstancesAction.cpp
diff --git a/src/strategy/actions/ResetInstancesAction.h b/src/Core/Ai/Generic/Actions/ResetInstancesAction.h
similarity index 100%
rename from src/strategy/actions/ResetInstancesAction.h
rename to src/Core/Ai/Generic/Actions/ResetInstancesAction.h
diff --git a/src/strategy/actions/RevealGatheringItemAction.cpp b/src/Core/Ai/Generic/Actions/RevealGatheringItemAction.cpp
similarity index 100%
rename from src/strategy/actions/RevealGatheringItemAction.cpp
rename to src/Core/Ai/Generic/Actions/RevealGatheringItemAction.cpp
diff --git a/src/strategy/actions/RevealGatheringItemAction.h b/src/Core/Ai/Generic/Actions/RevealGatheringItemAction.h
similarity index 100%
rename from src/strategy/actions/RevealGatheringItemAction.h
rename to src/Core/Ai/Generic/Actions/RevealGatheringItemAction.h
diff --git a/src/strategy/actions/ReviveFromCorpseAction.cpp b/src/Core/Ai/Generic/Actions/ReviveFromCorpseAction.cpp
similarity index 100%
rename from src/strategy/actions/ReviveFromCorpseAction.cpp
rename to src/Core/Ai/Generic/Actions/ReviveFromCorpseAction.cpp
diff --git a/src/strategy/actions/ReviveFromCorpseAction.h b/src/Core/Ai/Generic/Actions/ReviveFromCorpseAction.h
similarity index 100%
rename from src/strategy/actions/ReviveFromCorpseAction.h
rename to src/Core/Ai/Generic/Actions/ReviveFromCorpseAction.h
diff --git a/src/strategy/actions/RewardAction.cpp b/src/Core/Ai/Generic/Actions/RewardAction.cpp
similarity index 100%
rename from src/strategy/actions/RewardAction.cpp
rename to src/Core/Ai/Generic/Actions/RewardAction.cpp
diff --git a/src/strategy/actions/RewardAction.h b/src/Core/Ai/Generic/Actions/RewardAction.h
similarity index 100%
rename from src/strategy/actions/RewardAction.h
rename to src/Core/Ai/Generic/Actions/RewardAction.h
diff --git a/src/strategy/actions/RpgAction.cpp b/src/Core/Ai/Generic/Actions/RpgAction.cpp
similarity index 100%
rename from src/strategy/actions/RpgAction.cpp
rename to src/Core/Ai/Generic/Actions/RpgAction.cpp
diff --git a/src/strategy/actions/RpgAction.h b/src/Core/Ai/Generic/Actions/RpgAction.h
similarity index 100%
rename from src/strategy/actions/RpgAction.h
rename to src/Core/Ai/Generic/Actions/RpgAction.h
diff --git a/src/strategy/actions/RpgSubActions.cpp b/src/Core/Ai/Generic/Actions/RpgSubActions.cpp
similarity index 100%
rename from src/strategy/actions/RpgSubActions.cpp
rename to src/Core/Ai/Generic/Actions/RpgSubActions.cpp
diff --git a/src/strategy/actions/RpgSubActions.h b/src/Core/Ai/Generic/Actions/RpgSubActions.h
similarity index 100%
rename from src/strategy/actions/RpgSubActions.h
rename to src/Core/Ai/Generic/Actions/RpgSubActions.h
diff --git a/src/strategy/actions/RpgValues.h b/src/Core/Ai/Generic/Actions/RpgValues.h
similarity index 100%
rename from src/strategy/actions/RpgValues.h
rename to src/Core/Ai/Generic/Actions/RpgValues.h
diff --git a/src/strategy/actions/RtiAction.cpp b/src/Core/Ai/Generic/Actions/RtiAction.cpp
similarity index 100%
rename from src/strategy/actions/RtiAction.cpp
rename to src/Core/Ai/Generic/Actions/RtiAction.cpp
diff --git a/src/strategy/actions/RtiAction.h b/src/Core/Ai/Generic/Actions/RtiAction.h
similarity index 100%
rename from src/strategy/actions/RtiAction.h
rename to src/Core/Ai/Generic/Actions/RtiAction.h
diff --git a/src/strategy/actions/RtscAction.cpp b/src/Core/Ai/Generic/Actions/RtscAction.cpp
similarity index 100%
rename from src/strategy/actions/RtscAction.cpp
rename to src/Core/Ai/Generic/Actions/RtscAction.cpp
diff --git a/src/strategy/actions/RtscAction.h b/src/Core/Ai/Generic/Actions/RtscAction.h
similarity index 100%
rename from src/strategy/actions/RtscAction.h
rename to src/Core/Ai/Generic/Actions/RtscAction.h
diff --git a/src/strategy/actions/SaveManaAction.cpp b/src/Core/Ai/Generic/Actions/SaveManaAction.cpp
similarity index 100%
rename from src/strategy/actions/SaveManaAction.cpp
rename to src/Core/Ai/Generic/Actions/SaveManaAction.cpp
diff --git a/src/strategy/actions/SaveManaAction.h b/src/Core/Ai/Generic/Actions/SaveManaAction.h
similarity index 100%
rename from src/strategy/actions/SaveManaAction.h
rename to src/Core/Ai/Generic/Actions/SaveManaAction.h
diff --git a/src/strategy/actions/SayAction.cpp b/src/Core/Ai/Generic/Actions/SayAction.cpp
similarity index 100%
rename from src/strategy/actions/SayAction.cpp
rename to src/Core/Ai/Generic/Actions/SayAction.cpp
diff --git a/src/strategy/actions/SayAction.h b/src/Core/Ai/Generic/Actions/SayAction.h
similarity index 100%
rename from src/strategy/actions/SayAction.h
rename to src/Core/Ai/Generic/Actions/SayAction.h
diff --git a/src/strategy/actions/SecurityCheckAction.cpp b/src/Core/Ai/Generic/Actions/SecurityCheckAction.cpp
similarity index 100%
rename from src/strategy/actions/SecurityCheckAction.cpp
rename to src/Core/Ai/Generic/Actions/SecurityCheckAction.cpp
diff --git a/src/strategy/actions/SecurityCheckAction.h b/src/Core/Ai/Generic/Actions/SecurityCheckAction.h
similarity index 100%
rename from src/strategy/actions/SecurityCheckAction.h
rename to src/Core/Ai/Generic/Actions/SecurityCheckAction.h
diff --git a/src/strategy/actions/SeeSpellAction.cpp b/src/Core/Ai/Generic/Actions/SeeSpellAction.cpp
similarity index 100%
rename from src/strategy/actions/SeeSpellAction.cpp
rename to src/Core/Ai/Generic/Actions/SeeSpellAction.cpp
diff --git a/src/strategy/actions/SeeSpellAction.h b/src/Core/Ai/Generic/Actions/SeeSpellAction.h
similarity index 100%
rename from src/strategy/actions/SeeSpellAction.h
rename to src/Core/Ai/Generic/Actions/SeeSpellAction.h
diff --git a/src/strategy/actions/SellAction.cpp b/src/Core/Ai/Generic/Actions/SellAction.cpp
similarity index 100%
rename from src/strategy/actions/SellAction.cpp
rename to src/Core/Ai/Generic/Actions/SellAction.cpp
diff --git a/src/strategy/actions/SellAction.h b/src/Core/Ai/Generic/Actions/SellAction.h
similarity index 100%
rename from src/strategy/actions/SellAction.h
rename to src/Core/Ai/Generic/Actions/SellAction.h
diff --git a/src/strategy/actions/SendMailAction.cpp b/src/Core/Ai/Generic/Actions/SendMailAction.cpp
similarity index 100%
rename from src/strategy/actions/SendMailAction.cpp
rename to src/Core/Ai/Generic/Actions/SendMailAction.cpp
diff --git a/src/strategy/actions/SendMailAction.h b/src/Core/Ai/Generic/Actions/SendMailAction.h
similarity index 100%
rename from src/strategy/actions/SendMailAction.h
rename to src/Core/Ai/Generic/Actions/SendMailAction.h
diff --git a/src/strategy/actions/SetCraftAction.cpp b/src/Core/Ai/Generic/Actions/SetCraftAction.cpp
similarity index 100%
rename from src/strategy/actions/SetCraftAction.cpp
rename to src/Core/Ai/Generic/Actions/SetCraftAction.cpp
diff --git a/src/strategy/actions/SetCraftAction.h b/src/Core/Ai/Generic/Actions/SetCraftAction.h
similarity index 100%
rename from src/strategy/actions/SetCraftAction.h
rename to src/Core/Ai/Generic/Actions/SetCraftAction.h
diff --git a/src/strategy/actions/SetHomeAction.cpp b/src/Core/Ai/Generic/Actions/SetHomeAction.cpp
similarity index 100%
rename from src/strategy/actions/SetHomeAction.cpp
rename to src/Core/Ai/Generic/Actions/SetHomeAction.cpp
diff --git a/src/strategy/actions/SetHomeAction.h b/src/Core/Ai/Generic/Actions/SetHomeAction.h
similarity index 100%
rename from src/strategy/actions/SetHomeAction.h
rename to src/Core/Ai/Generic/Actions/SetHomeAction.h
diff --git a/src/strategy/actions/ShareQuestAction.cpp b/src/Core/Ai/Generic/Actions/ShareQuestAction.cpp
similarity index 100%
rename from src/strategy/actions/ShareQuestAction.cpp
rename to src/Core/Ai/Generic/Actions/ShareQuestAction.cpp
diff --git a/src/strategy/actions/ShareQuestAction.h b/src/Core/Ai/Generic/Actions/ShareQuestAction.h
similarity index 100%
rename from src/strategy/actions/ShareQuestAction.h
rename to src/Core/Ai/Generic/Actions/ShareQuestAction.h
diff --git a/src/strategy/actions/SkipSpellsListAction.cpp b/src/Core/Ai/Generic/Actions/SkipSpellsListAction.cpp
similarity index 100%
rename from src/strategy/actions/SkipSpellsListAction.cpp
rename to src/Core/Ai/Generic/Actions/SkipSpellsListAction.cpp
diff --git a/src/strategy/actions/SkipSpellsListAction.h b/src/Core/Ai/Generic/Actions/SkipSpellsListAction.h
similarity index 100%
rename from src/strategy/actions/SkipSpellsListAction.h
rename to src/Core/Ai/Generic/Actions/SkipSpellsListAction.h
diff --git a/src/strategy/actions/StatsAction.cpp b/src/Core/Ai/Generic/Actions/StatsAction.cpp
similarity index 100%
rename from src/strategy/actions/StatsAction.cpp
rename to src/Core/Ai/Generic/Actions/StatsAction.cpp
diff --git a/src/strategy/actions/StatsAction.h b/src/Core/Ai/Generic/Actions/StatsAction.h
similarity index 100%
rename from src/strategy/actions/StatsAction.h
rename to src/Core/Ai/Generic/Actions/StatsAction.h
diff --git a/src/strategy/actions/StayActions.cpp b/src/Core/Ai/Generic/Actions/StayActions.cpp
similarity index 100%
rename from src/strategy/actions/StayActions.cpp
rename to src/Core/Ai/Generic/Actions/StayActions.cpp
diff --git a/src/strategy/actions/StayActions.h b/src/Core/Ai/Generic/Actions/StayActions.h
similarity index 100%
rename from src/strategy/actions/StayActions.h
rename to src/Core/Ai/Generic/Actions/StayActions.h
diff --git a/src/strategy/actions/SuggestWhatToDoAction.cpp b/src/Core/Ai/Generic/Actions/SuggestWhatToDoAction.cpp
similarity index 99%
rename from src/strategy/actions/SuggestWhatToDoAction.cpp
rename to src/Core/Ai/Generic/Actions/SuggestWhatToDoAction.cpp
index 96cc7f52..159bfd4e 100644
--- a/src/strategy/actions/SuggestWhatToDoAction.cpp
+++ b/src/Core/Ai/Generic/Actions/SuggestWhatToDoAction.cpp
@@ -260,7 +260,7 @@ SuggestDungeonAction::SuggestDungeonAction(PlayerbotAI* botAI) : SuggestWhatToDo
 
 bool SuggestDungeonAction::Execute(Event event)
 {
-    // TODO: use sPlayerbotDungeonSuggestionMgr
+    // TODO: use sPlayerbotDungeonRepository
 
     if (!sPlayerbotAIConfig->randomBotSuggestDungeons || bot->GetGroup())
         return false;
diff --git a/src/strategy/actions/SuggestWhatToDoAction.h b/src/Core/Ai/Generic/Actions/SuggestWhatToDoAction.h
similarity index 100%
rename from src/strategy/actions/SuggestWhatToDoAction.h
rename to src/Core/Ai/Generic/Actions/SuggestWhatToDoAction.h
diff --git a/src/strategy/actions/TalkToQuestGiverAction.cpp b/src/Core/Ai/Generic/Actions/TalkToQuestGiverAction.cpp
similarity index 100%
rename from src/strategy/actions/TalkToQuestGiverAction.cpp
rename to src/Core/Ai/Generic/Actions/TalkToQuestGiverAction.cpp
diff --git a/src/strategy/actions/TalkToQuestGiverAction.h b/src/Core/Ai/Generic/Actions/TalkToQuestGiverAction.h
similarity index 100%
rename from src/strategy/actions/TalkToQuestGiverAction.h
rename to src/Core/Ai/Generic/Actions/TalkToQuestGiverAction.h
diff --git a/src/strategy/actions/TameAction.cpp b/src/Core/Ai/Generic/Actions/TameAction.cpp
similarity index 100%
rename from src/strategy/actions/TameAction.cpp
rename to src/Core/Ai/Generic/Actions/TameAction.cpp
diff --git a/src/strategy/actions/TameAction.h b/src/Core/Ai/Generic/Actions/TameAction.h
similarity index 100%
rename from src/strategy/actions/TameAction.h
rename to src/Core/Ai/Generic/Actions/TameAction.h
diff --git a/src/strategy/actions/TaxiAction.cpp b/src/Core/Ai/Generic/Actions/TaxiAction.cpp
similarity index 100%
rename from src/strategy/actions/TaxiAction.cpp
rename to src/Core/Ai/Generic/Actions/TaxiAction.cpp
diff --git a/src/strategy/actions/TaxiAction.h b/src/Core/Ai/Generic/Actions/TaxiAction.h
similarity index 100%
rename from src/strategy/actions/TaxiAction.h
rename to src/Core/Ai/Generic/Actions/TaxiAction.h
diff --git a/src/strategy/actions/TeleportAction.cpp b/src/Core/Ai/Generic/Actions/TeleportAction.cpp
similarity index 100%
rename from src/strategy/actions/TeleportAction.cpp
rename to src/Core/Ai/Generic/Actions/TeleportAction.cpp
diff --git a/src/strategy/actions/TeleportAction.h b/src/Core/Ai/Generic/Actions/TeleportAction.h
similarity index 100%
rename from src/strategy/actions/TeleportAction.h
rename to src/Core/Ai/Generic/Actions/TeleportAction.h
diff --git a/src/strategy/actions/TellCastFailedAction.cpp b/src/Core/Ai/Generic/Actions/TellCastFailedAction.cpp
similarity index 100%
rename from src/strategy/actions/TellCastFailedAction.cpp
rename to src/Core/Ai/Generic/Actions/TellCastFailedAction.cpp
diff --git a/src/strategy/actions/TellCastFailedAction.h b/src/Core/Ai/Generic/Actions/TellCastFailedAction.h
similarity index 100%
rename from src/strategy/actions/TellCastFailedAction.h
rename to src/Core/Ai/Generic/Actions/TellCastFailedAction.h
diff --git a/src/strategy/actions/TellGlyphsAction.cpp b/src/Core/Ai/Generic/Actions/TellGlyphsAction.cpp
similarity index 100%
rename from src/strategy/actions/TellGlyphsAction.cpp
rename to src/Core/Ai/Generic/Actions/TellGlyphsAction.cpp
diff --git a/src/strategy/actions/TellGlyphsAction.h b/src/Core/Ai/Generic/Actions/TellGlyphsAction.h
similarity index 100%
rename from src/strategy/actions/TellGlyphsAction.h
rename to src/Core/Ai/Generic/Actions/TellGlyphsAction.h
diff --git a/src/strategy/actions/TellItemCountAction.cpp b/src/Core/Ai/Generic/Actions/TellItemCountAction.cpp
similarity index 100%
rename from src/strategy/actions/TellItemCountAction.cpp
rename to src/Core/Ai/Generic/Actions/TellItemCountAction.cpp
diff --git a/src/strategy/actions/TellItemCountAction.h b/src/Core/Ai/Generic/Actions/TellItemCountAction.h
similarity index 100%
rename from src/strategy/actions/TellItemCountAction.h
rename to src/Core/Ai/Generic/Actions/TellItemCountAction.h
diff --git a/src/strategy/actions/TellLosAction.cpp b/src/Core/Ai/Generic/Actions/TellLosAction.cpp
similarity index 100%
rename from src/strategy/actions/TellLosAction.cpp
rename to src/Core/Ai/Generic/Actions/TellLosAction.cpp
diff --git a/src/strategy/actions/TellLosAction.h b/src/Core/Ai/Generic/Actions/TellLosAction.h
similarity index 100%
rename from src/strategy/actions/TellLosAction.h
rename to src/Core/Ai/Generic/Actions/TellLosAction.h
diff --git a/src/strategy/actions/TellMasterAction.cpp b/src/Core/Ai/Generic/Actions/TellMasterAction.cpp
similarity index 100%
rename from src/strategy/actions/TellMasterAction.cpp
rename to src/Core/Ai/Generic/Actions/TellMasterAction.cpp
diff --git a/src/strategy/actions/TellMasterAction.h b/src/Core/Ai/Generic/Actions/TellMasterAction.h
similarity index 100%
rename from src/strategy/actions/TellMasterAction.h
rename to src/Core/Ai/Generic/Actions/TellMasterAction.h
diff --git a/src/strategy/actions/TellReputationAction.cpp b/src/Core/Ai/Generic/Actions/TellReputationAction.cpp
similarity index 100%
rename from src/strategy/actions/TellReputationAction.cpp
rename to src/Core/Ai/Generic/Actions/TellReputationAction.cpp
diff --git a/src/strategy/actions/TellReputationAction.h b/src/Core/Ai/Generic/Actions/TellReputationAction.h
similarity index 100%
rename from src/strategy/actions/TellReputationAction.h
rename to src/Core/Ai/Generic/Actions/TellReputationAction.h
diff --git a/src/strategy/actions/TellTargetAction.cpp b/src/Core/Ai/Generic/Actions/TellTargetAction.cpp
similarity index 100%
rename from src/strategy/actions/TellTargetAction.cpp
rename to src/Core/Ai/Generic/Actions/TellTargetAction.cpp
diff --git a/src/strategy/actions/TellTargetAction.h b/src/Core/Ai/Generic/Actions/TellTargetAction.h
similarity index 100%
rename from src/strategy/actions/TellTargetAction.h
rename to src/Core/Ai/Generic/Actions/TellTargetAction.h
diff --git a/src/strategy/actions/TradeAction.cpp b/src/Core/Ai/Generic/Actions/TradeAction.cpp
similarity index 100%
rename from src/strategy/actions/TradeAction.cpp
rename to src/Core/Ai/Generic/Actions/TradeAction.cpp
diff --git a/src/strategy/actions/TradeAction.h b/src/Core/Ai/Generic/Actions/TradeAction.h
similarity index 100%
rename from src/strategy/actions/TradeAction.h
rename to src/Core/Ai/Generic/Actions/TradeAction.h
diff --git a/src/strategy/actions/TradeStatusAction.cpp b/src/Core/Ai/Generic/Actions/TradeStatusAction.cpp
similarity index 100%
rename from src/strategy/actions/TradeStatusAction.cpp
rename to src/Core/Ai/Generic/Actions/TradeStatusAction.cpp
diff --git a/src/strategy/actions/TradeStatusAction.h b/src/Core/Ai/Generic/Actions/TradeStatusAction.h
similarity index 100%
rename from src/strategy/actions/TradeStatusAction.h
rename to src/Core/Ai/Generic/Actions/TradeStatusAction.h
diff --git a/src/strategy/actions/TradeStatusExtendedAction.cpp b/src/Core/Ai/Generic/Actions/TradeStatusExtendedAction.cpp
similarity index 100%
rename from src/strategy/actions/TradeStatusExtendedAction.cpp
rename to src/Core/Ai/Generic/Actions/TradeStatusExtendedAction.cpp
diff --git a/src/strategy/actions/TradeStatusExtendedAction.h b/src/Core/Ai/Generic/Actions/TradeStatusExtendedAction.h
similarity index 100%
rename from src/strategy/actions/TradeStatusExtendedAction.h
rename to src/Core/Ai/Generic/Actions/TradeStatusExtendedAction.h
diff --git a/src/strategy/actions/TradeValues.cpp b/src/Core/Ai/Generic/Actions/TradeValues.cpp
similarity index 100%
rename from src/strategy/actions/TradeValues.cpp
rename to src/Core/Ai/Generic/Actions/TradeValues.cpp
diff --git a/src/strategy/actions/TradeValues.h b/src/Core/Ai/Generic/Actions/TradeValues.h
similarity index 100%
rename from src/strategy/actions/TradeValues.h
rename to src/Core/Ai/Generic/Actions/TradeValues.h
diff --git a/src/strategy/actions/TrainerAction.cpp b/src/Core/Ai/Generic/Actions/TrainerAction.cpp
similarity index 100%
rename from src/strategy/actions/TrainerAction.cpp
rename to src/Core/Ai/Generic/Actions/TrainerAction.cpp
diff --git a/src/strategy/actions/TrainerAction.h b/src/Core/Ai/Generic/Actions/TrainerAction.h
similarity index 100%
rename from src/strategy/actions/TrainerAction.h
rename to src/Core/Ai/Generic/Actions/TrainerAction.h
diff --git a/src/strategy/actions/TravelAction.cpp b/src/Core/Ai/Generic/Actions/TravelAction.cpp
similarity index 100%
rename from src/strategy/actions/TravelAction.cpp
rename to src/Core/Ai/Generic/Actions/TravelAction.cpp
diff --git a/src/strategy/actions/TravelAction.h b/src/Core/Ai/Generic/Actions/TravelAction.h
similarity index 100%
rename from src/strategy/actions/TravelAction.h
rename to src/Core/Ai/Generic/Actions/TravelAction.h
diff --git a/src/strategy/actions/UnequipAction.cpp b/src/Core/Ai/Generic/Actions/UnequipAction.cpp
similarity index 100%
rename from src/strategy/actions/UnequipAction.cpp
rename to src/Core/Ai/Generic/Actions/UnequipAction.cpp
diff --git a/src/strategy/actions/UnequipAction.h b/src/Core/Ai/Generic/Actions/UnequipAction.h
similarity index 100%
rename from src/strategy/actions/UnequipAction.h
rename to src/Core/Ai/Generic/Actions/UnequipAction.h
diff --git a/src/strategy/actions/UnlockItemAction.cpp b/src/Core/Ai/Generic/Actions/UnlockItemAction.cpp
similarity index 100%
rename from src/strategy/actions/UnlockItemAction.cpp
rename to src/Core/Ai/Generic/Actions/UnlockItemAction.cpp
diff --git a/src/strategy/actions/UnlockItemAction.h b/src/Core/Ai/Generic/Actions/UnlockItemAction.h
similarity index 100%
rename from src/strategy/actions/UnlockItemAction.h
rename to src/Core/Ai/Generic/Actions/UnlockItemAction.h
diff --git a/src/strategy/actions/UnlockTradedItemAction.cpp b/src/Core/Ai/Generic/Actions/UnlockTradedItemAction.cpp
similarity index 100%
rename from src/strategy/actions/UnlockTradedItemAction.cpp
rename to src/Core/Ai/Generic/Actions/UnlockTradedItemAction.cpp
diff --git a/src/strategy/actions/UnlockTradedItemAction.h b/src/Core/Ai/Generic/Actions/UnlockTradedItemAction.h
similarity index 100%
rename from src/strategy/actions/UnlockTradedItemAction.h
rename to src/Core/Ai/Generic/Actions/UnlockTradedItemAction.h
diff --git a/src/strategy/actions/UseItemAction.cpp b/src/Core/Ai/Generic/Actions/UseItemAction.cpp
similarity index 100%
rename from src/strategy/actions/UseItemAction.cpp
rename to src/Core/Ai/Generic/Actions/UseItemAction.cpp
diff --git a/src/strategy/actions/UseItemAction.h b/src/Core/Ai/Generic/Actions/UseItemAction.h
similarity index 100%
rename from src/strategy/actions/UseItemAction.h
rename to src/Core/Ai/Generic/Actions/UseItemAction.h
diff --git a/src/strategy/actions/UseMeetingStoneAction.cpp b/src/Core/Ai/Generic/Actions/UseMeetingStoneAction.cpp
similarity index 100%
rename from src/strategy/actions/UseMeetingStoneAction.cpp
rename to src/Core/Ai/Generic/Actions/UseMeetingStoneAction.cpp
diff --git a/src/strategy/actions/UseMeetingStoneAction.h b/src/Core/Ai/Generic/Actions/UseMeetingStoneAction.h
similarity index 100%
rename from src/strategy/actions/UseMeetingStoneAction.h
rename to src/Core/Ai/Generic/Actions/UseMeetingStoneAction.h
diff --git a/src/strategy/actions/VehicleActions.cpp b/src/Core/Ai/Generic/Actions/VehicleActions.cpp
similarity index 100%
rename from src/strategy/actions/VehicleActions.cpp
rename to src/Core/Ai/Generic/Actions/VehicleActions.cpp
diff --git a/src/strategy/actions/VehicleActions.h b/src/Core/Ai/Generic/Actions/VehicleActions.h
similarity index 100%
rename from src/strategy/actions/VehicleActions.h
rename to src/Core/Ai/Generic/Actions/VehicleActions.h
diff --git a/src/strategy/actions/WhoAction.cpp b/src/Core/Ai/Generic/Actions/WhoAction.cpp
similarity index 100%
rename from src/strategy/actions/WhoAction.cpp
rename to src/Core/Ai/Generic/Actions/WhoAction.cpp
diff --git a/src/strategy/actions/WhoAction.h b/src/Core/Ai/Generic/Actions/WhoAction.h
similarity index 100%
rename from src/strategy/actions/WhoAction.h
rename to src/Core/Ai/Generic/Actions/WhoAction.h
diff --git a/src/strategy/actions/WipeAction.cpp b/src/Core/Ai/Generic/Actions/WipeAction.cpp
similarity index 100%
rename from src/strategy/actions/WipeAction.cpp
rename to src/Core/Ai/Generic/Actions/WipeAction.cpp
diff --git a/src/strategy/actions/WipeAction.h b/src/Core/Ai/Generic/Actions/WipeAction.h
similarity index 100%
rename from src/strategy/actions/WipeAction.h
rename to src/Core/Ai/Generic/Actions/WipeAction.h
diff --git a/src/strategy/actions/WorldBuffAction.cpp b/src/Core/Ai/Generic/Actions/WorldBuffAction.cpp
similarity index 100%
rename from src/strategy/actions/WorldBuffAction.cpp
rename to src/Core/Ai/Generic/Actions/WorldBuffAction.cpp
diff --git a/src/strategy/actions/WorldBuffAction.h b/src/Core/Ai/Generic/Actions/WorldBuffAction.h
similarity index 100%
rename from src/strategy/actions/WorldBuffAction.h
rename to src/Core/Ai/Generic/Actions/WorldBuffAction.h
diff --git a/src/strategy/actions/WtsAction.cpp b/src/Core/Ai/Generic/Actions/WtsAction.cpp
similarity index 100%
rename from src/strategy/actions/WtsAction.cpp
rename to src/Core/Ai/Generic/Actions/WtsAction.cpp
diff --git a/src/strategy/actions/WtsAction.h b/src/Core/Ai/Generic/Actions/WtsAction.h
similarity index 100%
rename from src/strategy/actions/WtsAction.h
rename to src/Core/Ai/Generic/Actions/WtsAction.h
diff --git a/src/strategy/actions/XpGainAction.cpp b/src/Core/Ai/Generic/Actions/XpGainAction.cpp
similarity index 100%
rename from src/strategy/actions/XpGainAction.cpp
rename to src/Core/Ai/Generic/Actions/XpGainAction.cpp
diff --git a/src/strategy/actions/XpGainAction.h b/src/Core/Ai/Generic/Actions/XpGainAction.h
similarity index 100%
rename from src/strategy/actions/XpGainAction.h
rename to src/Core/Ai/Generic/Actions/XpGainAction.h
diff --git a/src/strategy/actions/ChatActionContext.h b/src/Core/Ai/Generic/ChatActionContext.h
similarity index 100%
rename from src/strategy/actions/ChatActionContext.h
rename to src/Core/Ai/Generic/ChatActionContext.h
diff --git a/src/strategy/triggers/ChatTriggerContext.h b/src/Core/Ai/Generic/ChatTriggerContext.h
similarity index 100%
rename from src/strategy/triggers/ChatTriggerContext.h
rename to src/Core/Ai/Generic/ChatTriggerContext.h
diff --git a/src/strategy/values/SharedValueContext.h b/src/Core/Ai/Generic/SharedValueContext.h
similarity index 100%
rename from src/strategy/values/SharedValueContext.h
rename to src/Core/Ai/Generic/SharedValueContext.h
diff --git a/src/strategy/triggers/BossAuraTriggers.cpp b/src/Core/Ai/Generic/Trigger/BossAuraTriggers.cpp
similarity index 100%
rename from src/strategy/triggers/BossAuraTriggers.cpp
rename to src/Core/Ai/Generic/Trigger/BossAuraTriggers.cpp
diff --git a/src/strategy/triggers/BossAuraTriggers.h b/src/Core/Ai/Generic/Trigger/BossAuraTriggers.h
similarity index 100%
rename from src/strategy/triggers/BossAuraTriggers.h
rename to src/Core/Ai/Generic/Trigger/BossAuraTriggers.h
diff --git a/src/strategy/triggers/ChatCommandTrigger.cpp b/src/Core/Ai/Generic/Trigger/ChatCommandTrigger.cpp
similarity index 100%
rename from src/strategy/triggers/ChatCommandTrigger.cpp
rename to src/Core/Ai/Generic/Trigger/ChatCommandTrigger.cpp
diff --git a/src/strategy/triggers/ChatCommandTrigger.h b/src/Core/Ai/Generic/Trigger/ChatCommandTrigger.h
similarity index 100%
rename from src/strategy/triggers/ChatCommandTrigger.h
rename to src/Core/Ai/Generic/Trigger/ChatCommandTrigger.h
diff --git a/src/strategy/triggers/CureTriggers.cpp b/src/Core/Ai/Generic/Trigger/CureTriggers.cpp
similarity index 100%
rename from src/strategy/triggers/CureTriggers.cpp
rename to src/Core/Ai/Generic/Trigger/CureTriggers.cpp
diff --git a/src/strategy/triggers/CureTriggers.h b/src/Core/Ai/Generic/Trigger/CureTriggers.h
similarity index 100%
rename from src/strategy/triggers/CureTriggers.h
rename to src/Core/Ai/Generic/Trigger/CureTriggers.h
diff --git a/src/strategy/triggers/FishingTriggers.cpp b/src/Core/Ai/Generic/Trigger/FishingTriggers.cpp
similarity index 100%
rename from src/strategy/triggers/FishingTriggers.cpp
rename to src/Core/Ai/Generic/Trigger/FishingTriggers.cpp
diff --git a/src/strategy/triggers/FishingTriggers.h b/src/Core/Ai/Generic/Trigger/FishingTriggers.h
similarity index 100%
rename from src/strategy/triggers/FishingTriggers.h
rename to src/Core/Ai/Generic/Trigger/FishingTriggers.h
diff --git a/src/strategy/triggers/GenericTriggers.cpp b/src/Core/Ai/Generic/Trigger/GenericTriggers.cpp
similarity index 100%
rename from src/strategy/triggers/GenericTriggers.cpp
rename to src/Core/Ai/Generic/Trigger/GenericTriggers.cpp
diff --git a/src/strategy/triggers/GenericTriggers.h b/src/Core/Ai/Generic/Trigger/GenericTriggers.h
similarity index 100%
rename from src/strategy/triggers/GenericTriggers.h
rename to src/Core/Ai/Generic/Trigger/GenericTriggers.h
diff --git a/src/strategy/triggers/GuildTriggers.cpp b/src/Core/Ai/Generic/Trigger/GuildTriggers.cpp
similarity index 100%
rename from src/strategy/triggers/GuildTriggers.cpp
rename to src/Core/Ai/Generic/Trigger/GuildTriggers.cpp
diff --git a/src/strategy/triggers/GuildTriggers.h b/src/Core/Ai/Generic/Trigger/GuildTriggers.h
similarity index 100%
rename from src/strategy/triggers/GuildTriggers.h
rename to src/Core/Ai/Generic/Trigger/GuildTriggers.h
diff --git a/src/strategy/triggers/HealthTriggers.cpp b/src/Core/Ai/Generic/Trigger/HealthTriggers.cpp
similarity index 100%
rename from src/strategy/triggers/HealthTriggers.cpp
rename to src/Core/Ai/Generic/Trigger/HealthTriggers.cpp
diff --git a/src/strategy/triggers/HealthTriggers.h b/src/Core/Ai/Generic/Trigger/HealthTriggers.h
similarity index 100%
rename from src/strategy/triggers/HealthTriggers.h
rename to src/Core/Ai/Generic/Trigger/HealthTriggers.h
diff --git a/src/strategy/triggers/LfgTriggers.cpp b/src/Core/Ai/Generic/Trigger/LfgTriggers.cpp
similarity index 100%
rename from src/strategy/triggers/LfgTriggers.cpp
rename to src/Core/Ai/Generic/Trigger/LfgTriggers.cpp
diff --git a/src/strategy/triggers/LfgTriggers.h b/src/Core/Ai/Generic/Trigger/LfgTriggers.h
similarity index 100%
rename from src/strategy/triggers/LfgTriggers.h
rename to src/Core/Ai/Generic/Trigger/LfgTriggers.h
diff --git a/src/strategy/triggers/LootTriggers.cpp b/src/Core/Ai/Generic/Trigger/LootTriggers.cpp
similarity index 100%
rename from src/strategy/triggers/LootTriggers.cpp
rename to src/Core/Ai/Generic/Trigger/LootTriggers.cpp
diff --git a/src/strategy/triggers/LootTriggers.h b/src/Core/Ai/Generic/Trigger/LootTriggers.h
similarity index 100%
rename from src/strategy/triggers/LootTriggers.h
rename to src/Core/Ai/Generic/Trigger/LootTriggers.h
diff --git a/src/strategy/triggers/PvpTriggers.cpp b/src/Core/Ai/Generic/Trigger/PvpTriggers.cpp
similarity index 100%
rename from src/strategy/triggers/PvpTriggers.cpp
rename to src/Core/Ai/Generic/Trigger/PvpTriggers.cpp
diff --git a/src/strategy/triggers/PvpTriggers.h b/src/Core/Ai/Generic/Trigger/PvpTriggers.h
similarity index 100%
rename from src/strategy/triggers/PvpTriggers.h
rename to src/Core/Ai/Generic/Trigger/PvpTriggers.h
diff --git a/src/strategy/triggers/RangeTriggers.cpp b/src/Core/Ai/Generic/Trigger/RangeTriggers.cpp
similarity index 100%
rename from src/strategy/triggers/RangeTriggers.cpp
rename to src/Core/Ai/Generic/Trigger/RangeTriggers.cpp
diff --git a/src/strategy/triggers/RangeTriggers.h b/src/Core/Ai/Generic/Trigger/RangeTriggers.h
similarity index 100%
rename from src/strategy/triggers/RangeTriggers.h
rename to src/Core/Ai/Generic/Trigger/RangeTriggers.h
diff --git a/src/strategy/triggers/RpgTriggers.cpp b/src/Core/Ai/Generic/Trigger/RpgTriggers.cpp
similarity index 100%
rename from src/strategy/triggers/RpgTriggers.cpp
rename to src/Core/Ai/Generic/Trigger/RpgTriggers.cpp
diff --git a/src/strategy/triggers/RpgTriggers.h b/src/Core/Ai/Generic/Trigger/RpgTriggers.h
similarity index 100%
rename from src/strategy/triggers/RpgTriggers.h
rename to src/Core/Ai/Generic/Trigger/RpgTriggers.h
diff --git a/src/strategy/triggers/RtiTriggers.cpp b/src/Core/Ai/Generic/Trigger/RtiTriggers.cpp
similarity index 100%
rename from src/strategy/triggers/RtiTriggers.cpp
rename to src/Core/Ai/Generic/Trigger/RtiTriggers.cpp
diff --git a/src/strategy/triggers/RtiTriggers.h b/src/Core/Ai/Generic/Trigger/RtiTriggers.h
similarity index 100%
rename from src/strategy/triggers/RtiTriggers.h
rename to src/Core/Ai/Generic/Trigger/RtiTriggers.h
diff --git a/src/strategy/triggers/StuckTriggers.cpp b/src/Core/Ai/Generic/Trigger/StuckTriggers.cpp
similarity index 100%
rename from src/strategy/triggers/StuckTriggers.cpp
rename to src/Core/Ai/Generic/Trigger/StuckTriggers.cpp
diff --git a/src/strategy/triggers/StuckTriggers.h b/src/Core/Ai/Generic/Trigger/StuckTriggers.h
similarity index 100%
rename from src/strategy/triggers/StuckTriggers.h
rename to src/Core/Ai/Generic/Trigger/StuckTriggers.h
diff --git a/src/strategy/triggers/TravelTriggers.cpp b/src/Core/Ai/Generic/Trigger/TravelTriggers.cpp
similarity index 100%
rename from src/strategy/triggers/TravelTriggers.cpp
rename to src/Core/Ai/Generic/Trigger/TravelTriggers.cpp
diff --git a/src/strategy/triggers/TravelTriggers.h b/src/Core/Ai/Generic/Trigger/TravelTriggers.h
similarity index 100%
rename from src/strategy/triggers/TravelTriggers.h
rename to src/Core/Ai/Generic/Trigger/TravelTriggers.h
diff --git a/src/strategy/triggers/WithinAreaTrigger.cpp b/src/Core/Ai/Generic/Trigger/WithinAreaTrigger.cpp
similarity index 100%
rename from src/strategy/triggers/WithinAreaTrigger.cpp
rename to src/Core/Ai/Generic/Trigger/WithinAreaTrigger.cpp
diff --git a/src/strategy/triggers/WithinAreaTrigger.h b/src/Core/Ai/Generic/Trigger/WithinAreaTrigger.h
similarity index 100%
rename from src/strategy/triggers/WithinAreaTrigger.h
rename to src/Core/Ai/Generic/Trigger/WithinAreaTrigger.h
diff --git a/src/strategy/triggers/WorldPacketTrigger.cpp b/src/Core/Ai/Generic/Trigger/WorldPacketTrigger.cpp
similarity index 100%
rename from src/strategy/triggers/WorldPacketTrigger.cpp
rename to src/Core/Ai/Generic/Trigger/WorldPacketTrigger.cpp
diff --git a/src/strategy/triggers/WorldPacketTrigger.h b/src/Core/Ai/Generic/Trigger/WorldPacketTrigger.h
similarity index 100%
rename from src/strategy/triggers/WorldPacketTrigger.h
rename to src/Core/Ai/Generic/Trigger/WorldPacketTrigger.h
diff --git a/src/strategy/triggers/TriggerContext.h b/src/Core/Ai/Generic/TriggerContext.h
similarity index 100%
rename from src/strategy/triggers/TriggerContext.h
rename to src/Core/Ai/Generic/TriggerContext.h
diff --git a/src/strategy/values/ActiveSpellValue.cpp b/src/Core/Ai/Generic/Value/ActiveSpellValue.cpp
similarity index 100%
rename from src/strategy/values/ActiveSpellValue.cpp
rename to src/Core/Ai/Generic/Value/ActiveSpellValue.cpp
diff --git a/src/strategy/values/ActiveSpellValue.h b/src/Core/Ai/Generic/Value/ActiveSpellValue.h
similarity index 100%
rename from src/strategy/values/ActiveSpellValue.h
rename to src/Core/Ai/Generic/Value/ActiveSpellValue.h
diff --git a/src/strategy/values/AlwaysLootListValue.cpp b/src/Core/Ai/Generic/Value/AlwaysLootListValue.cpp
similarity index 100%
rename from src/strategy/values/AlwaysLootListValue.cpp
rename to src/Core/Ai/Generic/Value/AlwaysLootListValue.cpp
diff --git a/src/strategy/values/AlwaysLootListValue.h b/src/Core/Ai/Generic/Value/AlwaysLootListValue.h
similarity index 100%
rename from src/strategy/values/AlwaysLootListValue.h
rename to src/Core/Ai/Generic/Value/AlwaysLootListValue.h
diff --git a/src/strategy/values/AoeHealValues.cpp b/src/Core/Ai/Generic/Value/AoeHealValues.cpp
similarity index 100%
rename from src/strategy/values/AoeHealValues.cpp
rename to src/Core/Ai/Generic/Value/AoeHealValues.cpp
diff --git a/src/strategy/values/AoeHealValues.h b/src/Core/Ai/Generic/Value/AoeHealValues.h
similarity index 100%
rename from src/strategy/values/AoeHealValues.h
rename to src/Core/Ai/Generic/Value/AoeHealValues.h
diff --git a/src/strategy/values/AoeValues.cpp b/src/Core/Ai/Generic/Value/AoeValues.cpp
similarity index 100%
rename from src/strategy/values/AoeValues.cpp
rename to src/Core/Ai/Generic/Value/AoeValues.cpp
diff --git a/src/strategy/values/AoeValues.h b/src/Core/Ai/Generic/Value/AoeValues.h
similarity index 100%
rename from src/strategy/values/AoeValues.h
rename to src/Core/Ai/Generic/Value/AoeValues.h
diff --git a/src/strategy/values/Arrow.cpp b/src/Core/Ai/Generic/Value/Arrow.cpp
similarity index 100%
rename from src/strategy/values/Arrow.cpp
rename to src/Core/Ai/Generic/Value/Arrow.cpp
diff --git a/src/strategy/values/Arrow.h b/src/Core/Ai/Generic/Value/Arrow.h
similarity index 100%
rename from src/strategy/values/Arrow.h
rename to src/Core/Ai/Generic/Value/Arrow.h
diff --git a/src/strategy/values/AttackerCountValues.cpp b/src/Core/Ai/Generic/Value/AttackerCountValues.cpp
similarity index 100%
rename from src/strategy/values/AttackerCountValues.cpp
rename to src/Core/Ai/Generic/Value/AttackerCountValues.cpp
diff --git a/src/strategy/values/AttackerCountValues.h b/src/Core/Ai/Generic/Value/AttackerCountValues.h
similarity index 100%
rename from src/strategy/values/AttackerCountValues.h
rename to src/Core/Ai/Generic/Value/AttackerCountValues.h
diff --git a/src/strategy/values/AttackerWithoutAuraTargetValue.cpp b/src/Core/Ai/Generic/Value/AttackerWithoutAuraTargetValue.cpp
similarity index 100%
rename from src/strategy/values/AttackerWithoutAuraTargetValue.cpp
rename to src/Core/Ai/Generic/Value/AttackerWithoutAuraTargetValue.cpp
diff --git a/src/strategy/values/AttackerWithoutAuraTargetValue.h b/src/Core/Ai/Generic/Value/AttackerWithoutAuraTargetValue.h
similarity index 100%
rename from src/strategy/values/AttackerWithoutAuraTargetValue.h
rename to src/Core/Ai/Generic/Value/AttackerWithoutAuraTargetValue.h
diff --git a/src/strategy/values/AttackersValue.cpp b/src/Core/Ai/Generic/Value/AttackersValue.cpp
similarity index 100%
rename from src/strategy/values/AttackersValue.cpp
rename to src/Core/Ai/Generic/Value/AttackersValue.cpp
diff --git a/src/strategy/values/AttackersValue.h b/src/Core/Ai/Generic/Value/AttackersValue.h
similarity index 100%
rename from src/strategy/values/AttackersValue.h
rename to src/Core/Ai/Generic/Value/AttackersValue.h
diff --git a/src/strategy/values/AvailableLootValue.cpp b/src/Core/Ai/Generic/Value/AvailableLootValue.cpp
similarity index 100%
rename from src/strategy/values/AvailableLootValue.cpp
rename to src/Core/Ai/Generic/Value/AvailableLootValue.cpp
diff --git a/src/strategy/values/AvailableLootValue.h b/src/Core/Ai/Generic/Value/AvailableLootValue.h
similarity index 100%
rename from src/strategy/values/AvailableLootValue.h
rename to src/Core/Ai/Generic/Value/AvailableLootValue.h
diff --git a/src/strategy/values/BudgetValues.cpp b/src/Core/Ai/Generic/Value/BudgetValues.cpp
similarity index 100%
rename from src/strategy/values/BudgetValues.cpp
rename to src/Core/Ai/Generic/Value/BudgetValues.cpp
diff --git a/src/strategy/values/BudgetValues.h b/src/Core/Ai/Generic/Value/BudgetValues.h
similarity index 100%
rename from src/strategy/values/BudgetValues.h
rename to src/Core/Ai/Generic/Value/BudgetValues.h
diff --git a/src/strategy/values/CcTargetValue.cpp b/src/Core/Ai/Generic/Value/CcTargetValue.cpp
similarity index 100%
rename from src/strategy/values/CcTargetValue.cpp
rename to src/Core/Ai/Generic/Value/CcTargetValue.cpp
diff --git a/src/strategy/values/CcTargetValue.h b/src/Core/Ai/Generic/Value/CcTargetValue.h
similarity index 100%
rename from src/strategy/values/CcTargetValue.h
rename to src/Core/Ai/Generic/Value/CcTargetValue.h
diff --git a/src/strategy/values/ChatValue.h b/src/Core/Ai/Generic/Value/ChatValue.h
similarity index 100%
rename from src/strategy/values/ChatValue.h
rename to src/Core/Ai/Generic/Value/ChatValue.h
diff --git a/src/strategy/values/CollisionValue.cpp b/src/Core/Ai/Generic/Value/CollisionValue.cpp
similarity index 100%
rename from src/strategy/values/CollisionValue.cpp
rename to src/Core/Ai/Generic/Value/CollisionValue.cpp
diff --git a/src/strategy/values/CollisionValue.h b/src/Core/Ai/Generic/Value/CollisionValue.h
similarity index 100%
rename from src/strategy/values/CollisionValue.h
rename to src/Core/Ai/Generic/Value/CollisionValue.h
diff --git a/src/strategy/values/CraftValue.h b/src/Core/Ai/Generic/Value/CraftValue.h
similarity index 100%
rename from src/strategy/values/CraftValue.h
rename to src/Core/Ai/Generic/Value/CraftValue.h
diff --git a/src/strategy/values/CurrentCcTargetValue.cpp b/src/Core/Ai/Generic/Value/CurrentCcTargetValue.cpp
similarity index 100%
rename from src/strategy/values/CurrentCcTargetValue.cpp
rename to src/Core/Ai/Generic/Value/CurrentCcTargetValue.cpp
diff --git a/src/strategy/values/CurrentCcTargetValue.h b/src/Core/Ai/Generic/Value/CurrentCcTargetValue.h
similarity index 100%
rename from src/strategy/values/CurrentCcTargetValue.h
rename to src/Core/Ai/Generic/Value/CurrentCcTargetValue.h
diff --git a/src/strategy/values/CurrentTargetValue.cpp b/src/Core/Ai/Generic/Value/CurrentTargetValue.cpp
similarity index 100%
rename from src/strategy/values/CurrentTargetValue.cpp
rename to src/Core/Ai/Generic/Value/CurrentTargetValue.cpp
diff --git a/src/strategy/values/CurrentTargetValue.h b/src/Core/Ai/Generic/Value/CurrentTargetValue.h
similarity index 100%
rename from src/strategy/values/CurrentTargetValue.h
rename to src/Core/Ai/Generic/Value/CurrentTargetValue.h
diff --git a/src/strategy/values/DistanceValue.cpp b/src/Core/Ai/Generic/Value/DistanceValue.cpp
similarity index 100%
rename from src/strategy/values/DistanceValue.cpp
rename to src/Core/Ai/Generic/Value/DistanceValue.cpp
diff --git a/src/strategy/values/DistanceValue.h b/src/Core/Ai/Generic/Value/DistanceValue.h
similarity index 100%
rename from src/strategy/values/DistanceValue.h
rename to src/Core/Ai/Generic/Value/DistanceValue.h
diff --git a/src/strategy/values/DpsTargetValue.cpp b/src/Core/Ai/Generic/Value/DpsTargetValue.cpp
similarity index 100%
rename from src/strategy/values/DpsTargetValue.cpp
rename to src/Core/Ai/Generic/Value/DpsTargetValue.cpp
diff --git a/src/strategy/values/DpsTargetValue.h b/src/Core/Ai/Generic/Value/DpsTargetValue.h
similarity index 100%
rename from src/strategy/values/DpsTargetValue.h
rename to src/Core/Ai/Generic/Value/DpsTargetValue.h
diff --git a/src/strategy/values/DuelTargetValue.cpp b/src/Core/Ai/Generic/Value/DuelTargetValue.cpp
similarity index 100%
rename from src/strategy/values/DuelTargetValue.cpp
rename to src/Core/Ai/Generic/Value/DuelTargetValue.cpp
diff --git a/src/strategy/values/DuelTargetValue.h b/src/Core/Ai/Generic/Value/DuelTargetValue.h
similarity index 100%
rename from src/strategy/values/DuelTargetValue.h
rename to src/Core/Ai/Generic/Value/DuelTargetValue.h
diff --git a/src/strategy/values/EnemyHealerTargetValue.cpp b/src/Core/Ai/Generic/Value/EnemyHealerTargetValue.cpp
similarity index 100%
rename from src/strategy/values/EnemyHealerTargetValue.cpp
rename to src/Core/Ai/Generic/Value/EnemyHealerTargetValue.cpp
diff --git a/src/strategy/values/EnemyHealerTargetValue.h b/src/Core/Ai/Generic/Value/EnemyHealerTargetValue.h
similarity index 100%
rename from src/strategy/values/EnemyHealerTargetValue.h
rename to src/Core/Ai/Generic/Value/EnemyHealerTargetValue.h
diff --git a/src/strategy/values/EnemyPlayerValue.cpp b/src/Core/Ai/Generic/Value/EnemyPlayerValue.cpp
similarity index 100%
rename from src/strategy/values/EnemyPlayerValue.cpp
rename to src/Core/Ai/Generic/Value/EnemyPlayerValue.cpp
diff --git a/src/strategy/values/EnemyPlayerValue.h b/src/Core/Ai/Generic/Value/EnemyPlayerValue.h
similarity index 100%
rename from src/strategy/values/EnemyPlayerValue.h
rename to src/Core/Ai/Generic/Value/EnemyPlayerValue.h
diff --git a/src/strategy/values/EstimatedLifetimeValue.cpp b/src/Core/Ai/Generic/Value/EstimatedLifetimeValue.cpp
similarity index 100%
rename from src/strategy/values/EstimatedLifetimeValue.cpp
rename to src/Core/Ai/Generic/Value/EstimatedLifetimeValue.cpp
diff --git a/src/strategy/values/EstimatedLifetimeValue.h b/src/Core/Ai/Generic/Value/EstimatedLifetimeValue.h
similarity index 100%
rename from src/strategy/values/EstimatedLifetimeValue.h
rename to src/Core/Ai/Generic/Value/EstimatedLifetimeValue.h
diff --git a/src/strategy/values/FishValues.cpp b/src/Core/Ai/Generic/Value/FishValues.cpp
similarity index 100%
rename from src/strategy/values/FishValues.cpp
rename to src/Core/Ai/Generic/Value/FishValues.cpp
diff --git a/src/strategy/values/FishValues.h b/src/Core/Ai/Generic/Value/FishValues.h
similarity index 100%
rename from src/strategy/values/FishValues.h
rename to src/Core/Ai/Generic/Value/FishValues.h
diff --git a/src/strategy/values/Formations.cpp b/src/Core/Ai/Generic/Value/Formations.cpp
similarity index 100%
rename from src/strategy/values/Formations.cpp
rename to src/Core/Ai/Generic/Value/Formations.cpp
diff --git a/src/strategy/values/Formations.h b/src/Core/Ai/Generic/Value/Formations.h
similarity index 100%
rename from src/strategy/values/Formations.h
rename to src/Core/Ai/Generic/Value/Formations.h
diff --git a/src/strategy/values/GrindTargetValue.cpp b/src/Core/Ai/Generic/Value/GrindTargetValue.cpp
similarity index 100%
rename from src/strategy/values/GrindTargetValue.cpp
rename to src/Core/Ai/Generic/Value/GrindTargetValue.cpp
diff --git a/src/strategy/values/GrindTargetValue.h b/src/Core/Ai/Generic/Value/GrindTargetValue.h
similarity index 100%
rename from src/strategy/values/GrindTargetValue.h
rename to src/Core/Ai/Generic/Value/GrindTargetValue.h
diff --git a/src/strategy/values/GroupLeaderValue.cpp b/src/Core/Ai/Generic/Value/GroupLeaderValue.cpp
similarity index 100%
rename from src/strategy/values/GroupLeaderValue.cpp
rename to src/Core/Ai/Generic/Value/GroupLeaderValue.cpp
diff --git a/src/strategy/values/GroupLeaderValue.h b/src/Core/Ai/Generic/Value/GroupLeaderValue.h
similarity index 100%
rename from src/strategy/values/GroupLeaderValue.h
rename to src/Core/Ai/Generic/Value/GroupLeaderValue.h
diff --git a/src/strategy/values/GroupValues.cpp b/src/Core/Ai/Generic/Value/GroupValues.cpp
similarity index 100%
rename from src/strategy/values/GroupValues.cpp
rename to src/Core/Ai/Generic/Value/GroupValues.cpp
diff --git a/src/strategy/values/GroupValues.h b/src/Core/Ai/Generic/Value/GroupValues.h
similarity index 100%
rename from src/strategy/values/GroupValues.h
rename to src/Core/Ai/Generic/Value/GroupValues.h
diff --git a/src/strategy/values/GuildValues.cpp b/src/Core/Ai/Generic/Value/GuildValues.cpp
similarity index 100%
rename from src/strategy/values/GuildValues.cpp
rename to src/Core/Ai/Generic/Value/GuildValues.cpp
diff --git a/src/strategy/values/GuildValues.h b/src/Core/Ai/Generic/Value/GuildValues.h
similarity index 100%
rename from src/strategy/values/GuildValues.h
rename to src/Core/Ai/Generic/Value/GuildValues.h
diff --git a/src/strategy/values/HasAvailableLootValue.cpp b/src/Core/Ai/Generic/Value/HasAvailableLootValue.cpp
similarity index 100%
rename from src/strategy/values/HasAvailableLootValue.cpp
rename to src/Core/Ai/Generic/Value/HasAvailableLootValue.cpp
diff --git a/src/strategy/values/HasAvailableLootValue.h b/src/Core/Ai/Generic/Value/HasAvailableLootValue.h
similarity index 100%
rename from src/strategy/values/HasAvailableLootValue.h
rename to src/Core/Ai/Generic/Value/HasAvailableLootValue.h
diff --git a/src/strategy/values/HasTotemValue.cpp b/src/Core/Ai/Generic/Value/HasTotemValue.cpp
similarity index 100%
rename from src/strategy/values/HasTotemValue.cpp
rename to src/Core/Ai/Generic/Value/HasTotemValue.cpp
diff --git a/src/strategy/values/HasTotemValue.h b/src/Core/Ai/Generic/Value/HasTotemValue.h
similarity index 100%
rename from src/strategy/values/HasTotemValue.h
rename to src/Core/Ai/Generic/Value/HasTotemValue.h
diff --git a/src/strategy/values/InvalidTargetValue.cpp b/src/Core/Ai/Generic/Value/InvalidTargetValue.cpp
similarity index 100%
rename from src/strategy/values/InvalidTargetValue.cpp
rename to src/Core/Ai/Generic/Value/InvalidTargetValue.cpp
diff --git a/src/strategy/values/InvalidTargetValue.h b/src/Core/Ai/Generic/Value/InvalidTargetValue.h
similarity index 100%
rename from src/strategy/values/InvalidTargetValue.h
rename to src/Core/Ai/Generic/Value/InvalidTargetValue.h
diff --git a/src/strategy/values/IsBehindValue.cpp b/src/Core/Ai/Generic/Value/IsBehindValue.cpp
similarity index 100%
rename from src/strategy/values/IsBehindValue.cpp
rename to src/Core/Ai/Generic/Value/IsBehindValue.cpp
diff --git a/src/strategy/values/IsBehindValue.h b/src/Core/Ai/Generic/Value/IsBehindValue.h
similarity index 100%
rename from src/strategy/values/IsBehindValue.h
rename to src/Core/Ai/Generic/Value/IsBehindValue.h
diff --git a/src/strategy/values/IsFacingValue.cpp b/src/Core/Ai/Generic/Value/IsFacingValue.cpp
similarity index 100%
rename from src/strategy/values/IsFacingValue.cpp
rename to src/Core/Ai/Generic/Value/IsFacingValue.cpp
diff --git a/src/strategy/values/IsFacingValue.h b/src/Core/Ai/Generic/Value/IsFacingValue.h
similarity index 100%
rename from src/strategy/values/IsFacingValue.h
rename to src/Core/Ai/Generic/Value/IsFacingValue.h
diff --git a/src/strategy/values/IsMovingValue.cpp b/src/Core/Ai/Generic/Value/IsMovingValue.cpp
similarity index 100%
rename from src/strategy/values/IsMovingValue.cpp
rename to src/Core/Ai/Generic/Value/IsMovingValue.cpp
diff --git a/src/strategy/values/IsMovingValue.h b/src/Core/Ai/Generic/Value/IsMovingValue.h
similarity index 100%
rename from src/strategy/values/IsMovingValue.h
rename to src/Core/Ai/Generic/Value/IsMovingValue.h
diff --git a/src/strategy/values/ItemCountValue.cpp b/src/Core/Ai/Generic/Value/ItemCountValue.cpp
similarity index 100%
rename from src/strategy/values/ItemCountValue.cpp
rename to src/Core/Ai/Generic/Value/ItemCountValue.cpp
diff --git a/src/strategy/values/ItemCountValue.h b/src/Core/Ai/Generic/Value/ItemCountValue.h
similarity index 100%
rename from src/strategy/values/ItemCountValue.h
rename to src/Core/Ai/Generic/Value/ItemCountValue.h
diff --git a/src/strategy/values/ItemForSpellValue.cpp b/src/Core/Ai/Generic/Value/ItemForSpellValue.cpp
similarity index 100%
rename from src/strategy/values/ItemForSpellValue.cpp
rename to src/Core/Ai/Generic/Value/ItemForSpellValue.cpp
diff --git a/src/strategy/values/ItemForSpellValue.h b/src/Core/Ai/Generic/Value/ItemForSpellValue.h
similarity index 100%
rename from src/strategy/values/ItemForSpellValue.h
rename to src/Core/Ai/Generic/Value/ItemForSpellValue.h
diff --git a/src/strategy/values/ItemUsageValue.cpp b/src/Core/Ai/Generic/Value/ItemUsageValue.cpp
similarity index 100%
rename from src/strategy/values/ItemUsageValue.cpp
rename to src/Core/Ai/Generic/Value/ItemUsageValue.cpp
diff --git a/src/strategy/values/ItemUsageValue.h b/src/Core/Ai/Generic/Value/ItemUsageValue.h
similarity index 100%
rename from src/strategy/values/ItemUsageValue.h
rename to src/Core/Ai/Generic/Value/ItemUsageValue.h
diff --git a/src/strategy/values/LastMovementValue.cpp b/src/Core/Ai/Generic/Value/LastMovementValue.cpp
similarity index 100%
rename from src/strategy/values/LastMovementValue.cpp
rename to src/Core/Ai/Generic/Value/LastMovementValue.cpp
diff --git a/src/strategy/values/LastMovementValue.h b/src/Core/Ai/Generic/Value/LastMovementValue.h
similarity index 100%
rename from src/strategy/values/LastMovementValue.h
rename to src/Core/Ai/Generic/Value/LastMovementValue.h
diff --git a/src/strategy/values/LastSaidValue.h b/src/Core/Ai/Generic/Value/LastSaidValue.h
similarity index 100%
rename from src/strategy/values/LastSaidValue.h
rename to src/Core/Ai/Generic/Value/LastSaidValue.h
diff --git a/src/strategy/values/LastSpellCastTimeValue.h b/src/Core/Ai/Generic/Value/LastSpellCastTimeValue.h
similarity index 100%
rename from src/strategy/values/LastSpellCastTimeValue.h
rename to src/Core/Ai/Generic/Value/LastSpellCastTimeValue.h
diff --git a/src/strategy/values/LastSpellCastValue.cpp b/src/Core/Ai/Generic/Value/LastSpellCastValue.cpp
similarity index 100%
rename from src/strategy/values/LastSpellCastValue.cpp
rename to src/Core/Ai/Generic/Value/LastSpellCastValue.cpp
diff --git a/src/strategy/values/LastSpellCastValue.h b/src/Core/Ai/Generic/Value/LastSpellCastValue.h
similarity index 100%
rename from src/strategy/values/LastSpellCastValue.h
rename to src/Core/Ai/Generic/Value/LastSpellCastValue.h
diff --git a/src/strategy/values/LeastHpTargetValue.cpp b/src/Core/Ai/Generic/Value/LeastHpTargetValue.cpp
similarity index 100%
rename from src/strategy/values/LeastHpTargetValue.cpp
rename to src/Core/Ai/Generic/Value/LeastHpTargetValue.cpp
diff --git a/src/strategy/values/LeastHpTargetValue.h b/src/Core/Ai/Generic/Value/LeastHpTargetValue.h
similarity index 100%
rename from src/strategy/values/LeastHpTargetValue.h
rename to src/Core/Ai/Generic/Value/LeastHpTargetValue.h
diff --git a/src/strategy/values/LfgValues.h b/src/Core/Ai/Generic/Value/LfgValues.h
similarity index 100%
rename from src/strategy/values/LfgValues.h
rename to src/Core/Ai/Generic/Value/LfgValues.h
diff --git a/src/strategy/values/LineTargetValue.cpp b/src/Core/Ai/Generic/Value/LineTargetValue.cpp
similarity index 100%
rename from src/strategy/values/LineTargetValue.cpp
rename to src/Core/Ai/Generic/Value/LineTargetValue.cpp
diff --git a/src/strategy/values/LineTargetValue.h b/src/Core/Ai/Generic/Value/LineTargetValue.h
similarity index 100%
rename from src/strategy/values/LineTargetValue.h
rename to src/Core/Ai/Generic/Value/LineTargetValue.h
diff --git a/src/strategy/values/LogLevelValue.h b/src/Core/Ai/Generic/Value/LogLevelValue.h
similarity index 100%
rename from src/strategy/values/LogLevelValue.h
rename to src/Core/Ai/Generic/Value/LogLevelValue.h
diff --git a/src/strategy/values/LootStrategyValue.cpp b/src/Core/Ai/Generic/Value/LootStrategyValue.cpp
similarity index 100%
rename from src/strategy/values/LootStrategyValue.cpp
rename to src/Core/Ai/Generic/Value/LootStrategyValue.cpp
diff --git a/src/strategy/values/LootStrategyValue.h b/src/Core/Ai/Generic/Value/LootStrategyValue.h
similarity index 100%
rename from src/strategy/values/LootStrategyValue.h
rename to src/Core/Ai/Generic/Value/LootStrategyValue.h
diff --git a/src/strategy/values/LootValues.cpp b/src/Core/Ai/Generic/Value/LootValues.cpp
similarity index 100%
rename from src/strategy/values/LootValues.cpp
rename to src/Core/Ai/Generic/Value/LootValues.cpp
diff --git a/src/strategy/values/LootValues.h b/src/Core/Ai/Generic/Value/LootValues.h
similarity index 100%
rename from src/strategy/values/LootValues.h
rename to src/Core/Ai/Generic/Value/LootValues.h
diff --git a/src/strategy/values/MaintenanceValues.cpp b/src/Core/Ai/Generic/Value/MaintenanceValues.cpp
similarity index 100%
rename from src/strategy/values/MaintenanceValues.cpp
rename to src/Core/Ai/Generic/Value/MaintenanceValues.cpp
diff --git a/src/strategy/values/MaintenanceValues.h b/src/Core/Ai/Generic/Value/MaintenanceValues.h
similarity index 100%
rename from src/strategy/values/MaintenanceValues.h
rename to src/Core/Ai/Generic/Value/MaintenanceValues.h
diff --git a/src/strategy/values/ManaSaveLevelValue.h b/src/Core/Ai/Generic/Value/ManaSaveLevelValue.h
similarity index 100%
rename from src/strategy/values/ManaSaveLevelValue.h
rename to src/Core/Ai/Generic/Value/ManaSaveLevelValue.h
diff --git a/src/strategy/values/NearestAdsValue.cpp b/src/Core/Ai/Generic/Value/NearestAdsValue.cpp
similarity index 100%
rename from src/strategy/values/NearestAdsValue.cpp
rename to src/Core/Ai/Generic/Value/NearestAdsValue.cpp
diff --git a/src/strategy/values/NearestAdsValue.h b/src/Core/Ai/Generic/Value/NearestAdsValue.h
similarity index 100%
rename from src/strategy/values/NearestAdsValue.h
rename to src/Core/Ai/Generic/Value/NearestAdsValue.h
diff --git a/src/strategy/values/NearestCorpsesValue.cpp b/src/Core/Ai/Generic/Value/NearestCorpsesValue.cpp
similarity index 100%
rename from src/strategy/values/NearestCorpsesValue.cpp
rename to src/Core/Ai/Generic/Value/NearestCorpsesValue.cpp
diff --git a/src/strategy/values/NearestCorpsesValue.h b/src/Core/Ai/Generic/Value/NearestCorpsesValue.h
similarity index 100%
rename from src/strategy/values/NearestCorpsesValue.h
rename to src/Core/Ai/Generic/Value/NearestCorpsesValue.h
diff --git a/src/strategy/values/NearestFriendlyPlayersValue.cpp b/src/Core/Ai/Generic/Value/NearestFriendlyPlayersValue.cpp
similarity index 100%
rename from src/strategy/values/NearestFriendlyPlayersValue.cpp
rename to src/Core/Ai/Generic/Value/NearestFriendlyPlayersValue.cpp
diff --git a/src/strategy/values/NearestFriendlyPlayersValue.h b/src/Core/Ai/Generic/Value/NearestFriendlyPlayersValue.h
similarity index 100%
rename from src/strategy/values/NearestFriendlyPlayersValue.h
rename to src/Core/Ai/Generic/Value/NearestFriendlyPlayersValue.h
diff --git a/src/strategy/values/NearestGameObjects.cpp b/src/Core/Ai/Generic/Value/NearestGameObjects.cpp
similarity index 100%
rename from src/strategy/values/NearestGameObjects.cpp
rename to src/Core/Ai/Generic/Value/NearestGameObjects.cpp
diff --git a/src/strategy/values/NearestGameObjects.h b/src/Core/Ai/Generic/Value/NearestGameObjects.h
similarity index 100%
rename from src/strategy/values/NearestGameObjects.h
rename to src/Core/Ai/Generic/Value/NearestGameObjects.h
diff --git a/src/strategy/values/NearestNonBotPlayersValue.cpp b/src/Core/Ai/Generic/Value/NearestNonBotPlayersValue.cpp
similarity index 100%
rename from src/strategy/values/NearestNonBotPlayersValue.cpp
rename to src/Core/Ai/Generic/Value/NearestNonBotPlayersValue.cpp
diff --git a/src/strategy/values/NearestNonBotPlayersValue.h b/src/Core/Ai/Generic/Value/NearestNonBotPlayersValue.h
similarity index 100%
rename from src/strategy/values/NearestNonBotPlayersValue.h
rename to src/Core/Ai/Generic/Value/NearestNonBotPlayersValue.h
diff --git a/src/strategy/values/NearestNpcsValue.cpp b/src/Core/Ai/Generic/Value/NearestNpcsValue.cpp
similarity index 100%
rename from src/strategy/values/NearestNpcsValue.cpp
rename to src/Core/Ai/Generic/Value/NearestNpcsValue.cpp
diff --git a/src/strategy/values/NearestNpcsValue.h b/src/Core/Ai/Generic/Value/NearestNpcsValue.h
similarity index 100%
rename from src/strategy/values/NearestNpcsValue.h
rename to src/Core/Ai/Generic/Value/NearestNpcsValue.h
diff --git a/src/strategy/values/NearestUnitsValue.cpp b/src/Core/Ai/Generic/Value/NearestUnitsValue.cpp
similarity index 100%
rename from src/strategy/values/NearestUnitsValue.cpp
rename to src/Core/Ai/Generic/Value/NearestUnitsValue.cpp
diff --git a/src/strategy/values/NearestUnitsValue.h b/src/Core/Ai/Generic/Value/NearestUnitsValue.h
similarity index 100%
rename from src/strategy/values/NearestUnitsValue.h
rename to src/Core/Ai/Generic/Value/NearestUnitsValue.h
diff --git a/src/strategy/values/NewPlayerNearbyValue.cpp b/src/Core/Ai/Generic/Value/NewPlayerNearbyValue.cpp
similarity index 100%
rename from src/strategy/values/NewPlayerNearbyValue.cpp
rename to src/Core/Ai/Generic/Value/NewPlayerNearbyValue.cpp
diff --git a/src/strategy/values/NewPlayerNearbyValue.h b/src/Core/Ai/Generic/Value/NewPlayerNearbyValue.h
similarity index 100%
rename from src/strategy/values/NewPlayerNearbyValue.h
rename to src/Core/Ai/Generic/Value/NewPlayerNearbyValue.h
diff --git a/src/strategy/values/OutfitListValue.cpp b/src/Core/Ai/Generic/Value/OutfitListValue.cpp
similarity index 100%
rename from src/strategy/values/OutfitListValue.cpp
rename to src/Core/Ai/Generic/Value/OutfitListValue.cpp
diff --git a/src/strategy/values/OutfitListValue.h b/src/Core/Ai/Generic/Value/OutfitListValue.h
similarity index 100%
rename from src/strategy/values/OutfitListValue.h
rename to src/Core/Ai/Generic/Value/OutfitListValue.h
diff --git a/src/strategy/values/PartyMemberToDispel.cpp b/src/Core/Ai/Generic/Value/PartyMemberToDispel.cpp
similarity index 100%
rename from src/strategy/values/PartyMemberToDispel.cpp
rename to src/Core/Ai/Generic/Value/PartyMemberToDispel.cpp
diff --git a/src/strategy/values/PartyMemberToDispel.h b/src/Core/Ai/Generic/Value/PartyMemberToDispel.h
similarity index 100%
rename from src/strategy/values/PartyMemberToDispel.h
rename to src/Core/Ai/Generic/Value/PartyMemberToDispel.h
diff --git a/src/strategy/values/PartyMemberToHeal.cpp b/src/Core/Ai/Generic/Value/PartyMemberToHeal.cpp
similarity index 100%
rename from src/strategy/values/PartyMemberToHeal.cpp
rename to src/Core/Ai/Generic/Value/PartyMemberToHeal.cpp
diff --git a/src/strategy/values/PartyMemberToHeal.h b/src/Core/Ai/Generic/Value/PartyMemberToHeal.h
similarity index 100%
rename from src/strategy/values/PartyMemberToHeal.h
rename to src/Core/Ai/Generic/Value/PartyMemberToHeal.h
diff --git a/src/strategy/values/PartyMemberToResurrect.cpp b/src/Core/Ai/Generic/Value/PartyMemberToResurrect.cpp
similarity index 100%
rename from src/strategy/values/PartyMemberToResurrect.cpp
rename to src/Core/Ai/Generic/Value/PartyMemberToResurrect.cpp
diff --git a/src/strategy/values/PartyMemberToResurrect.h b/src/Core/Ai/Generic/Value/PartyMemberToResurrect.h
similarity index 100%
rename from src/strategy/values/PartyMemberToResurrect.h
rename to src/Core/Ai/Generic/Value/PartyMemberToResurrect.h
diff --git a/src/strategy/values/PartyMemberValue.cpp b/src/Core/Ai/Generic/Value/PartyMemberValue.cpp
similarity index 100%
rename from src/strategy/values/PartyMemberValue.cpp
rename to src/Core/Ai/Generic/Value/PartyMemberValue.cpp
diff --git a/src/strategy/values/PartyMemberValue.h b/src/Core/Ai/Generic/Value/PartyMemberValue.h
similarity index 100%
rename from src/strategy/values/PartyMemberValue.h
rename to src/Core/Ai/Generic/Value/PartyMemberValue.h
diff --git a/src/strategy/values/PartyMemberWithoutAuraValue.cpp b/src/Core/Ai/Generic/Value/PartyMemberWithoutAuraValue.cpp
similarity index 100%
rename from src/strategy/values/PartyMemberWithoutAuraValue.cpp
rename to src/Core/Ai/Generic/Value/PartyMemberWithoutAuraValue.cpp
diff --git a/src/strategy/values/PartyMemberWithoutAuraValue.h b/src/Core/Ai/Generic/Value/PartyMemberWithoutAuraValue.h
similarity index 100%
rename from src/strategy/values/PartyMemberWithoutAuraValue.h
rename to src/Core/Ai/Generic/Value/PartyMemberWithoutAuraValue.h
diff --git a/src/strategy/values/PartyMemberWithoutItemValue.cpp b/src/Core/Ai/Generic/Value/PartyMemberWithoutItemValue.cpp
similarity index 100%
rename from src/strategy/values/PartyMemberWithoutItemValue.cpp
rename to src/Core/Ai/Generic/Value/PartyMemberWithoutItemValue.cpp
diff --git a/src/strategy/values/PartyMemberWithoutItemValue.h b/src/Core/Ai/Generic/Value/PartyMemberWithoutItemValue.h
similarity index 100%
rename from src/strategy/values/PartyMemberWithoutItemValue.h
rename to src/Core/Ai/Generic/Value/PartyMemberWithoutItemValue.h
diff --git a/src/strategy/values/PetTargetValue.cpp b/src/Core/Ai/Generic/Value/PetTargetValue.cpp
similarity index 100%
rename from src/strategy/values/PetTargetValue.cpp
rename to src/Core/Ai/Generic/Value/PetTargetValue.cpp
diff --git a/src/strategy/values/PetTargetValue.h b/src/Core/Ai/Generic/Value/PetTargetValue.h
similarity index 100%
rename from src/strategy/values/PetTargetValue.h
rename to src/Core/Ai/Generic/Value/PetTargetValue.h
diff --git a/src/strategy/values/PositionValue.cpp b/src/Core/Ai/Generic/Value/PositionValue.cpp
similarity index 100%
rename from src/strategy/values/PositionValue.cpp
rename to src/Core/Ai/Generic/Value/PositionValue.cpp
diff --git a/src/strategy/values/PositionValue.h b/src/Core/Ai/Generic/Value/PositionValue.h
similarity index 100%
rename from src/strategy/values/PositionValue.h
rename to src/Core/Ai/Generic/Value/PositionValue.h
diff --git a/src/strategy/values/PossibleRpgTargetsValue.cpp b/src/Core/Ai/Generic/Value/PossibleRpgTargetsValue.cpp
similarity index 100%
rename from src/strategy/values/PossibleRpgTargetsValue.cpp
rename to src/Core/Ai/Generic/Value/PossibleRpgTargetsValue.cpp
diff --git a/src/strategy/values/PossibleRpgTargetsValue.h b/src/Core/Ai/Generic/Value/PossibleRpgTargetsValue.h
similarity index 100%
rename from src/strategy/values/PossibleRpgTargetsValue.h
rename to src/Core/Ai/Generic/Value/PossibleRpgTargetsValue.h
diff --git a/src/strategy/values/PossibleTargetsValue.cpp b/src/Core/Ai/Generic/Value/PossibleTargetsValue.cpp
similarity index 100%
rename from src/strategy/values/PossibleTargetsValue.cpp
rename to src/Core/Ai/Generic/Value/PossibleTargetsValue.cpp
diff --git a/src/strategy/values/PossibleTargetsValue.h b/src/Core/Ai/Generic/Value/PossibleTargetsValue.h
similarity index 100%
rename from src/strategy/values/PossibleTargetsValue.h
rename to src/Core/Ai/Generic/Value/PossibleTargetsValue.h
diff --git a/src/strategy/values/PvpValues.cpp b/src/Core/Ai/Generic/Value/PvpValues.cpp
similarity index 100%
rename from src/strategy/values/PvpValues.cpp
rename to src/Core/Ai/Generic/Value/PvpValues.cpp
diff --git a/src/strategy/values/PvpValues.h b/src/Core/Ai/Generic/Value/PvpValues.h
similarity index 100%
rename from src/strategy/values/PvpValues.h
rename to src/Core/Ai/Generic/Value/PvpValues.h
diff --git a/src/strategy/values/QuestValues.cpp b/src/Core/Ai/Generic/Value/QuestValues.cpp
similarity index 100%
rename from src/strategy/values/QuestValues.cpp
rename to src/Core/Ai/Generic/Value/QuestValues.cpp
diff --git a/src/strategy/values/QuestValues.h b/src/Core/Ai/Generic/Value/QuestValues.h
similarity index 100%
rename from src/strategy/values/QuestValues.h
rename to src/Core/Ai/Generic/Value/QuestValues.h
diff --git a/src/strategy/values/RTSCValues.cpp b/src/Core/Ai/Generic/Value/RTSCValues.cpp
similarity index 100%
rename from src/strategy/values/RTSCValues.cpp
rename to src/Core/Ai/Generic/Value/RTSCValues.cpp
diff --git a/src/strategy/values/RTSCValues.h b/src/Core/Ai/Generic/Value/RTSCValues.h
similarity index 100%
rename from src/strategy/values/RTSCValues.h
rename to src/Core/Ai/Generic/Value/RTSCValues.h
diff --git a/src/strategy/values/RandomBotUpdateValue.h b/src/Core/Ai/Generic/Value/RandomBotUpdateValue.h
similarity index 100%
rename from src/strategy/values/RandomBotUpdateValue.h
rename to src/Core/Ai/Generic/Value/RandomBotUpdateValue.h
diff --git a/src/strategy/values/RangeValues.cpp b/src/Core/Ai/Generic/Value/RangeValues.cpp
similarity index 100%
rename from src/strategy/values/RangeValues.cpp
rename to src/Core/Ai/Generic/Value/RangeValues.cpp
diff --git a/src/strategy/values/RangeValues.h b/src/Core/Ai/Generic/Value/RangeValues.h
similarity index 100%
rename from src/strategy/values/RangeValues.h
rename to src/Core/Ai/Generic/Value/RangeValues.h
diff --git a/src/strategy/values/RtiTargetValue.cpp b/src/Core/Ai/Generic/Value/RtiTargetValue.cpp
similarity index 100%
rename from src/strategy/values/RtiTargetValue.cpp
rename to src/Core/Ai/Generic/Value/RtiTargetValue.cpp
diff --git a/src/strategy/values/RtiTargetValue.h b/src/Core/Ai/Generic/Value/RtiTargetValue.h
similarity index 100%
rename from src/strategy/values/RtiTargetValue.h
rename to src/Core/Ai/Generic/Value/RtiTargetValue.h
diff --git a/src/strategy/values/RtiValue.cpp b/src/Core/Ai/Generic/Value/RtiValue.cpp
similarity index 100%
rename from src/strategy/values/RtiValue.cpp
rename to src/Core/Ai/Generic/Value/RtiValue.cpp
diff --git a/src/strategy/values/RtiValue.h b/src/Core/Ai/Generic/Value/RtiValue.h
similarity index 100%
rename from src/strategy/values/RtiValue.h
rename to src/Core/Ai/Generic/Value/RtiValue.h
diff --git a/src/strategy/values/SelfTargetValue.cpp b/src/Core/Ai/Generic/Value/SelfTargetValue.cpp
similarity index 100%
rename from src/strategy/values/SelfTargetValue.cpp
rename to src/Core/Ai/Generic/Value/SelfTargetValue.cpp
diff --git a/src/strategy/values/SelfTargetValue.h b/src/Core/Ai/Generic/Value/SelfTargetValue.h
similarity index 100%
rename from src/strategy/values/SelfTargetValue.h
rename to src/Core/Ai/Generic/Value/SelfTargetValue.h
diff --git a/src/strategy/values/SkipSpellsListValue.cpp b/src/Core/Ai/Generic/Value/SkipSpellsListValue.cpp
similarity index 100%
rename from src/strategy/values/SkipSpellsListValue.cpp
rename to src/Core/Ai/Generic/Value/SkipSpellsListValue.cpp
diff --git a/src/strategy/values/SkipSpellsListValue.h b/src/Core/Ai/Generic/Value/SkipSpellsListValue.h
similarity index 100%
rename from src/strategy/values/SkipSpellsListValue.h
rename to src/Core/Ai/Generic/Value/SkipSpellsListValue.h
diff --git a/src/strategy/values/SnareTargetValue.cpp b/src/Core/Ai/Generic/Value/SnareTargetValue.cpp
similarity index 100%
rename from src/strategy/values/SnareTargetValue.cpp
rename to src/Core/Ai/Generic/Value/SnareTargetValue.cpp
diff --git a/src/strategy/values/SnareTargetValue.h b/src/Core/Ai/Generic/Value/SnareTargetValue.h
similarity index 100%
rename from src/strategy/values/SnareTargetValue.h
rename to src/Core/Ai/Generic/Value/SnareTargetValue.h
diff --git a/src/strategy/values/SpellCastUsefulValue.cpp b/src/Core/Ai/Generic/Value/SpellCastUsefulValue.cpp
similarity index 100%
rename from src/strategy/values/SpellCastUsefulValue.cpp
rename to src/Core/Ai/Generic/Value/SpellCastUsefulValue.cpp
diff --git a/src/strategy/values/SpellCastUsefulValue.h b/src/Core/Ai/Generic/Value/SpellCastUsefulValue.h
similarity index 100%
rename from src/strategy/values/SpellCastUsefulValue.h
rename to src/Core/Ai/Generic/Value/SpellCastUsefulValue.h
diff --git a/src/strategy/values/SpellIdValue.cpp b/src/Core/Ai/Generic/Value/SpellIdValue.cpp
similarity index 100%
rename from src/strategy/values/SpellIdValue.cpp
rename to src/Core/Ai/Generic/Value/SpellIdValue.cpp
diff --git a/src/strategy/values/SpellIdValue.h b/src/Core/Ai/Generic/Value/SpellIdValue.h
similarity index 100%
rename from src/strategy/values/SpellIdValue.h
rename to src/Core/Ai/Generic/Value/SpellIdValue.h
diff --git a/src/strategy/values/Stances.cpp b/src/Core/Ai/Generic/Value/Stances.cpp
similarity index 100%
rename from src/strategy/values/Stances.cpp
rename to src/Core/Ai/Generic/Value/Stances.cpp
diff --git a/src/strategy/values/Stances.h b/src/Core/Ai/Generic/Value/Stances.h
similarity index 100%
rename from src/strategy/values/Stances.h
rename to src/Core/Ai/Generic/Value/Stances.h
diff --git a/src/strategy/values/StatsValues.cpp b/src/Core/Ai/Generic/Value/StatsValues.cpp
similarity index 100%
rename from src/strategy/values/StatsValues.cpp
rename to src/Core/Ai/Generic/Value/StatsValues.cpp
diff --git a/src/strategy/values/StatsValues.h b/src/Core/Ai/Generic/Value/StatsValues.h
similarity index 100%
rename from src/strategy/values/StatsValues.h
rename to src/Core/Ai/Generic/Value/StatsValues.h
diff --git a/src/strategy/values/TankTargetValue.cpp b/src/Core/Ai/Generic/Value/TankTargetValue.cpp
similarity index 100%
rename from src/strategy/values/TankTargetValue.cpp
rename to src/Core/Ai/Generic/Value/TankTargetValue.cpp
diff --git a/src/strategy/values/TankTargetValue.h b/src/Core/Ai/Generic/Value/TankTargetValue.h
similarity index 100%
rename from src/strategy/values/TankTargetValue.h
rename to src/Core/Ai/Generic/Value/TankTargetValue.h
diff --git a/src/strategy/values/TargetValue.cpp b/src/Core/Ai/Generic/Value/TargetValue.cpp
similarity index 100%
rename from src/strategy/values/TargetValue.cpp
rename to src/Core/Ai/Generic/Value/TargetValue.cpp
diff --git a/src/strategy/values/TargetValue.h b/src/Core/Ai/Generic/Value/TargetValue.h
similarity index 100%
rename from src/strategy/values/TargetValue.h
rename to src/Core/Ai/Generic/Value/TargetValue.h
diff --git a/src/strategy/values/ThreatValues.cpp b/src/Core/Ai/Generic/Value/ThreatValues.cpp
similarity index 100%
rename from src/strategy/values/ThreatValues.cpp
rename to src/Core/Ai/Generic/Value/ThreatValues.cpp
diff --git a/src/strategy/values/ThreatValues.h b/src/Core/Ai/Generic/Value/ThreatValues.h
similarity index 100%
rename from src/strategy/values/ThreatValues.h
rename to src/Core/Ai/Generic/Value/ThreatValues.h
diff --git a/src/strategy/values/ValueContext.h b/src/Core/Ai/Generic/ValueContext.h
similarity index 100%
rename from src/strategy/values/ValueContext.h
rename to src/Core/Ai/Generic/ValueContext.h
diff --git a/src/strategy/actions/WorldPacketActionContext.h b/src/Core/Ai/Generic/WorldPacketActionContext.h
similarity index 100%
rename from src/strategy/actions/WorldPacketActionContext.h
rename to src/Core/Ai/Generic/WorldPacketActionContext.h
diff --git a/src/strategy/triggers/WorldPacketTriggerContext.h b/src/Core/Ai/Generic/WorldPacketTriggerContext.h
similarity index 100%
rename from src/strategy/triggers/WorldPacketTriggerContext.h
rename to src/Core/Ai/Generic/WorldPacketTriggerContext.h
diff --git a/src/PlayerbotAI.cpp b/src/Core/Ai/PlayerbotAI.cpp
similarity index 99%
rename from src/PlayerbotAI.cpp
rename to src/Core/Ai/PlayerbotAI.cpp
index eed9c784..8fb3e258 100644
--- a/src/PlayerbotAI.cpp
+++ b/src/Core/Ai/PlayerbotAI.cpp
@@ -38,10 +38,10 @@
 #include "NewRpgStrategy.h"
 #include "ObjectGuid.h"
 #include "ObjectMgr.h"
-#include "PerformanceMonitor.h"
+#include "PerfMonitor.h"
 #include "Player.h"
 #include "PlayerbotAIConfig.h"
-#include "PlayerbotDbStore.h"
+#include "PlayerbotRepository.h"
 #include "PlayerbotMgr.h"
 #include "PlayerbotGuildMgr.h"
 #include "Playerbots.h"
@@ -441,8 +441,8 @@ void PlayerbotAI::UpdateAIInternal([[maybe_unused]] uint32 elapsed, bool minimal
         return;
 
     std::string const mapString = WorldPosition(bot).isOverworld() ? std::to_string(bot->GetMapId()) : "I";
-    PerformanceMonitorOperation* pmo =
-        sPerformanceMonitor->start(PERF_MON_TOTAL, "PlayerbotAI::UpdateAIInternal " + mapString);
+    PerfMonitorOperation* pmo =
+        sPerfMonitor->start(PERF_MON_TOTAL, "PlayerbotAI::UpdateAIInternal " + mapString);
     ExternalEventHelper helper(aiObjectContext);
 
     // chat replies
@@ -1731,7 +1731,7 @@ void PlayerbotAI::ResetStrategies(bool load)
         engines[i]->Init();
 
     // if (load)
-    //     sPlayerbotDbStore->Load(this);
+    //     sPlayerbotRepository->Load(this);
 }
 
 bool PlayerbotAI::IsRanged(Player* player, bool bySpec)
diff --git a/src/PlayerbotAI.h b/src/Core/Ai/PlayerbotAI.h
similarity index 100%
rename from src/PlayerbotAI.h
rename to src/Core/Ai/PlayerbotAI.h
diff --git a/src/PerformanceMonitor.cpp b/src/Core/Debug/PerfMonitor.cpp
similarity index 96%
rename from src/PerformanceMonitor.cpp
rename to src/Core/Debug/PerfMonitor.cpp
index 99b0989a..c6d134ed 100644
--- a/src/PerformanceMonitor.cpp
+++ b/src/Core/Debug/PerfMonitor.cpp
@@ -3,11 +3,11 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "PerformanceMonitor.h"
+#include "PerfMonitor.h"
 
 #include "Playerbots.h"
 
-PerformanceMonitorOperation* PerformanceMonitor::start(PerformanceMetric metric, std::string const name,
+PerfMonitorOperation* PerfMonitor::start(PerformanceMetric metric, std::string const name,
                                                        PerformanceStack* stack)
 {
     if (!sPlayerbotAIConfig->perfMonEnabled)
@@ -45,10 +45,10 @@ PerformanceMonitorOperation* PerformanceMonitor::start(PerformanceMetric metric,
         data[metric][stackName] = pd;
     }
 
-    return new PerformanceMonitorOperation(pd, name, stack);
+    return new PerfMonitorOperation(pd, name, stack);
 }
 
-void PerformanceMonitor::PrintStats(bool perTick, bool fullStack)
+void PerfMonitor::PrintStats(bool perTick, bool fullStack)
 {
     if (data.empty())
         return;
@@ -247,7 +247,7 @@ void PerformanceMonitor::PrintStats(bool perTick, bool fullStack)
     }
 }
 
-void PerformanceMonitor::Reset()
+void PerfMonitor::Reset()
 {
     for (std::map<PerformanceMetric, std::map<std::string, PerformanceData*>>::iterator i = data.begin();
          i != data.end(); ++i)
@@ -265,7 +265,7 @@ void PerformanceMonitor::Reset()
     }
 }
 
-PerformanceMonitorOperation::PerformanceMonitorOperation(PerformanceData* data, std::string const name,
+PerfMonitorOperation::PerfMonitorOperation(PerformanceData* data, std::string const name,
                                                          PerformanceStack* stack)
     : data(data), name(name), stack(stack)
 {
@@ -273,7 +273,7 @@ PerformanceMonitorOperation::PerformanceMonitorOperation(PerformanceData* data,
                   .time_since_epoch();
 }
 
-void PerformanceMonitorOperation::finish()
+void PerfMonitorOperation::finish()
 {
     std::chrono::microseconds finished =
         (std::chrono::time_point_cast<std::chrono::microseconds>(std::chrono::high_resolution_clock::now()))
diff --git a/src/PerformanceMonitor.h b/src/Core/Debug/PerfMonitor.h
similarity index 72%
rename from src/PerformanceMonitor.h
rename to src/Core/Debug/PerfMonitor.h
index 290cec55..0d3eb8aa 100644
--- a/src/PerformanceMonitor.h
+++ b/src/Core/Debug/PerfMonitor.h
@@ -34,10 +34,10 @@ enum PerformanceMetric
     PERF_MON_TOTAL
 };
 
-class PerformanceMonitorOperation
+class PerfMonitorOperation
 {
 public:
-    PerformanceMonitorOperation(PerformanceData* data, std::string const name, PerformanceStack* stack);
+    PerfMonitorOperation(PerformanceData* data, std::string const name, PerformanceStack* stack);
     void finish();
 
 private:
@@ -47,19 +47,19 @@ private:
     std::chrono::microseconds started;
 };
 
-class PerformanceMonitor
+class PerfMonitor
 {
 public:
-    PerformanceMonitor(){};
-    virtual ~PerformanceMonitor(){};
-    static PerformanceMonitor* instance()
+    PerfMonitor(){};
+    virtual ~PerfMonitor(){};
+    static PerfMonitor* instance()
     {
-        static PerformanceMonitor instance;
+        static PerfMonitor instance;
         return &instance;
     }
 
 public:
-    PerformanceMonitorOperation* start(PerformanceMetric metric, std::string const name,
+    PerfMonitorOperation* start(PerformanceMetric metric, std::string const name,
                                        PerformanceStack* stack = nullptr);
     void PrintStats(bool perTick = false, bool fullStack = false);
     void Reset();
@@ -69,6 +69,6 @@ private:
     std::mutex lock;
 };
 
-#define sPerformanceMonitor PerformanceMonitor::instance()
+#define sPerfMonitor PerfMonitor::instance()
 
 #endif
diff --git a/src/ChatFilter.cpp b/src/Core/Listener/ChatFilter.cpp
similarity index 100%
rename from src/ChatFilter.cpp
rename to src/Core/Listener/ChatFilter.cpp
diff --git a/src/ChatFilter.h b/src/Core/Listener/ChatFilter.h
similarity index 100%
rename from src/ChatFilter.h
rename to src/Core/Listener/ChatFilter.h
diff --git a/src/ChatHelper.cpp b/src/Core/Listener/ChatHelper.cpp
similarity index 100%
rename from src/ChatHelper.cpp
rename to src/Core/Listener/ChatHelper.cpp
diff --git a/src/ChatHelper.h b/src/Core/Listener/ChatHelper.h
similarity index 100%
rename from src/ChatHelper.h
rename to src/Core/Listener/ChatHelper.h
diff --git a/src/factory/PlayerbotFactory.cpp b/src/Core/Manager/Playerbot/Factory/PlayerbotFactory.cpp
similarity index 98%
rename from src/factory/PlayerbotFactory.cpp
rename to src/Core/Manager/Playerbot/Factory/PlayerbotFactory.cpp
index af2975a5..67f5909c 100644
--- a/src/factory/PlayerbotFactory.cpp
+++ b/src/Core/Manager/Playerbot/Factory/PlayerbotFactory.cpp
@@ -24,12 +24,12 @@
 #include "LootMgr.h"
 #include "MapMgr.h"
 #include "ObjectMgr.h"
-#include "PerformanceMonitor.h"
+#include "PerfMonitor.h"
 #include "PetDefines.h"
 #include "Player.h"
 #include "PlayerbotAI.h"
 #include "PlayerbotAIConfig.h"
-#include "PlayerbotDbStore.h"
+#include "PlayerbotRepository.h"
 #include "PlayerbotGuildMgr.h"
 #include "Playerbots.h"
 #include "QuestDef.h"
@@ -240,7 +240,7 @@ void PlayerbotFactory::Randomize(bool incremental)
     // LOG_DEBUG("playerbots", "Preparing to {} randomize...", (incremental ? "incremental" : "full"));
     Prepare();
     LOG_DEBUG("playerbots", "Resetting player...");
-    PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Reset");
+    PerfMonitorOperation* pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Reset");
     if (!sPlayerbotAIConfig->equipmentPersistence || level < sPlayerbotAIConfig->equipmentPersistenceLevel)
     {
         bot->resetTalents(true);
@@ -266,7 +266,7 @@ void PlayerbotFactory::Randomize(bool incremental)
     if (pmo)
         pmo->finish();
 
-    // pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Immersive");
+    // pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Immersive");
     // LOG_INFO("playerbots", "Initializing immersive...");
     // InitImmersive();
     // if (pmo)
@@ -274,7 +274,7 @@ void PlayerbotFactory::Randomize(bool incremental)
 
     if (sPlayerbotAIConfig->randomBotPreQuests)
     {
-        pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Quests");
+        pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Quests");
         InitInstanceQuests();
         InitAttunementQuests();
         if (pmo)
@@ -282,27 +282,27 @@ void PlayerbotFactory::Randomize(bool incremental)
     }
     else
     {
-        pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Quests");
+        pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Quests");
         InitAttunementQuests();
         if (pmo)
             pmo->finish();
     }
 
     LOG_DEBUG("playerbots", "Initializing skills (step 1)...");
-    pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Skills1");
+    pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Skills1");
     bot->LearnDefaultSkills();
     InitSkills();
     if (pmo)
         pmo->finish();
 
-    pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Spells1");
+    pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Spells1");
     LOG_DEBUG("playerbots", "Initializing spells (step 1)...");
     InitClassSpells();
     InitAvailableSpells();
     if (pmo)
         pmo->finish();
 
-    pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Talents");
+    pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Talents");
     LOG_DEBUG("playerbots", "Initializing talents...");
     if (!incremental || !sPlayerbotAIConfig->equipmentPersistence ||
         bot->GetLevel() < sPlayerbotAIConfig->equipmentPersistenceLevel)
@@ -312,45 +312,45 @@ void PlayerbotFactory::Randomize(bool incremental)
     sRandomPlayerbotMgr->SetValue(bot->GetGUID().GetCounter(), "specNo", 0);
     if (botAI)
     {
-        sPlayerbotDbStore->Reset(botAI);
+        sPlayerbotRepository->Reset(botAI);
         // botAI->DoSpecificAction("auto talents");
         botAI->ResetStrategies(false);  // fix wrong stored strategy
     }
     if (pmo)
         pmo->finish();
 
-    pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Spells2");
+    pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Spells2");
     LOG_DEBUG("playerbots", "Initializing spells (step 2)...");
     InitAvailableSpells();
     if (pmo)
         pmo->finish();
 
-    pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Reputation");
+    pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Reputation");
     LOG_DEBUG("playerbots", "Initializing reputation...");
     InitReputation();
     if (pmo)
         pmo->finish();
 
     LOG_DEBUG("playerbots", "Initializing special spells...");
-    pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Spells3");
+    pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Spells3");
     InitSpecialSpells();
     if (pmo)
         pmo->finish();
 
-    pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Mounts");
+    pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Mounts");
     LOG_DEBUG("playerbots", "Initializing mounts...");
     InitMounts();
     // bot->SaveToDB(false, false);
     if (pmo)
         pmo->finish();
 
-    // pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Skills2");
+    // pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Skills2");
     // LOG_INFO("playerbots", "Initializing skills (step 2)...");
     // UpdateTradeSkills();
     // if (pmo)
     //     pmo->finish();
 
-    pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Equip");
+    pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Equip");
     LOG_DEBUG("playerbots", "Initializing equipmemt...");
     if (!incremental || !sPlayerbotAIConfig->equipmentPersistence ||
         bot->GetLevel() < sPlayerbotAIConfig->equipmentPersistenceLevel)
@@ -364,51 +364,51 @@ void PlayerbotFactory::Randomize(bool incremental)
 
     // if (bot->GetLevel() >= sPlayerbotAIConfig->minEnchantingBotLevel)
     // {
-    //     pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Enchant");
+    //     pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Enchant");
     //     LOG_INFO("playerbots", "Initializing enchant templates...");
     //     LoadEnchantContainer();
     //     if (pmo)
     //         pmo->finish();
     // }
 
-    pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Bags");
+    pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Bags");
     LOG_DEBUG("playerbots", "Initializing bags...");
     InitBags();
     // bot->SaveToDB(false, false);
     if (pmo)
         pmo->finish();
 
-    pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Ammo");
+    pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Ammo");
     LOG_DEBUG("playerbots", "Initializing ammo...");
     InitAmmo();
     if (pmo)
         pmo->finish();
 
-    pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Food");
+    pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Food");
     LOG_DEBUG("playerbots", "Initializing food...");
     InitFood();
     if (pmo)
         pmo->finish();
 
-    pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Potions");
+    pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Potions");
     LOG_DEBUG("playerbots", "Initializing potions...");
     InitPotions();
     if (pmo)
         pmo->finish();
 
-    pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Reagents");
+    pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Reagents");
     LOG_DEBUG("playerbots", "Initializing reagents...");
     InitReagents();
     if (pmo)
         pmo->finish();
 
-    pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Keys");
+    pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Keys");
     LOG_DEBUG("playerbots", "Initializing keys...");
     InitKeyring();
     if (pmo)
         pmo->finish();
 
-    // pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_EqSets");
+    // pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_EqSets");
     // LOG_DEBUG("playerbots", "Initializing second equipment set...");
     //    InitSecondEquipmentSet();
     // if (pmo)
@@ -419,20 +419,20 @@ void PlayerbotFactory::Randomize(bool incremental)
         ApplyEnchantAndGemsNew();
     }
     // {
-    // pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_EnchantTemplate");
+    // pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_EnchantTemplate");
     // LOG_INFO("playerbots", "Initializing enchant templates...");
     // ApplyEnchantTemplate();
     // if (pmo)
     //     pmo->finish();
     // }
 
-    pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Inventory");
+    pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Inventory");
     LOG_DEBUG("playerbots", "Initializing inventory...");
     // InitInventory();
     if (pmo)
         pmo->finish();
 
-    pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Consumable");
+    pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Consumable");
     LOG_DEBUG("playerbots", "Initializing consumables...");
     InitConsumables();
     if (pmo)
@@ -442,7 +442,7 @@ void PlayerbotFactory::Randomize(bool incremental)
     InitGlyphs();
     // bot->SaveToDB(false, false);
 
-    pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Guilds");
+    pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Guilds");
     // bot->SaveToDB(false, false);
     if (sPlayerbotAIConfig->randomBotGuildCount > 0)
     {
@@ -455,7 +455,7 @@ void PlayerbotFactory::Randomize(bool incremental)
 
     if (bot->GetLevel() >= 70)
     {
-        pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Arenas");
+        pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Arenas");
         // LOG_INFO("playerbots", "Initializing arena teams...");
         InitArenaTeam();
         if (pmo)
@@ -470,7 +470,7 @@ void PlayerbotFactory::Randomize(bool incremental)
     }
     if (bot->GetLevel() >= 10)
     {
-        pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Pet");
+        pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Pet");
         LOG_DEBUG("playerbots", "Initializing pet...");
         InitPet();
         // bot->SaveToDB(false, false);
@@ -479,7 +479,7 @@ void PlayerbotFactory::Randomize(bool incremental)
             pmo->finish();
     }
 
-    pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Save");
+    pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "PlayerbotFactory_Save");
     LOG_DEBUG("playerbots", "Saving to DB...");
     bot->SetMoney(urand(level * 100000, level * 5 * 100000));
     bot->SetHealth(bot->GetMaxHealth());
diff --git a/src/factory/PlayerbotFactory.h b/src/Core/Manager/Playerbot/Factory/PlayerbotFactory.h
similarity index 100%
rename from src/factory/PlayerbotFactory.h
rename to src/Core/Manager/Playerbot/Factory/PlayerbotFactory.h
diff --git a/src/PlayerbotMgr.cpp b/src/Core/Manager/Playerbot/PlayerbotMgr.cpp
similarity index 99%
rename from src/PlayerbotMgr.cpp
rename to src/Core/Manager/Playerbot/PlayerbotMgr.cpp
index ae3d4e1b..e01afb0f 100644
--- a/src/PlayerbotMgr.cpp
+++ b/src/Core/Manager/Playerbot/PlayerbotMgr.cpp
@@ -26,7 +26,7 @@
 #include "ObjectGuid.h"
 #include "ObjectMgr.h"
 #include "PlayerbotAIConfig.h"
-#include "PlayerbotDbStore.h"
+#include "PlayerbotRepository.h"
 #include "PlayerbotFactory.h"
 #include "PlayerbotOperations.h"
 #include "PlayerbotSecurity.h"
@@ -442,7 +442,7 @@ void PlayerbotHolder::DisablePlayerBot(ObjectGuid guid)
         Group* group = bot->GetGroup();
         if (group && !bot->InBattleground() && !bot->InBattlegroundQueue() && botAI->HasActivePlayerMaster())
         {
-            sPlayerbotDbStore->Save(botAI);
+            sPlayerbotRepository->Save(botAI);
         }
 
         LOG_DEBUG("playerbots", "Bot {} logged out", bot->GetName().c_str());
@@ -554,7 +554,7 @@ void PlayerbotHolder::OnBotLogin(Player* const bot)
     {
         botAI->ResetStrategies(!sRandomPlayerbotMgr->IsRandomBot(bot));
     }
-    sPlayerbotDbStore->Load(botAI);
+    sPlayerbotRepository->Load(botAI);
 
     if (master && !master->HasUnitState(UNIT_STATE_IN_FLIGHT))
     {
diff --git a/src/PlayerbotMgr.h b/src/Core/Manager/Playerbot/PlayerbotMgr.h
similarity index 100%
rename from src/PlayerbotMgr.h
rename to src/Core/Manager/Playerbot/PlayerbotMgr.h
diff --git a/src/RandomPlayerbotFactory.cpp b/src/Core/Manager/Worldbot/Factory/RandomPlayerbotFactory.cpp
similarity index 100%
rename from src/RandomPlayerbotFactory.cpp
rename to src/Core/Manager/Worldbot/Factory/RandomPlayerbotFactory.cpp
diff --git a/src/RandomPlayerbotFactory.h b/src/Core/Manager/Worldbot/Factory/RandomPlayerbotFactory.h
similarity index 100%
rename from src/RandomPlayerbotFactory.h
rename to src/Core/Manager/Worldbot/Factory/RandomPlayerbotFactory.h
diff --git a/src/PlayerbotCommandServer.cpp b/src/Core/Manager/Worldbot/PlayerbotCommandServer.cpp
similarity index 100%
rename from src/PlayerbotCommandServer.cpp
rename to src/Core/Manager/Worldbot/PlayerbotCommandServer.cpp
diff --git a/src/PlayerbotCommandServer.h b/src/Core/Manager/Worldbot/PlayerbotCommandServer.h
similarity index 100%
rename from src/PlayerbotCommandServer.h
rename to src/Core/Manager/Worldbot/PlayerbotCommandServer.h
diff --git a/src/RandomPlayerbotMgr.cpp b/src/Core/Manager/Worldbot/RandomPlayerbotMgr.cpp
similarity index 99%
rename from src/RandomPlayerbotMgr.cpp
rename to src/Core/Manager/Worldbot/RandomPlayerbotMgr.cpp
index c087276f..0e579fb4 100644
--- a/src/RandomPlayerbotMgr.cpp
+++ b/src/Core/Manager/Worldbot/RandomPlayerbotMgr.cpp
@@ -35,7 +35,7 @@
 #include "NewRpgInfo.h"
 #include "NewRpgStrategy.h"
 #include "ObjectGuid.h"
-#include "PerformanceMonitor.h"
+#include "PerfMonitor.h"
 #include "Player.h"
 #include "PlayerbotAI.h"
 #include "PlayerbotAIConfig.h"
@@ -358,7 +358,7 @@ void RandomPlayerbotMgr::UpdateAIInternal(uint32 elapsed, bool /*minimal*/)
     if (totalPmo)
         totalPmo->finish();
 
-    totalPmo = sPerformanceMonitor->start(PERF_MON_TOTAL, "RandomPlayerbotMgr::FullTick");
+    totalPmo = sPerfMonitor->start(PERF_MON_TOTAL, "RandomPlayerbotMgr::FullTick");
 
     if (!sPlayerbotAIConfig->randomBotAutologin || !sPlayerbotAIConfig->enabled)
         return;
@@ -401,7 +401,7 @@ void RandomPlayerbotMgr::UpdateAIInternal(uint32 elapsed, bool /*minimal*/)
     uint32 updateIntervalTurboBoost = _isBotInitializing ? 1 : sPlayerbotAIConfig->randomBotUpdateInterval;
     SetNextCheckDelay(updateIntervalTurboBoost * (onlineBotFocus + 25) * 10);
 
-    PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(
+    PerfMonitorOperation* pmo = sPerfMonitor->start(
         PERF_MON_TOTAL,
         onlineBotCount < maxAllowedBotCount ? "RandomPlayerbotMgr::Login" : "RandomPlayerbotMgr::UpdateAIInternal");
 
@@ -1707,7 +1707,7 @@ void RandomPlayerbotMgr::RandomTeleport(Player* bot, std::vector<WorldLocation>&
         return;
     }
 
-    PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "RandomTeleportByLocations");
+    PerfMonitorOperation* pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "RandomTeleportByLocations");
 
     std::shuffle(std::begin(tlocs), std::end(tlocs), RandomEngine::Instance());
     for (uint32 i = 0; i < tlocs.size(); i++)
@@ -2300,7 +2300,7 @@ void RandomPlayerbotMgr::RandomTeleport(Player* bot)
     if (bot->InBattleground())
         return;
 
-    PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "RandomTeleport");
+    PerfMonitorOperation* pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "RandomTeleport");
     std::vector<WorldLocation> locs;
 
     std::list<Unit*> targets;
@@ -2362,7 +2362,7 @@ void RandomPlayerbotMgr::IncreaseLevel(Player* bot)
     if (maxLevel > sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL))
         maxLevel = sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL);
 
-    PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "IncreaseLevel");
+    PerfMonitorOperation* pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "IncreaseLevel");
     uint32 lastLevel = GetValue(bot, "level");
     uint8 level = bot->GetLevel() + 1;
     if (level > maxLevel)
@@ -2401,7 +2401,7 @@ void RandomPlayerbotMgr::RandomizeFirst(Player* bot)
         minLevel = std::max(minLevel, sWorld->getIntConfig(CONFIG_START_HEROIC_PLAYER_LEVEL));
     }
 
-    PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "RandomizeFirst");
+    PerfMonitorOperation* pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "RandomizeFirst");
 
     uint32 level;
 
@@ -2480,7 +2480,7 @@ void RandomPlayerbotMgr::RandomizeMin(Player* bot)
     if (!botAI)
         return;
 
-    PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "RandomizeMin");
+    PerfMonitorOperation* pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "RandomizeMin");
     uint32 level = sPlayerbotAIConfig->randomBotMinLevel;
     SetValue(bot, "level", level);
     PlayerbotFactory factory(bot, level);
@@ -2569,7 +2569,7 @@ void RandomPlayerbotMgr::Refresh(Player* bot)
 
     LOG_DEBUG("playerbots", "Refreshing bot {} <{}>", bot->GetGUID().ToString().c_str(), bot->GetName().c_str());
 
-    PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "Refresh");
+    PerfMonitorOperation* pmo = sPerfMonitor->start(PERF_MON_RNDBOT, "Refresh");
 
     botAI->Reset();
 
diff --git a/src/RandomPlayerbotMgr.h b/src/Core/Manager/Worldbot/RandomPlayerbotMgr.h
similarity index 99%
rename from src/RandomPlayerbotMgr.h
rename to src/Core/Manager/Worldbot/RandomPlayerbotMgr.h
index d65a59c9..d3178345 100644
--- a/src/RandomPlayerbotMgr.h
+++ b/src/Core/Manager/Worldbot/RandomPlayerbotMgr.h
@@ -43,7 +43,7 @@ struct BattlegroundInfo
 };
 
 class ChatHandler;
-class PerformanceMonitorOperation;
+class PerfMonitorOperation;
 class WorldLocation;
 
 struct CachedEvent
diff --git a/src/cs_playerbots.cpp b/src/Core/ScriptHook/PlayerbotCommandScript.cpp
similarity index 95%
rename from src/cs_playerbots.cpp
rename to src/Core/ScriptHook/PlayerbotCommandScript.cpp
index b0b7aa9a..4e3c5611 100644
--- a/src/cs_playerbots.cpp
+++ b/src/Core/ScriptHook/PlayerbotCommandScript.cpp
@@ -16,7 +16,7 @@
 #include "BattleGroundTactics.h"
 #include "Chat.h"
 #include "GuildTaskMgr.h"
-#include "PerformanceMonitor.h"
+#include "PerfMonitor.h"
 #include "PlayerbotMgr.h"
 #include "RandomPlayerbotMgr.h"
 #include "ScriptMgr.h"
@@ -76,19 +76,19 @@ public:
     {
         if (!strcmp(args, "reset"))
         {
-            sPerformanceMonitor->Reset();
+            sPerfMonitor->Reset();
             return true;
         }
 
         if (!strcmp(args, "tick"))
         {
-            sPerformanceMonitor->PrintStats(true, false);
+            sPerfMonitor->PrintStats(true, false);
             return true;
         }
 
         if (!strcmp(args, "stack"))
         {
-            sPerformanceMonitor->PrintStats(false, true);
+            sPerfMonitor->PrintStats(false, true);
             return true;
         }
 
@@ -102,7 +102,7 @@ public:
             return true;
         }
 
-        sPerformanceMonitor->PrintStats();
+        sPerfMonitor->PrintStats();
         return true;
     }
 
@@ -209,4 +209,4 @@ public:
     }
 };
 
-void AddSC_playerbots_commandscript() { new playerbots_commandscript(); }
+void AddPlayerbotsCommandscripts() { new playerbots_commandscript(); }
diff --git a/src/Core/ScriptHook/PlayerbotCommandScript.h b/src/Core/ScriptHook/PlayerbotCommandScript.h
new file mode 100644
index 00000000..f17ae7ec
--- /dev/null
+++ b/src/Core/ScriptHook/PlayerbotCommandScript.h
@@ -0,0 +1 @@
+void AddPlayerbotsCommandscripts();
diff --git a/src/Playerbots.cpp b/src/Core/ScriptHook/Playerbots.cpp
similarity index 99%
rename from src/Playerbots.cpp
rename to src/Core/ScriptHook/Playerbots.cpp
index 97e72e42..8a8e1e0b 100644
--- a/src/Playerbots.cpp
+++ b/src/Core/ScriptHook/Playerbots.cpp
@@ -26,11 +26,11 @@
 #include "PlayerScript.h"
 #include "PlayerbotAIConfig.h"
 #include "PlayerbotGuildMgr.h"
-#include "PlayerbotSpellCache.h"
+#include "PlayerbotSpellRepository.h"
 #include "PlayerbotWorldThreadProcessor.h"
 #include "RandomPlayerbotMgr.h"
 #include "ScriptMgr.h"
-#include "cs_playerbots.h"
+#include "PlayerbotCommandScript.h"
 #include "cmath"
 #include "BattleGroundTactics.h"
 
@@ -365,7 +365,7 @@ public:
         LOG_INFO("server.loading", ">> Loaded playerbots config in {} ms", GetMSTimeDiffToNow(oldMSTime));
         LOG_INFO("server.loading", " ");
 
-        sPlayerbotSpellCache->Initialize();
+        sPlayerbotSpellRepository->Initialize();
 
         LOG_INFO("server.loading", "Playerbots World Thread Processor initialized");
     }
@@ -515,6 +515,6 @@ void AddPlayerbotsScripts()
     new PlayerbotsScript();
     new PlayerBotsBGScript();
     AddPlayerbotsSecureLoginScripts();
-    AddSC_playerbots_commandscript();
+    AddPlayerbotsCommandscripts();
     PlayerBotsGuildValidationScript();
 }
diff --git a/src/Playerbots.h b/src/Core/ScriptHook/Playerbots.h
similarity index 100%
rename from src/Playerbots.h
rename to src/Core/ScriptHook/Playerbots.h
diff --git a/src/PlayerbotsSecureLogin.cpp b/src/Core/ScriptHook/PlayerbotsSecureLogin.cpp
similarity index 100%
rename from src/PlayerbotsSecureLogin.cpp
rename to src/Core/ScriptHook/PlayerbotsSecureLogin.cpp
diff --git a/src/PlayerbotOperation.h b/src/Core/ScriptHook/WorldThread/PlayerbotOperation.h
similarity index 100%
rename from src/PlayerbotOperation.h
rename to src/Core/ScriptHook/WorldThread/PlayerbotOperation.h
diff --git a/src/PlayerbotOperations.h b/src/Core/ScriptHook/WorldThread/PlayerbotOperations.h
similarity index 99%
rename from src/PlayerbotOperations.h
rename to src/Core/ScriptHook/WorldThread/PlayerbotOperations.h
index 8711f346..cd885190 100644
--- a/src/PlayerbotOperations.h
+++ b/src/Core/ScriptHook/WorldThread/PlayerbotOperations.h
@@ -15,7 +15,7 @@
 #include "Player.h"
 #include "PlayerbotAI.h"
 #include "PlayerbotMgr.h"
-#include "PlayerbotDbStore.h"
+#include "PlayerbotRepository.h"
 #include "RandomPlayerbotMgr.h"
 #include "WorldSession.h"
 #include "WorldSessionMgr.h"
@@ -418,7 +418,7 @@ public:
 
         Group* group = bot->GetGroup();
         if (group && !bot->InBattleground() && !bot->InBattlegroundQueue() && botAI->HasActivePlayerMaster())
-            sPlayerbotDbStore->Save(botAI);
+            sPlayerbotRepository->Save(botAI);
 
         return true;
     }
diff --git a/src/PlayerbotWorldThreadProcessor.cpp b/src/Core/ScriptHook/WorldThread/PlayerbotWorldThreadProcessor.cpp
similarity index 100%
rename from src/PlayerbotWorldThreadProcessor.cpp
rename to src/Core/ScriptHook/WorldThread/PlayerbotWorldThreadProcessor.cpp
diff --git a/src/PlayerbotWorldThreadProcessor.h b/src/Core/ScriptHook/WorldThread/PlayerbotWorldThreadProcessor.h
similarity index 100%
rename from src/PlayerbotWorldThreadProcessor.h
rename to src/Core/ScriptHook/WorldThread/PlayerbotWorldThreadProcessor.h
diff --git a/src/strategy/Queue.cpp b/src/Core/ScriptHook/WorldThread/Queue.cpp
similarity index 100%
rename from src/strategy/Queue.cpp
rename to src/Core/ScriptHook/WorldThread/Queue.cpp
diff --git a/src/strategy/Queue.h b/src/Core/ScriptHook/WorldThread/Queue.h
similarity index 100%
rename from src/strategy/Queue.h
rename to src/Core/ScriptHook/WorldThread/Queue.h
diff --git a/src/playerbots_loader.cpp b/src/Core/ScriptHook/playerbots_loader.cpp
similarity index 100%
rename from src/playerbots_loader.cpp
rename to src/Core/ScriptHook/playerbots_loader.cpp
diff --git a/src/strategy/deathknight/DKActions.cpp b/src/Extend/ClassAi/DeathKnight/Action/DKActions.cpp
similarity index 100%
rename from src/strategy/deathknight/DKActions.cpp
rename to src/Extend/ClassAi/DeathKnight/Action/DKActions.cpp
diff --git a/src/strategy/deathknight/DKActions.h b/src/Extend/ClassAi/DeathKnight/Action/DKActions.h
similarity index 100%
rename from src/strategy/deathknight/DKActions.h
rename to src/Extend/ClassAi/DeathKnight/Action/DKActions.h
diff --git a/src/strategy/deathknight/DKAiObjectContext.cpp b/src/Extend/ClassAi/DeathKnight/DKAiObjectContext.cpp
similarity index 100%
rename from src/strategy/deathknight/DKAiObjectContext.cpp
rename to src/Extend/ClassAi/DeathKnight/DKAiObjectContext.cpp
diff --git a/src/strategy/deathknight/DKAiObjectContext.h b/src/Extend/ClassAi/DeathKnight/DKAiObjectContext.h
similarity index 100%
rename from src/strategy/deathknight/DKAiObjectContext.h
rename to src/Extend/ClassAi/DeathKnight/DKAiObjectContext.h
diff --git a/src/strategy/deathknight/BloodDKStrategy.cpp b/src/Extend/ClassAi/DeathKnight/Strategy/BloodDKStrategy.cpp
similarity index 100%
rename from src/strategy/deathknight/BloodDKStrategy.cpp
rename to src/Extend/ClassAi/DeathKnight/Strategy/BloodDKStrategy.cpp
diff --git a/src/strategy/deathknight/BloodDKStrategy.h b/src/Extend/ClassAi/DeathKnight/Strategy/BloodDKStrategy.h
similarity index 100%
rename from src/strategy/deathknight/BloodDKStrategy.h
rename to src/Extend/ClassAi/DeathKnight/Strategy/BloodDKStrategy.h
diff --git a/src/strategy/deathknight/FrostDKStrategy.cpp b/src/Extend/ClassAi/DeathKnight/Strategy/FrostDKStrategy.cpp
similarity index 100%
rename from src/strategy/deathknight/FrostDKStrategy.cpp
rename to src/Extend/ClassAi/DeathKnight/Strategy/FrostDKStrategy.cpp
diff --git a/src/strategy/deathknight/FrostDKStrategy.h b/src/Extend/ClassAi/DeathKnight/Strategy/FrostDKStrategy.h
similarity index 100%
rename from src/strategy/deathknight/FrostDKStrategy.h
rename to src/Extend/ClassAi/DeathKnight/Strategy/FrostDKStrategy.h
diff --git a/src/strategy/deathknight/GenericDKNonCombatStrategy.cpp b/src/Extend/ClassAi/DeathKnight/Strategy/GenericDKNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/deathknight/GenericDKNonCombatStrategy.cpp
rename to src/Extend/ClassAi/DeathKnight/Strategy/GenericDKNonCombatStrategy.cpp
diff --git a/src/strategy/deathknight/GenericDKNonCombatStrategy.h b/src/Extend/ClassAi/DeathKnight/Strategy/GenericDKNonCombatStrategy.h
similarity index 100%
rename from src/strategy/deathknight/GenericDKNonCombatStrategy.h
rename to src/Extend/ClassAi/DeathKnight/Strategy/GenericDKNonCombatStrategy.h
diff --git a/src/strategy/deathknight/GenericDKStrategy.cpp b/src/Extend/ClassAi/DeathKnight/Strategy/GenericDKStrategy.cpp
similarity index 100%
rename from src/strategy/deathknight/GenericDKStrategy.cpp
rename to src/Extend/ClassAi/DeathKnight/Strategy/GenericDKStrategy.cpp
diff --git a/src/strategy/deathknight/GenericDKStrategy.h b/src/Extend/ClassAi/DeathKnight/Strategy/GenericDKStrategy.h
similarity index 100%
rename from src/strategy/deathknight/GenericDKStrategy.h
rename to src/Extend/ClassAi/DeathKnight/Strategy/GenericDKStrategy.h
diff --git a/src/strategy/deathknight/UnholyDKStrategy.cpp b/src/Extend/ClassAi/DeathKnight/Strategy/UnholyDKStrategy.cpp
similarity index 100%
rename from src/strategy/deathknight/UnholyDKStrategy.cpp
rename to src/Extend/ClassAi/DeathKnight/Strategy/UnholyDKStrategy.cpp
diff --git a/src/strategy/deathknight/UnholyDKStrategy.h b/src/Extend/ClassAi/DeathKnight/Strategy/UnholyDKStrategy.h
similarity index 100%
rename from src/strategy/deathknight/UnholyDKStrategy.h
rename to src/Extend/ClassAi/DeathKnight/Strategy/UnholyDKStrategy.h
diff --git a/src/strategy/deathknight/DKTriggers.cpp b/src/Extend/ClassAi/DeathKnight/Trigger/DKTriggers.cpp
similarity index 100%
rename from src/strategy/deathknight/DKTriggers.cpp
rename to src/Extend/ClassAi/DeathKnight/Trigger/DKTriggers.cpp
diff --git a/src/strategy/deathknight/DKTriggers.h b/src/Extend/ClassAi/DeathKnight/Trigger/DKTriggers.h
similarity index 100%
rename from src/strategy/deathknight/DKTriggers.h
rename to src/Extend/ClassAi/DeathKnight/Trigger/DKTriggers.h
diff --git a/src/strategy/druid/DruidActions.cpp b/src/Extend/ClassAi/Druid/Action/DruidActions.cpp
similarity index 100%
rename from src/strategy/druid/DruidActions.cpp
rename to src/Extend/ClassAi/Druid/Action/DruidActions.cpp
diff --git a/src/strategy/druid/DruidActions.h b/src/Extend/ClassAi/Druid/Action/DruidActions.h
similarity index 100%
rename from src/strategy/druid/DruidActions.h
rename to src/Extend/ClassAi/Druid/Action/DruidActions.h
diff --git a/src/strategy/druid/DruidBearActions.cpp b/src/Extend/ClassAi/Druid/Action/DruidBearActions.cpp
similarity index 100%
rename from src/strategy/druid/DruidBearActions.cpp
rename to src/Extend/ClassAi/Druid/Action/DruidBearActions.cpp
diff --git a/src/strategy/druid/DruidBearActions.h b/src/Extend/ClassAi/Druid/Action/DruidBearActions.h
similarity index 100%
rename from src/strategy/druid/DruidBearActions.h
rename to src/Extend/ClassAi/Druid/Action/DruidBearActions.h
diff --git a/src/strategy/druid/DruidCatActions.cpp b/src/Extend/ClassAi/Druid/Action/DruidCatActions.cpp
similarity index 100%
rename from src/strategy/druid/DruidCatActions.cpp
rename to src/Extend/ClassAi/Druid/Action/DruidCatActions.cpp
diff --git a/src/strategy/druid/DruidCatActions.h b/src/Extend/ClassAi/Druid/Action/DruidCatActions.h
similarity index 100%
rename from src/strategy/druid/DruidCatActions.h
rename to src/Extend/ClassAi/Druid/Action/DruidCatActions.h
diff --git a/src/strategy/druid/DruidShapeshiftActions.cpp b/src/Extend/ClassAi/Druid/Action/DruidShapeshiftActions.cpp
similarity index 100%
rename from src/strategy/druid/DruidShapeshiftActions.cpp
rename to src/Extend/ClassAi/Druid/Action/DruidShapeshiftActions.cpp
diff --git a/src/strategy/druid/DruidShapeshiftActions.h b/src/Extend/ClassAi/Druid/Action/DruidShapeshiftActions.h
similarity index 100%
rename from src/strategy/druid/DruidShapeshiftActions.h
rename to src/Extend/ClassAi/Druid/Action/DruidShapeshiftActions.h
diff --git a/src/strategy/druid/DruidAiObjectContext.cpp b/src/Extend/ClassAi/Druid/DruidAiObjectContext.cpp
similarity index 100%
rename from src/strategy/druid/DruidAiObjectContext.cpp
rename to src/Extend/ClassAi/Druid/DruidAiObjectContext.cpp
diff --git a/src/strategy/druid/DruidAiObjectContext.h b/src/Extend/ClassAi/Druid/DruidAiObjectContext.h
similarity index 100%
rename from src/strategy/druid/DruidAiObjectContext.h
rename to src/Extend/ClassAi/Druid/DruidAiObjectContext.h
diff --git a/src/strategy/druid/BearTankDruidStrategy.cpp b/src/Extend/ClassAi/Druid/Strategy/BearTankDruidStrategy.cpp
similarity index 100%
rename from src/strategy/druid/BearTankDruidStrategy.cpp
rename to src/Extend/ClassAi/Druid/Strategy/BearTankDruidStrategy.cpp
diff --git a/src/strategy/druid/BearTankDruidStrategy.h b/src/Extend/ClassAi/Druid/Strategy/BearTankDruidStrategy.h
similarity index 100%
rename from src/strategy/druid/BearTankDruidStrategy.h
rename to src/Extend/ClassAi/Druid/Strategy/BearTankDruidStrategy.h
diff --git a/src/strategy/druid/CasterDruidStrategy.cpp b/src/Extend/ClassAi/Druid/Strategy/CasterDruidStrategy.cpp
similarity index 100%
rename from src/strategy/druid/CasterDruidStrategy.cpp
rename to src/Extend/ClassAi/Druid/Strategy/CasterDruidStrategy.cpp
diff --git a/src/strategy/druid/CasterDruidStrategy.h b/src/Extend/ClassAi/Druid/Strategy/CasterDruidStrategy.h
similarity index 100%
rename from src/strategy/druid/CasterDruidStrategy.h
rename to src/Extend/ClassAi/Druid/Strategy/CasterDruidStrategy.h
diff --git a/src/strategy/druid/CatDpsDruidStrategy.cpp b/src/Extend/ClassAi/Druid/Strategy/CatDpsDruidStrategy.cpp
similarity index 100%
rename from src/strategy/druid/CatDpsDruidStrategy.cpp
rename to src/Extend/ClassAi/Druid/Strategy/CatDpsDruidStrategy.cpp
diff --git a/src/strategy/druid/CatDpsDruidStrategy.h b/src/Extend/ClassAi/Druid/Strategy/CatDpsDruidStrategy.h
similarity index 100%
rename from src/strategy/druid/CatDpsDruidStrategy.h
rename to src/Extend/ClassAi/Druid/Strategy/CatDpsDruidStrategy.h
diff --git a/src/strategy/druid/FeralDruidStrategy.cpp b/src/Extend/ClassAi/Druid/Strategy/FeralDruidStrategy.cpp
similarity index 100%
rename from src/strategy/druid/FeralDruidStrategy.cpp
rename to src/Extend/ClassAi/Druid/Strategy/FeralDruidStrategy.cpp
diff --git a/src/strategy/druid/FeralDruidStrategy.h b/src/Extend/ClassAi/Druid/Strategy/FeralDruidStrategy.h
similarity index 100%
rename from src/strategy/druid/FeralDruidStrategy.h
rename to src/Extend/ClassAi/Druid/Strategy/FeralDruidStrategy.h
diff --git a/src/strategy/druid/GenericDruidNonCombatStrategy.cpp b/src/Extend/ClassAi/Druid/Strategy/GenericDruidNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/druid/GenericDruidNonCombatStrategy.cpp
rename to src/Extend/ClassAi/Druid/Strategy/GenericDruidNonCombatStrategy.cpp
diff --git a/src/strategy/druid/GenericDruidNonCombatStrategy.h b/src/Extend/ClassAi/Druid/Strategy/GenericDruidNonCombatStrategy.h
similarity index 100%
rename from src/strategy/druid/GenericDruidNonCombatStrategy.h
rename to src/Extend/ClassAi/Druid/Strategy/GenericDruidNonCombatStrategy.h
diff --git a/src/strategy/druid/GenericDruidStrategy.cpp b/src/Extend/ClassAi/Druid/Strategy/GenericDruidStrategy.cpp
similarity index 100%
rename from src/strategy/druid/GenericDruidStrategy.cpp
rename to src/Extend/ClassAi/Druid/Strategy/GenericDruidStrategy.cpp
diff --git a/src/strategy/druid/GenericDruidStrategy.h b/src/Extend/ClassAi/Druid/Strategy/GenericDruidStrategy.h
similarity index 100%
rename from src/strategy/druid/GenericDruidStrategy.h
rename to src/Extend/ClassAi/Druid/Strategy/GenericDruidStrategy.h
diff --git a/src/strategy/druid/HealDruidStrategy.cpp b/src/Extend/ClassAi/Druid/Strategy/HealDruidStrategy.cpp
similarity index 100%
rename from src/strategy/druid/HealDruidStrategy.cpp
rename to src/Extend/ClassAi/Druid/Strategy/HealDruidStrategy.cpp
diff --git a/src/strategy/druid/HealDruidStrategy.h b/src/Extend/ClassAi/Druid/Strategy/HealDruidStrategy.h
similarity index 100%
rename from src/strategy/druid/HealDruidStrategy.h
rename to src/Extend/ClassAi/Druid/Strategy/HealDruidStrategy.h
diff --git a/src/strategy/druid/MeleeDruidStrategy.cpp b/src/Extend/ClassAi/Druid/Strategy/MeleeDruidStrategy.cpp
similarity index 100%
rename from src/strategy/druid/MeleeDruidStrategy.cpp
rename to src/Extend/ClassAi/Druid/Strategy/MeleeDruidStrategy.cpp
diff --git a/src/strategy/druid/MeleeDruidStrategy.h b/src/Extend/ClassAi/Druid/Strategy/MeleeDruidStrategy.h
similarity index 100%
rename from src/strategy/druid/MeleeDruidStrategy.h
rename to src/Extend/ClassAi/Druid/Strategy/MeleeDruidStrategy.h
diff --git a/src/strategy/druid/OffhealDruidCatStrategy.cpp b/src/Extend/ClassAi/Druid/Strategy/OffhealDruidCatStrategy.cpp
similarity index 100%
rename from src/strategy/druid/OffhealDruidCatStrategy.cpp
rename to src/Extend/ClassAi/Druid/Strategy/OffhealDruidCatStrategy.cpp
diff --git a/src/strategy/druid/OffhealDruidCatStrategy.h b/src/Extend/ClassAi/Druid/Strategy/OffhealDruidCatStrategy.h
similarity index 100%
rename from src/strategy/druid/OffhealDruidCatStrategy.h
rename to src/Extend/ClassAi/Druid/Strategy/OffhealDruidCatStrategy.h
diff --git a/src/strategy/druid/DruidTriggers.cpp b/src/Extend/ClassAi/Druid/Trigger/DruidTriggers.cpp
similarity index 100%
rename from src/strategy/druid/DruidTriggers.cpp
rename to src/Extend/ClassAi/Druid/Trigger/DruidTriggers.cpp
diff --git a/src/strategy/druid/DruidTriggers.h b/src/Extend/ClassAi/Druid/Trigger/DruidTriggers.h
similarity index 100%
rename from src/strategy/druid/DruidTriggers.h
rename to src/Extend/ClassAi/Druid/Trigger/DruidTriggers.h
diff --git a/src/strategy/generic/AttackEnemyPlayersStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/AttackEnemyPlayersStrategy.cpp
similarity index 100%
rename from src/strategy/generic/AttackEnemyPlayersStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/AttackEnemyPlayersStrategy.cpp
diff --git a/src/strategy/generic/AttackEnemyPlayersStrategy.h b/src/Extend/ClassAi/Generic/Strategy/AttackEnemyPlayersStrategy.h
similarity index 100%
rename from src/strategy/generic/AttackEnemyPlayersStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/AttackEnemyPlayersStrategy.h
diff --git a/src/strategy/generic/BattlegroundStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/BattlegroundStrategy.cpp
similarity index 100%
rename from src/strategy/generic/BattlegroundStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/BattlegroundStrategy.cpp
diff --git a/src/strategy/generic/BattlegroundStrategy.h b/src/Extend/ClassAi/Generic/Strategy/BattlegroundStrategy.h
similarity index 100%
rename from src/strategy/generic/BattlegroundStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/BattlegroundStrategy.h
diff --git a/src/strategy/generic/CastTimeStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/CastTimeStrategy.cpp
similarity index 100%
rename from src/strategy/generic/CastTimeStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/CastTimeStrategy.cpp
diff --git a/src/strategy/generic/CastTimeStrategy.h b/src/Extend/ClassAi/Generic/Strategy/CastTimeStrategy.h
similarity index 100%
rename from src/strategy/generic/CastTimeStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/CastTimeStrategy.h
diff --git a/src/strategy/generic/ChatCommandHandlerStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/ChatCommandHandlerStrategy.cpp
similarity index 100%
rename from src/strategy/generic/ChatCommandHandlerStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/ChatCommandHandlerStrategy.cpp
diff --git a/src/strategy/generic/ChatCommandHandlerStrategy.h b/src/Extend/ClassAi/Generic/Strategy/ChatCommandHandlerStrategy.h
similarity index 100%
rename from src/strategy/generic/ChatCommandHandlerStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/ChatCommandHandlerStrategy.h
diff --git a/src/strategy/generic/CombatStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/CombatStrategy.cpp
similarity index 100%
rename from src/strategy/generic/CombatStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/CombatStrategy.cpp
diff --git a/src/strategy/generic/CombatStrategy.h b/src/Extend/ClassAi/Generic/Strategy/CombatStrategy.h
similarity index 100%
rename from src/strategy/generic/CombatStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/CombatStrategy.h
diff --git a/src/strategy/generic/ConserveManaStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/ConserveManaStrategy.cpp
similarity index 100%
rename from src/strategy/generic/ConserveManaStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/ConserveManaStrategy.cpp
diff --git a/src/strategy/generic/ConserveManaStrategy.h b/src/Extend/ClassAi/Generic/Strategy/ConserveManaStrategy.h
similarity index 100%
rename from src/strategy/generic/ConserveManaStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/ConserveManaStrategy.h
diff --git a/src/strategy/generic/DeadStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/DeadStrategy.cpp
similarity index 100%
rename from src/strategy/generic/DeadStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/DeadStrategy.cpp
diff --git a/src/strategy/generic/DeadStrategy.h b/src/Extend/ClassAi/Generic/Strategy/DeadStrategy.h
similarity index 100%
rename from src/strategy/generic/DeadStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/DeadStrategy.h
diff --git a/src/strategy/generic/DebugStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/DebugStrategy.cpp
similarity index 100%
rename from src/strategy/generic/DebugStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/DebugStrategy.cpp
diff --git a/src/strategy/generic/DebugStrategy.h b/src/Extend/ClassAi/Generic/Strategy/DebugStrategy.h
similarity index 100%
rename from src/strategy/generic/DebugStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/DebugStrategy.h
diff --git a/src/strategy/generic/DpsAssistStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/DpsAssistStrategy.cpp
similarity index 100%
rename from src/strategy/generic/DpsAssistStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/DpsAssistStrategy.cpp
diff --git a/src/strategy/generic/DpsAssistStrategy.h b/src/Extend/ClassAi/Generic/Strategy/DpsAssistStrategy.h
similarity index 100%
rename from src/strategy/generic/DpsAssistStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/DpsAssistStrategy.h
diff --git a/src/strategy/generic/DuelStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/DuelStrategy.cpp
similarity index 100%
rename from src/strategy/generic/DuelStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/DuelStrategy.cpp
diff --git a/src/strategy/generic/DuelStrategy.h b/src/Extend/ClassAi/Generic/Strategy/DuelStrategy.h
similarity index 100%
rename from src/strategy/generic/DuelStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/DuelStrategy.h
diff --git a/src/strategy/generic/EmoteStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/EmoteStrategy.cpp
similarity index 100%
rename from src/strategy/generic/EmoteStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/EmoteStrategy.cpp
diff --git a/src/strategy/generic/EmoteStrategy.h b/src/Extend/ClassAi/Generic/Strategy/EmoteStrategy.h
similarity index 100%
rename from src/strategy/generic/EmoteStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/EmoteStrategy.h
diff --git a/src/strategy/generic/FleeStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/FleeStrategy.cpp
similarity index 100%
rename from src/strategy/generic/FleeStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/FleeStrategy.cpp
diff --git a/src/strategy/generic/FleeStrategy.h b/src/Extend/ClassAi/Generic/Strategy/FleeStrategy.h
similarity index 100%
rename from src/strategy/generic/FleeStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/FleeStrategy.h
diff --git a/src/strategy/generic/FollowMasterStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/FollowMasterStrategy.cpp
similarity index 100%
rename from src/strategy/generic/FollowMasterStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/FollowMasterStrategy.cpp
diff --git a/src/strategy/generic/FollowMasterStrategy.h b/src/Extend/ClassAi/Generic/Strategy/FollowMasterStrategy.h
similarity index 100%
rename from src/strategy/generic/FollowMasterStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/FollowMasterStrategy.h
diff --git a/src/strategy/generic/GrindingStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/GrindingStrategy.cpp
similarity index 100%
rename from src/strategy/generic/GrindingStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/GrindingStrategy.cpp
diff --git a/src/strategy/generic/GrindingStrategy.h b/src/Extend/ClassAi/Generic/Strategy/GrindingStrategy.h
similarity index 100%
rename from src/strategy/generic/GrindingStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/GrindingStrategy.h
diff --git a/src/strategy/generic/GroupStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/GroupStrategy.cpp
similarity index 100%
rename from src/strategy/generic/GroupStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/GroupStrategy.cpp
diff --git a/src/strategy/generic/GroupStrategy.h b/src/Extend/ClassAi/Generic/Strategy/GroupStrategy.h
similarity index 100%
rename from src/strategy/generic/GroupStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/GroupStrategy.h
diff --git a/src/strategy/generic/GuardStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/GuardStrategy.cpp
similarity index 100%
rename from src/strategy/generic/GuardStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/GuardStrategy.cpp
diff --git a/src/strategy/generic/GuardStrategy.h b/src/Extend/ClassAi/Generic/Strategy/GuardStrategy.h
similarity index 100%
rename from src/strategy/generic/GuardStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/GuardStrategy.h
diff --git a/src/strategy/generic/GuildStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/GuildStrategy.cpp
similarity index 100%
rename from src/strategy/generic/GuildStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/GuildStrategy.cpp
diff --git a/src/strategy/generic/GuildStrategy.h b/src/Extend/ClassAi/Generic/Strategy/GuildStrategy.h
similarity index 100%
rename from src/strategy/generic/GuildStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/GuildStrategy.h
diff --git a/src/strategy/generic/KiteStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/KiteStrategy.cpp
similarity index 100%
rename from src/strategy/generic/KiteStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/KiteStrategy.cpp
diff --git a/src/strategy/generic/KiteStrategy.h b/src/Extend/ClassAi/Generic/Strategy/KiteStrategy.h
similarity index 100%
rename from src/strategy/generic/KiteStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/KiteStrategy.h
diff --git a/src/strategy/generic/LfgStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/LfgStrategy.cpp
similarity index 100%
rename from src/strategy/generic/LfgStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/LfgStrategy.cpp
diff --git a/src/strategy/generic/LfgStrategy.h b/src/Extend/ClassAi/Generic/Strategy/LfgStrategy.h
similarity index 100%
rename from src/strategy/generic/LfgStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/LfgStrategy.h
diff --git a/src/strategy/generic/LootNonCombatStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/LootNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/generic/LootNonCombatStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/LootNonCombatStrategy.cpp
diff --git a/src/strategy/generic/LootNonCombatStrategy.h b/src/Extend/ClassAi/Generic/Strategy/LootNonCombatStrategy.h
similarity index 100%
rename from src/strategy/generic/LootNonCombatStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/LootNonCombatStrategy.h
diff --git a/src/strategy/generic/MaintenanceStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/MaintenanceStrategy.cpp
similarity index 100%
rename from src/strategy/generic/MaintenanceStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/MaintenanceStrategy.cpp
diff --git a/src/strategy/generic/MaintenanceStrategy.h b/src/Extend/ClassAi/Generic/Strategy/MaintenanceStrategy.h
similarity index 100%
rename from src/strategy/generic/MaintenanceStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/MaintenanceStrategy.h
diff --git a/src/strategy/generic/MarkRtiStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/MarkRtiStrategy.cpp
similarity index 100%
rename from src/strategy/generic/MarkRtiStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/MarkRtiStrategy.cpp
diff --git a/src/strategy/generic/MarkRtiStrategy.h b/src/Extend/ClassAi/Generic/Strategy/MarkRtiStrategy.h
similarity index 100%
rename from src/strategy/generic/MarkRtiStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/MarkRtiStrategy.h
diff --git a/src/strategy/generic/MeleeCombatStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/MeleeCombatStrategy.cpp
similarity index 100%
rename from src/strategy/generic/MeleeCombatStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/MeleeCombatStrategy.cpp
diff --git a/src/strategy/generic/MeleeCombatStrategy.h b/src/Extend/ClassAi/Generic/Strategy/MeleeCombatStrategy.h
similarity index 100%
rename from src/strategy/generic/MeleeCombatStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/MeleeCombatStrategy.h
diff --git a/src/strategy/generic/MoveFromGroupStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/MoveFromGroupStrategy.cpp
similarity index 100%
rename from src/strategy/generic/MoveFromGroupStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/MoveFromGroupStrategy.cpp
diff --git a/src/strategy/generic/MoveFromGroupStrategy.h b/src/Extend/ClassAi/Generic/Strategy/MoveFromGroupStrategy.h
similarity index 100%
rename from src/strategy/generic/MoveFromGroupStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/MoveFromGroupStrategy.h
diff --git a/src/strategy/generic/NonCombatStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/NonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/generic/NonCombatStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/NonCombatStrategy.cpp
diff --git a/src/strategy/generic/NonCombatStrategy.h b/src/Extend/ClassAi/Generic/Strategy/NonCombatStrategy.h
similarity index 100%
rename from src/strategy/generic/NonCombatStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/NonCombatStrategy.h
diff --git a/src/strategy/generic/PassTroughStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/PassTroughStrategy.cpp
similarity index 100%
rename from src/strategy/generic/PassTroughStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/PassTroughStrategy.cpp
diff --git a/src/strategy/generic/PassTroughStrategy.h b/src/Extend/ClassAi/Generic/Strategy/PassTroughStrategy.h
similarity index 100%
rename from src/strategy/generic/PassTroughStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/PassTroughStrategy.h
diff --git a/src/strategy/generic/PassiveStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/PassiveStrategy.cpp
similarity index 100%
rename from src/strategy/generic/PassiveStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/PassiveStrategy.cpp
diff --git a/src/strategy/generic/PassiveStrategy.h b/src/Extend/ClassAi/Generic/Strategy/PassiveStrategy.h
similarity index 100%
rename from src/strategy/generic/PassiveStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/PassiveStrategy.h
diff --git a/src/strategy/generic/PullStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/PullStrategy.cpp
similarity index 100%
rename from src/strategy/generic/PullStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/PullStrategy.cpp
diff --git a/src/strategy/generic/PullStrategy.h b/src/Extend/ClassAi/Generic/Strategy/PullStrategy.h
similarity index 100%
rename from src/strategy/generic/PullStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/PullStrategy.h
diff --git a/src/strategy/generic/QuestStrategies.cpp b/src/Extend/ClassAi/Generic/Strategy/QuestStrategies.cpp
similarity index 100%
rename from src/strategy/generic/QuestStrategies.cpp
rename to src/Extend/ClassAi/Generic/Strategy/QuestStrategies.cpp
diff --git a/src/strategy/generic/QuestStrategies.h b/src/Extend/ClassAi/Generic/Strategy/QuestStrategies.h
similarity index 100%
rename from src/strategy/generic/QuestStrategies.h
rename to src/Extend/ClassAi/Generic/Strategy/QuestStrategies.h
diff --git a/src/strategy/generic/RTSCStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/RTSCStrategy.cpp
similarity index 100%
rename from src/strategy/generic/RTSCStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/RTSCStrategy.cpp
diff --git a/src/strategy/generic/RTSCStrategy.h b/src/Extend/ClassAi/Generic/Strategy/RTSCStrategy.h
similarity index 100%
rename from src/strategy/generic/RTSCStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/RTSCStrategy.h
diff --git a/src/strategy/generic/RacialsStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/RacialsStrategy.cpp
similarity index 100%
rename from src/strategy/generic/RacialsStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/RacialsStrategy.cpp
diff --git a/src/strategy/generic/RacialsStrategy.h b/src/Extend/ClassAi/Generic/Strategy/RacialsStrategy.h
similarity index 100%
rename from src/strategy/generic/RacialsStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/RacialsStrategy.h
diff --git a/src/strategy/generic/RangedCombatStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/RangedCombatStrategy.cpp
similarity index 100%
rename from src/strategy/generic/RangedCombatStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/RangedCombatStrategy.cpp
diff --git a/src/strategy/generic/RangedCombatStrategy.h b/src/Extend/ClassAi/Generic/Strategy/RangedCombatStrategy.h
similarity index 100%
rename from src/strategy/generic/RangedCombatStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/RangedCombatStrategy.h
diff --git a/src/strategy/generic/ReturnStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/ReturnStrategy.cpp
similarity index 100%
rename from src/strategy/generic/ReturnStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/ReturnStrategy.cpp
diff --git a/src/strategy/generic/ReturnStrategy.h b/src/Extend/ClassAi/Generic/Strategy/ReturnStrategy.h
similarity index 100%
rename from src/strategy/generic/ReturnStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/ReturnStrategy.h
diff --git a/src/strategy/generic/RpgStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/RpgStrategy.cpp
similarity index 100%
rename from src/strategy/generic/RpgStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/RpgStrategy.cpp
diff --git a/src/strategy/generic/RpgStrategy.h b/src/Extend/ClassAi/Generic/Strategy/RpgStrategy.h
similarity index 100%
rename from src/strategy/generic/RpgStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/RpgStrategy.h
diff --git a/src/strategy/generic/RunawayStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/RunawayStrategy.cpp
similarity index 100%
rename from src/strategy/generic/RunawayStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/RunawayStrategy.cpp
diff --git a/src/strategy/generic/RunawayStrategy.h b/src/Extend/ClassAi/Generic/Strategy/RunawayStrategy.h
similarity index 100%
rename from src/strategy/generic/RunawayStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/RunawayStrategy.h
diff --git a/src/strategy/generic/SayStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/SayStrategy.cpp
similarity index 100%
rename from src/strategy/generic/SayStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/SayStrategy.cpp
diff --git a/src/strategy/generic/SayStrategy.h b/src/Extend/ClassAi/Generic/Strategy/SayStrategy.h
similarity index 100%
rename from src/strategy/generic/SayStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/SayStrategy.h
diff --git a/src/strategy/generic/StayStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/StayStrategy.cpp
similarity index 100%
rename from src/strategy/generic/StayStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/StayStrategy.cpp
diff --git a/src/strategy/generic/StayStrategy.h b/src/Extend/ClassAi/Generic/Strategy/StayStrategy.h
similarity index 100%
rename from src/strategy/generic/StayStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/StayStrategy.h
diff --git a/src/strategy/generic/TankAssistStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/TankAssistStrategy.cpp
similarity index 100%
rename from src/strategy/generic/TankAssistStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/TankAssistStrategy.cpp
diff --git a/src/strategy/generic/TankAssistStrategy.h b/src/Extend/ClassAi/Generic/Strategy/TankAssistStrategy.h
similarity index 100%
rename from src/strategy/generic/TankAssistStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/TankAssistStrategy.h
diff --git a/src/strategy/generic/TellTargetStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/TellTargetStrategy.cpp
similarity index 100%
rename from src/strategy/generic/TellTargetStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/TellTargetStrategy.cpp
diff --git a/src/strategy/generic/TellTargetStrategy.h b/src/Extend/ClassAi/Generic/Strategy/TellTargetStrategy.h
similarity index 100%
rename from src/strategy/generic/TellTargetStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/TellTargetStrategy.h
diff --git a/src/strategy/generic/ThreatStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/ThreatStrategy.cpp
similarity index 100%
rename from src/strategy/generic/ThreatStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/ThreatStrategy.cpp
diff --git a/src/strategy/generic/ThreatStrategy.h b/src/Extend/ClassAi/Generic/Strategy/ThreatStrategy.h
similarity index 100%
rename from src/strategy/generic/ThreatStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/ThreatStrategy.h
diff --git a/src/strategy/generic/TravelStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/TravelStrategy.cpp
similarity index 100%
rename from src/strategy/generic/TravelStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/TravelStrategy.cpp
diff --git a/src/strategy/generic/TravelStrategy.h b/src/Extend/ClassAi/Generic/Strategy/TravelStrategy.h
similarity index 100%
rename from src/strategy/generic/TravelStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/TravelStrategy.h
diff --git a/src/strategy/generic/UseFoodStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/UseFoodStrategy.cpp
similarity index 100%
rename from src/strategy/generic/UseFoodStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/UseFoodStrategy.cpp
diff --git a/src/strategy/generic/UseFoodStrategy.h b/src/Extend/ClassAi/Generic/Strategy/UseFoodStrategy.h
similarity index 100%
rename from src/strategy/generic/UseFoodStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/UseFoodStrategy.h
diff --git a/src/strategy/generic/UsePotionsStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/UsePotionsStrategy.cpp
similarity index 100%
rename from src/strategy/generic/UsePotionsStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/UsePotionsStrategy.cpp
diff --git a/src/strategy/generic/UsePotionsStrategy.h b/src/Extend/ClassAi/Generic/Strategy/UsePotionsStrategy.h
similarity index 100%
rename from src/strategy/generic/UsePotionsStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/UsePotionsStrategy.h
diff --git a/src/strategy/generic/WorldPacketHandlerStrategy.cpp b/src/Extend/ClassAi/Generic/Strategy/WorldPacketHandlerStrategy.cpp
similarity index 100%
rename from src/strategy/generic/WorldPacketHandlerStrategy.cpp
rename to src/Extend/ClassAi/Generic/Strategy/WorldPacketHandlerStrategy.cpp
diff --git a/src/strategy/generic/WorldPacketHandlerStrategy.h b/src/Extend/ClassAi/Generic/Strategy/WorldPacketHandlerStrategy.h
similarity index 100%
rename from src/strategy/generic/WorldPacketHandlerStrategy.h
rename to src/Extend/ClassAi/Generic/Strategy/WorldPacketHandlerStrategy.h
diff --git a/src/strategy/StrategyContext.h b/src/Extend/ClassAi/Generic/StrategyContext.h
similarity index 100%
rename from src/strategy/StrategyContext.h
rename to src/Extend/ClassAi/Generic/StrategyContext.h
diff --git a/src/strategy/hunter/HunterActions.cpp b/src/Extend/ClassAi/Hunter/Action/HunterActions.cpp
similarity index 100%
rename from src/strategy/hunter/HunterActions.cpp
rename to src/Extend/ClassAi/Hunter/Action/HunterActions.cpp
diff --git a/src/strategy/hunter/HunterActions.h b/src/Extend/ClassAi/Hunter/Action/HunterActions.h
similarity index 100%
rename from src/strategy/hunter/HunterActions.h
rename to src/Extend/ClassAi/Hunter/Action/HunterActions.h
diff --git a/src/strategy/hunter/HunterAiObjectContext.cpp b/src/Extend/ClassAi/Hunter/HunterAiObjectContext.cpp
similarity index 100%
rename from src/strategy/hunter/HunterAiObjectContext.cpp
rename to src/Extend/ClassAi/Hunter/HunterAiObjectContext.cpp
diff --git a/src/strategy/hunter/HunterAiObjectContext.h b/src/Extend/ClassAi/Hunter/HunterAiObjectContext.h
similarity index 100%
rename from src/strategy/hunter/HunterAiObjectContext.h
rename to src/Extend/ClassAi/Hunter/HunterAiObjectContext.h
diff --git a/src/strategy/hunter/BeastMasteryHunterStrategy.cpp b/src/Extend/ClassAi/Hunter/Strategy/BeastMasteryHunterStrategy.cpp
similarity index 100%
rename from src/strategy/hunter/BeastMasteryHunterStrategy.cpp
rename to src/Extend/ClassAi/Hunter/Strategy/BeastMasteryHunterStrategy.cpp
diff --git a/src/strategy/hunter/BeastMasteryHunterStrategy.h b/src/Extend/ClassAi/Hunter/Strategy/BeastMasteryHunterStrategy.h
similarity index 100%
rename from src/strategy/hunter/BeastMasteryHunterStrategy.h
rename to src/Extend/ClassAi/Hunter/Strategy/BeastMasteryHunterStrategy.h
diff --git a/src/strategy/hunter/GenericHunterNonCombatStrategy.cpp b/src/Extend/ClassAi/Hunter/Strategy/GenericHunterNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/hunter/GenericHunterNonCombatStrategy.cpp
rename to src/Extend/ClassAi/Hunter/Strategy/GenericHunterNonCombatStrategy.cpp
diff --git a/src/strategy/hunter/GenericHunterNonCombatStrategy.h b/src/Extend/ClassAi/Hunter/Strategy/GenericHunterNonCombatStrategy.h
similarity index 100%
rename from src/strategy/hunter/GenericHunterNonCombatStrategy.h
rename to src/Extend/ClassAi/Hunter/Strategy/GenericHunterNonCombatStrategy.h
diff --git a/src/strategy/hunter/GenericHunterStrategy.cpp b/src/Extend/ClassAi/Hunter/Strategy/GenericHunterStrategy.cpp
similarity index 100%
rename from src/strategy/hunter/GenericHunterStrategy.cpp
rename to src/Extend/ClassAi/Hunter/Strategy/GenericHunterStrategy.cpp
diff --git a/src/strategy/hunter/GenericHunterStrategy.h b/src/Extend/ClassAi/Hunter/Strategy/GenericHunterStrategy.h
similarity index 100%
rename from src/strategy/hunter/GenericHunterStrategy.h
rename to src/Extend/ClassAi/Hunter/Strategy/GenericHunterStrategy.h
diff --git a/src/strategy/hunter/HunterBuffStrategies.cpp b/src/Extend/ClassAi/Hunter/Strategy/HunterBuffStrategies.cpp
similarity index 100%
rename from src/strategy/hunter/HunterBuffStrategies.cpp
rename to src/Extend/ClassAi/Hunter/Strategy/HunterBuffStrategies.cpp
diff --git a/src/strategy/hunter/HunterBuffStrategies.h b/src/Extend/ClassAi/Hunter/Strategy/HunterBuffStrategies.h
similarity index 100%
rename from src/strategy/hunter/HunterBuffStrategies.h
rename to src/Extend/ClassAi/Hunter/Strategy/HunterBuffStrategies.h
diff --git a/src/strategy/hunter/MarksmanshipHunterStrategy.cpp b/src/Extend/ClassAi/Hunter/Strategy/MarksmanshipHunterStrategy.cpp
similarity index 100%
rename from src/strategy/hunter/MarksmanshipHunterStrategy.cpp
rename to src/Extend/ClassAi/Hunter/Strategy/MarksmanshipHunterStrategy.cpp
diff --git a/src/strategy/hunter/MarksmanshipHunterStrategy.h b/src/Extend/ClassAi/Hunter/Strategy/MarksmanshipHunterStrategy.h
similarity index 100%
rename from src/strategy/hunter/MarksmanshipHunterStrategy.h
rename to src/Extend/ClassAi/Hunter/Strategy/MarksmanshipHunterStrategy.h
diff --git a/src/strategy/hunter/SurvivalHunterStrategy.cpp b/src/Extend/ClassAi/Hunter/Strategy/SurvivalHunterStrategy.cpp
similarity index 100%
rename from src/strategy/hunter/SurvivalHunterStrategy.cpp
rename to src/Extend/ClassAi/Hunter/Strategy/SurvivalHunterStrategy.cpp
diff --git a/src/strategy/hunter/SurvivalHunterStrategy.h b/src/Extend/ClassAi/Hunter/Strategy/SurvivalHunterStrategy.h
similarity index 100%
rename from src/strategy/hunter/SurvivalHunterStrategy.h
rename to src/Extend/ClassAi/Hunter/Strategy/SurvivalHunterStrategy.h
diff --git a/src/strategy/hunter/HunterTriggers.cpp b/src/Extend/ClassAi/Hunter/Trigger/HunterTriggers.cpp
similarity index 100%
rename from src/strategy/hunter/HunterTriggers.cpp
rename to src/Extend/ClassAi/Hunter/Trigger/HunterTriggers.cpp
diff --git a/src/strategy/hunter/HunterTriggers.h b/src/Extend/ClassAi/Hunter/Trigger/HunterTriggers.h
similarity index 100%
rename from src/strategy/hunter/HunterTriggers.h
rename to src/Extend/ClassAi/Hunter/Trigger/HunterTriggers.h
diff --git a/src/strategy/mage/MageActions.cpp b/src/Extend/ClassAi/Mage/Action/MageActions.cpp
similarity index 100%
rename from src/strategy/mage/MageActions.cpp
rename to src/Extend/ClassAi/Mage/Action/MageActions.cpp
diff --git a/src/strategy/mage/MageActions.h b/src/Extend/ClassAi/Mage/Action/MageActions.h
similarity index 100%
rename from src/strategy/mage/MageActions.h
rename to src/Extend/ClassAi/Mage/Action/MageActions.h
diff --git a/src/strategy/mage/MageAiObjectContext.cpp b/src/Extend/ClassAi/Mage/MageAiObjectContext.cpp
similarity index 100%
rename from src/strategy/mage/MageAiObjectContext.cpp
rename to src/Extend/ClassAi/Mage/MageAiObjectContext.cpp
diff --git a/src/strategy/mage/MageAiObjectContext.h b/src/Extend/ClassAi/Mage/MageAiObjectContext.h
similarity index 100%
rename from src/strategy/mage/MageAiObjectContext.h
rename to src/Extend/ClassAi/Mage/MageAiObjectContext.h
diff --git a/src/strategy/mage/ArcaneMageStrategy.cpp b/src/Extend/ClassAi/Mage/Strategy/ArcaneMageStrategy.cpp
similarity index 100%
rename from src/strategy/mage/ArcaneMageStrategy.cpp
rename to src/Extend/ClassAi/Mage/Strategy/ArcaneMageStrategy.cpp
diff --git a/src/strategy/mage/ArcaneMageStrategy.h b/src/Extend/ClassAi/Mage/Strategy/ArcaneMageStrategy.h
similarity index 100%
rename from src/strategy/mage/ArcaneMageStrategy.h
rename to src/Extend/ClassAi/Mage/Strategy/ArcaneMageStrategy.h
diff --git a/src/strategy/mage/FireMageStrategy.cpp b/src/Extend/ClassAi/Mage/Strategy/FireMageStrategy.cpp
similarity index 100%
rename from src/strategy/mage/FireMageStrategy.cpp
rename to src/Extend/ClassAi/Mage/Strategy/FireMageStrategy.cpp
diff --git a/src/strategy/mage/FireMageStrategy.h b/src/Extend/ClassAi/Mage/Strategy/FireMageStrategy.h
similarity index 100%
rename from src/strategy/mage/FireMageStrategy.h
rename to src/Extend/ClassAi/Mage/Strategy/FireMageStrategy.h
diff --git a/src/strategy/mage/FrostFireMageStrategy.cpp b/src/Extend/ClassAi/Mage/Strategy/FrostFireMageStrategy.cpp
similarity index 100%
rename from src/strategy/mage/FrostFireMageStrategy.cpp
rename to src/Extend/ClassAi/Mage/Strategy/FrostFireMageStrategy.cpp
diff --git a/src/strategy/mage/FrostFireMageStrategy.h b/src/Extend/ClassAi/Mage/Strategy/FrostFireMageStrategy.h
similarity index 100%
rename from src/strategy/mage/FrostFireMageStrategy.h
rename to src/Extend/ClassAi/Mage/Strategy/FrostFireMageStrategy.h
diff --git a/src/strategy/mage/FrostMageStrategy.cpp b/src/Extend/ClassAi/Mage/Strategy/FrostMageStrategy.cpp
similarity index 100%
rename from src/strategy/mage/FrostMageStrategy.cpp
rename to src/Extend/ClassAi/Mage/Strategy/FrostMageStrategy.cpp
diff --git a/src/strategy/mage/FrostMageStrategy.h b/src/Extend/ClassAi/Mage/Strategy/FrostMageStrategy.h
similarity index 100%
rename from src/strategy/mage/FrostMageStrategy.h
rename to src/Extend/ClassAi/Mage/Strategy/FrostMageStrategy.h
diff --git a/src/strategy/mage/GenericMageNonCombatStrategy.cpp b/src/Extend/ClassAi/Mage/Strategy/GenericMageNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/mage/GenericMageNonCombatStrategy.cpp
rename to src/Extend/ClassAi/Mage/Strategy/GenericMageNonCombatStrategy.cpp
diff --git a/src/strategy/mage/GenericMageNonCombatStrategy.h b/src/Extend/ClassAi/Mage/Strategy/GenericMageNonCombatStrategy.h
similarity index 100%
rename from src/strategy/mage/GenericMageNonCombatStrategy.h
rename to src/Extend/ClassAi/Mage/Strategy/GenericMageNonCombatStrategy.h
diff --git a/src/strategy/mage/GenericMageStrategy.cpp b/src/Extend/ClassAi/Mage/Strategy/GenericMageStrategy.cpp
similarity index 100%
rename from src/strategy/mage/GenericMageStrategy.cpp
rename to src/Extend/ClassAi/Mage/Strategy/GenericMageStrategy.cpp
diff --git a/src/strategy/mage/GenericMageStrategy.h b/src/Extend/ClassAi/Mage/Strategy/GenericMageStrategy.h
similarity index 100%
rename from src/strategy/mage/GenericMageStrategy.h
rename to src/Extend/ClassAi/Mage/Strategy/GenericMageStrategy.h
diff --git a/src/strategy/mage/MageTriggers.cpp b/src/Extend/ClassAi/Mage/Trigger/MageTriggers.cpp
similarity index 100%
rename from src/strategy/mage/MageTriggers.cpp
rename to src/Extend/ClassAi/Mage/Trigger/MageTriggers.cpp
diff --git a/src/strategy/mage/MageTriggers.h b/src/Extend/ClassAi/Mage/Trigger/MageTriggers.h
similarity index 100%
rename from src/strategy/mage/MageTriggers.h
rename to src/Extend/ClassAi/Mage/Trigger/MageTriggers.h
diff --git a/src/strategy/paladin/PaladinActions.cpp b/src/Extend/ClassAi/Paladin/Action/PaladinActions.cpp
similarity index 100%
rename from src/strategy/paladin/PaladinActions.cpp
rename to src/Extend/ClassAi/Paladin/Action/PaladinActions.cpp
diff --git a/src/strategy/paladin/PaladinActions.h b/src/Extend/ClassAi/Paladin/Action/PaladinActions.h
similarity index 100%
rename from src/strategy/paladin/PaladinActions.h
rename to src/Extend/ClassAi/Paladin/Action/PaladinActions.h
diff --git a/src/strategy/paladin/PaladinAiObjectContext.cpp b/src/Extend/ClassAi/Paladin/PaladinAiObjectContext.cpp
similarity index 100%
rename from src/strategy/paladin/PaladinAiObjectContext.cpp
rename to src/Extend/ClassAi/Paladin/PaladinAiObjectContext.cpp
diff --git a/src/strategy/paladin/PaladinAiObjectContext.h b/src/Extend/ClassAi/Paladin/PaladinAiObjectContext.h
similarity index 100%
rename from src/strategy/paladin/PaladinAiObjectContext.h
rename to src/Extend/ClassAi/Paladin/PaladinAiObjectContext.h
diff --git a/src/strategy/paladin/DpsPaladinStrategy.cpp b/src/Extend/ClassAi/Paladin/Strategy/DpsPaladinStrategy.cpp
similarity index 100%
rename from src/strategy/paladin/DpsPaladinStrategy.cpp
rename to src/Extend/ClassAi/Paladin/Strategy/DpsPaladinStrategy.cpp
diff --git a/src/strategy/paladin/DpsPaladinStrategy.h b/src/Extend/ClassAi/Paladin/Strategy/DpsPaladinStrategy.h
similarity index 100%
rename from src/strategy/paladin/DpsPaladinStrategy.h
rename to src/Extend/ClassAi/Paladin/Strategy/DpsPaladinStrategy.h
diff --git a/src/strategy/paladin/GenericPaladinNonCombatStrategy.cpp b/src/Extend/ClassAi/Paladin/Strategy/GenericPaladinNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/paladin/GenericPaladinNonCombatStrategy.cpp
rename to src/Extend/ClassAi/Paladin/Strategy/GenericPaladinNonCombatStrategy.cpp
diff --git a/src/strategy/paladin/GenericPaladinNonCombatStrategy.h b/src/Extend/ClassAi/Paladin/Strategy/GenericPaladinNonCombatStrategy.h
similarity index 100%
rename from src/strategy/paladin/GenericPaladinNonCombatStrategy.h
rename to src/Extend/ClassAi/Paladin/Strategy/GenericPaladinNonCombatStrategy.h
diff --git a/src/strategy/paladin/GenericPaladinStrategy.cpp b/src/Extend/ClassAi/Paladin/Strategy/GenericPaladinStrategy.cpp
similarity index 100%
rename from src/strategy/paladin/GenericPaladinStrategy.cpp
rename to src/Extend/ClassAi/Paladin/Strategy/GenericPaladinStrategy.cpp
diff --git a/src/strategy/paladin/GenericPaladinStrategy.h b/src/Extend/ClassAi/Paladin/Strategy/GenericPaladinStrategy.h
similarity index 100%
rename from src/strategy/paladin/GenericPaladinStrategy.h
rename to src/Extend/ClassAi/Paladin/Strategy/GenericPaladinStrategy.h
diff --git a/src/strategy/paladin/GenericPaladinStrategyActionNodeFactory.h b/src/Extend/ClassAi/Paladin/Strategy/GenericPaladinStrategyActionNodeFactory.h
similarity index 100%
rename from src/strategy/paladin/GenericPaladinStrategyActionNodeFactory.h
rename to src/Extend/ClassAi/Paladin/Strategy/GenericPaladinStrategyActionNodeFactory.h
diff --git a/src/strategy/paladin/HealPaladinStrategy.cpp b/src/Extend/ClassAi/Paladin/Strategy/HealPaladinStrategy.cpp
similarity index 100%
rename from src/strategy/paladin/HealPaladinStrategy.cpp
rename to src/Extend/ClassAi/Paladin/Strategy/HealPaladinStrategy.cpp
diff --git a/src/strategy/paladin/HealPaladinStrategy.h b/src/Extend/ClassAi/Paladin/Strategy/HealPaladinStrategy.h
similarity index 100%
rename from src/strategy/paladin/HealPaladinStrategy.h
rename to src/Extend/ClassAi/Paladin/Strategy/HealPaladinStrategy.h
diff --git a/src/strategy/paladin/OffhealRetPaladinStrategy.cpp b/src/Extend/ClassAi/Paladin/Strategy/OffhealRetPaladinStrategy.cpp
similarity index 100%
rename from src/strategy/paladin/OffhealRetPaladinStrategy.cpp
rename to src/Extend/ClassAi/Paladin/Strategy/OffhealRetPaladinStrategy.cpp
diff --git a/src/strategy/paladin/OffhealRetPaladinStrategy.h b/src/Extend/ClassAi/Paladin/Strategy/OffhealRetPaladinStrategy.h
similarity index 100%
rename from src/strategy/paladin/OffhealRetPaladinStrategy.h
rename to src/Extend/ClassAi/Paladin/Strategy/OffhealRetPaladinStrategy.h
diff --git a/src/strategy/paladin/PaladinBuffStrategies.cpp b/src/Extend/ClassAi/Paladin/Strategy/PaladinBuffStrategies.cpp
similarity index 100%
rename from src/strategy/paladin/PaladinBuffStrategies.cpp
rename to src/Extend/ClassAi/Paladin/Strategy/PaladinBuffStrategies.cpp
diff --git a/src/strategy/paladin/PaladinBuffStrategies.h b/src/Extend/ClassAi/Paladin/Strategy/PaladinBuffStrategies.h
similarity index 100%
rename from src/strategy/paladin/PaladinBuffStrategies.h
rename to src/Extend/ClassAi/Paladin/Strategy/PaladinBuffStrategies.h
diff --git a/src/strategy/paladin/TankPaladinStrategy.cpp b/src/Extend/ClassAi/Paladin/Strategy/TankPaladinStrategy.cpp
similarity index 100%
rename from src/strategy/paladin/TankPaladinStrategy.cpp
rename to src/Extend/ClassAi/Paladin/Strategy/TankPaladinStrategy.cpp
diff --git a/src/strategy/paladin/TankPaladinStrategy.h b/src/Extend/ClassAi/Paladin/Strategy/TankPaladinStrategy.h
similarity index 100%
rename from src/strategy/paladin/TankPaladinStrategy.h
rename to src/Extend/ClassAi/Paladin/Strategy/TankPaladinStrategy.h
diff --git a/src/strategy/paladin/PaladinTriggers.cpp b/src/Extend/ClassAi/Paladin/Trigger/PaladinTriggers.cpp
similarity index 100%
rename from src/strategy/paladin/PaladinTriggers.cpp
rename to src/Extend/ClassAi/Paladin/Trigger/PaladinTriggers.cpp
diff --git a/src/strategy/paladin/PaladinTriggers.h b/src/Extend/ClassAi/Paladin/Trigger/PaladinTriggers.h
similarity index 100%
rename from src/strategy/paladin/PaladinTriggers.h
rename to src/Extend/ClassAi/Paladin/Trigger/PaladinTriggers.h
diff --git a/src/strategy/priest/PriestActions.cpp b/src/Extend/ClassAi/Priest/Action/PriestActions.cpp
similarity index 100%
rename from src/strategy/priest/PriestActions.cpp
rename to src/Extend/ClassAi/Priest/Action/PriestActions.cpp
diff --git a/src/strategy/priest/PriestActions.h b/src/Extend/ClassAi/Priest/Action/PriestActions.h
similarity index 100%
rename from src/strategy/priest/PriestActions.h
rename to src/Extend/ClassAi/Priest/Action/PriestActions.h
diff --git a/src/strategy/priest/PriestAiObjectContext.cpp b/src/Extend/ClassAi/Priest/PriestAiObjectContext.cpp
similarity index 100%
rename from src/strategy/priest/PriestAiObjectContext.cpp
rename to src/Extend/ClassAi/Priest/PriestAiObjectContext.cpp
diff --git a/src/strategy/priest/PriestAiObjectContext.h b/src/Extend/ClassAi/Priest/PriestAiObjectContext.h
similarity index 100%
rename from src/strategy/priest/PriestAiObjectContext.h
rename to src/Extend/ClassAi/Priest/PriestAiObjectContext.h
diff --git a/src/strategy/priest/GenericPriestStrategy.cpp b/src/Extend/ClassAi/Priest/Strategy/GenericPriestStrategy.cpp
similarity index 100%
rename from src/strategy/priest/GenericPriestStrategy.cpp
rename to src/Extend/ClassAi/Priest/Strategy/GenericPriestStrategy.cpp
diff --git a/src/strategy/priest/GenericPriestStrategy.h b/src/Extend/ClassAi/Priest/Strategy/GenericPriestStrategy.h
similarity index 100%
rename from src/strategy/priest/GenericPriestStrategy.h
rename to src/Extend/ClassAi/Priest/Strategy/GenericPriestStrategy.h
diff --git a/src/strategy/priest/GenericPriestStrategyActionNodeFactory.h b/src/Extend/ClassAi/Priest/Strategy/GenericPriestStrategyActionNodeFactory.h
similarity index 100%
rename from src/strategy/priest/GenericPriestStrategyActionNodeFactory.h
rename to src/Extend/ClassAi/Priest/Strategy/GenericPriestStrategyActionNodeFactory.h
diff --git a/src/strategy/priest/HealPriestStrategy.cpp b/src/Extend/ClassAi/Priest/Strategy/HealPriestStrategy.cpp
similarity index 100%
rename from src/strategy/priest/HealPriestStrategy.cpp
rename to src/Extend/ClassAi/Priest/Strategy/HealPriestStrategy.cpp
diff --git a/src/strategy/priest/HealPriestStrategy.h b/src/Extend/ClassAi/Priest/Strategy/HealPriestStrategy.h
similarity index 100%
rename from src/strategy/priest/HealPriestStrategy.h
rename to src/Extend/ClassAi/Priest/Strategy/HealPriestStrategy.h
diff --git a/src/strategy/priest/HolyPriestStrategy.cpp b/src/Extend/ClassAi/Priest/Strategy/HolyPriestStrategy.cpp
similarity index 100%
rename from src/strategy/priest/HolyPriestStrategy.cpp
rename to src/Extend/ClassAi/Priest/Strategy/HolyPriestStrategy.cpp
diff --git a/src/strategy/priest/HolyPriestStrategy.h b/src/Extend/ClassAi/Priest/Strategy/HolyPriestStrategy.h
similarity index 100%
rename from src/strategy/priest/HolyPriestStrategy.h
rename to src/Extend/ClassAi/Priest/Strategy/HolyPriestStrategy.h
diff --git a/src/strategy/priest/PriestNonCombatStrategy.cpp b/src/Extend/ClassAi/Priest/Strategy/PriestNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/priest/PriestNonCombatStrategy.cpp
rename to src/Extend/ClassAi/Priest/Strategy/PriestNonCombatStrategy.cpp
diff --git a/src/strategy/priest/PriestNonCombatStrategy.h b/src/Extend/ClassAi/Priest/Strategy/PriestNonCombatStrategy.h
similarity index 100%
rename from src/strategy/priest/PriestNonCombatStrategy.h
rename to src/Extend/ClassAi/Priest/Strategy/PriestNonCombatStrategy.h
diff --git a/src/strategy/priest/PriestNonCombatStrategyActionNodeFactory.h b/src/Extend/ClassAi/Priest/Strategy/PriestNonCombatStrategyActionNodeFactory.h
similarity index 100%
rename from src/strategy/priest/PriestNonCombatStrategyActionNodeFactory.h
rename to src/Extend/ClassAi/Priest/Strategy/PriestNonCombatStrategyActionNodeFactory.h
diff --git a/src/strategy/priest/ShadowPriestStrategy.cpp b/src/Extend/ClassAi/Priest/Strategy/ShadowPriestStrategy.cpp
similarity index 100%
rename from src/strategy/priest/ShadowPriestStrategy.cpp
rename to src/Extend/ClassAi/Priest/Strategy/ShadowPriestStrategy.cpp
diff --git a/src/strategy/priest/ShadowPriestStrategy.h b/src/Extend/ClassAi/Priest/Strategy/ShadowPriestStrategy.h
similarity index 100%
rename from src/strategy/priest/ShadowPriestStrategy.h
rename to src/Extend/ClassAi/Priest/Strategy/ShadowPriestStrategy.h
diff --git a/src/strategy/priest/ShadowPriestStrategyActionNodeFactory.h b/src/Extend/ClassAi/Priest/Strategy/ShadowPriestStrategyActionNodeFactory.h
similarity index 100%
rename from src/strategy/priest/ShadowPriestStrategyActionNodeFactory.h
rename to src/Extend/ClassAi/Priest/Strategy/ShadowPriestStrategyActionNodeFactory.h
diff --git a/src/strategy/priest/PriestTriggers.cpp b/src/Extend/ClassAi/Priest/Trigger/PriestTriggers.cpp
similarity index 100%
rename from src/strategy/priest/PriestTriggers.cpp
rename to src/Extend/ClassAi/Priest/Trigger/PriestTriggers.cpp
diff --git a/src/strategy/priest/PriestTriggers.h b/src/Extend/ClassAi/Priest/Trigger/PriestTriggers.h
similarity index 100%
rename from src/strategy/priest/PriestTriggers.h
rename to src/Extend/ClassAi/Priest/Trigger/PriestTriggers.h
diff --git a/src/strategy/rogue/RogueActions.cpp b/src/Extend/ClassAi/Rogue/Action/RogueActions.cpp
similarity index 100%
rename from src/strategy/rogue/RogueActions.cpp
rename to src/Extend/ClassAi/Rogue/Action/RogueActions.cpp
diff --git a/src/strategy/rogue/RogueActions.h b/src/Extend/ClassAi/Rogue/Action/RogueActions.h
similarity index 100%
rename from src/strategy/rogue/RogueActions.h
rename to src/Extend/ClassAi/Rogue/Action/RogueActions.h
diff --git a/src/strategy/rogue/RogueComboActions.cpp b/src/Extend/ClassAi/Rogue/Action/RogueComboActions.cpp
similarity index 100%
rename from src/strategy/rogue/RogueComboActions.cpp
rename to src/Extend/ClassAi/Rogue/Action/RogueComboActions.cpp
diff --git a/src/strategy/rogue/RogueComboActions.h b/src/Extend/ClassAi/Rogue/Action/RogueComboActions.h
similarity index 100%
rename from src/strategy/rogue/RogueComboActions.h
rename to src/Extend/ClassAi/Rogue/Action/RogueComboActions.h
diff --git a/src/strategy/rogue/RogueFinishingActions.h b/src/Extend/ClassAi/Rogue/Action/RogueFinishingActions.h
similarity index 100%
rename from src/strategy/rogue/RogueFinishingActions.h
rename to src/Extend/ClassAi/Rogue/Action/RogueFinishingActions.h
diff --git a/src/strategy/rogue/RogueOpeningActions.cpp b/src/Extend/ClassAi/Rogue/Action/RogueOpeningActions.cpp
similarity index 100%
rename from src/strategy/rogue/RogueOpeningActions.cpp
rename to src/Extend/ClassAi/Rogue/Action/RogueOpeningActions.cpp
diff --git a/src/strategy/rogue/RogueOpeningActions.h b/src/Extend/ClassAi/Rogue/Action/RogueOpeningActions.h
similarity index 100%
rename from src/strategy/rogue/RogueOpeningActions.h
rename to src/Extend/ClassAi/Rogue/Action/RogueOpeningActions.h
diff --git a/src/strategy/rogue/RogueAiObjectContext.cpp b/src/Extend/ClassAi/Rogue/RogueAiObjectContext.cpp
similarity index 100%
rename from src/strategy/rogue/RogueAiObjectContext.cpp
rename to src/Extend/ClassAi/Rogue/RogueAiObjectContext.cpp
diff --git a/src/strategy/rogue/RogueAiObjectContext.h b/src/Extend/ClassAi/Rogue/RogueAiObjectContext.h
similarity index 100%
rename from src/strategy/rogue/RogueAiObjectContext.h
rename to src/Extend/ClassAi/Rogue/RogueAiObjectContext.h
diff --git a/src/strategy/rogue/AssassinationRogueStrategy.cpp b/src/Extend/ClassAi/Rogue/Strategy/AssassinationRogueStrategy.cpp
similarity index 100%
rename from src/strategy/rogue/AssassinationRogueStrategy.cpp
rename to src/Extend/ClassAi/Rogue/Strategy/AssassinationRogueStrategy.cpp
diff --git a/src/strategy/rogue/AssassinationRogueStrategy.h b/src/Extend/ClassAi/Rogue/Strategy/AssassinationRogueStrategy.h
similarity index 100%
rename from src/strategy/rogue/AssassinationRogueStrategy.h
rename to src/Extend/ClassAi/Rogue/Strategy/AssassinationRogueStrategy.h
diff --git a/src/strategy/rogue/DpsRogueStrategy.cpp b/src/Extend/ClassAi/Rogue/Strategy/DpsRogueStrategy.cpp
similarity index 100%
rename from src/strategy/rogue/DpsRogueStrategy.cpp
rename to src/Extend/ClassAi/Rogue/Strategy/DpsRogueStrategy.cpp
diff --git a/src/strategy/rogue/DpsRogueStrategy.h b/src/Extend/ClassAi/Rogue/Strategy/DpsRogueStrategy.h
similarity index 100%
rename from src/strategy/rogue/DpsRogueStrategy.h
rename to src/Extend/ClassAi/Rogue/Strategy/DpsRogueStrategy.h
diff --git a/src/strategy/rogue/GenericRogueNonCombatStrategy.cpp b/src/Extend/ClassAi/Rogue/Strategy/GenericRogueNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/rogue/GenericRogueNonCombatStrategy.cpp
rename to src/Extend/ClassAi/Rogue/Strategy/GenericRogueNonCombatStrategy.cpp
diff --git a/src/strategy/rogue/GenericRogueNonCombatStrategy.h b/src/Extend/ClassAi/Rogue/Strategy/GenericRogueNonCombatStrategy.h
similarity index 100%
rename from src/strategy/rogue/GenericRogueNonCombatStrategy.h
rename to src/Extend/ClassAi/Rogue/Strategy/GenericRogueNonCombatStrategy.h
diff --git a/src/strategy/rogue/RogueTriggers.cpp b/src/Extend/ClassAi/Rogue/Trigger/RogueTriggers.cpp
similarity index 100%
rename from src/strategy/rogue/RogueTriggers.cpp
rename to src/Extend/ClassAi/Rogue/Trigger/RogueTriggers.cpp
diff --git a/src/strategy/rogue/RogueTriggers.h b/src/Extend/ClassAi/Rogue/Trigger/RogueTriggers.h
similarity index 100%
rename from src/strategy/rogue/RogueTriggers.h
rename to src/Extend/ClassAi/Rogue/Trigger/RogueTriggers.h
diff --git a/src/strategy/shaman/ShamanActions.cpp b/src/Extend/ClassAi/Shaman/Action/ShamanActions.cpp
similarity index 100%
rename from src/strategy/shaman/ShamanActions.cpp
rename to src/Extend/ClassAi/Shaman/Action/ShamanActions.cpp
diff --git a/src/strategy/shaman/ShamanActions.h b/src/Extend/ClassAi/Shaman/Action/ShamanActions.h
similarity index 100%
rename from src/strategy/shaman/ShamanActions.h
rename to src/Extend/ClassAi/Shaman/Action/ShamanActions.h
diff --git a/src/strategy/shaman/ShamanAiObjectContext.cpp b/src/Extend/ClassAi/Shaman/ShamanAiObjectContext.cpp
similarity index 100%
rename from src/strategy/shaman/ShamanAiObjectContext.cpp
rename to src/Extend/ClassAi/Shaman/ShamanAiObjectContext.cpp
diff --git a/src/strategy/shaman/ShamanAiObjectContext.h b/src/Extend/ClassAi/Shaman/ShamanAiObjectContext.h
similarity index 100%
rename from src/strategy/shaman/ShamanAiObjectContext.h
rename to src/Extend/ClassAi/Shaman/ShamanAiObjectContext.h
diff --git a/src/strategy/shaman/ElementalShamanStrategy.cpp b/src/Extend/ClassAi/Shaman/Strategy/ElementalShamanStrategy.cpp
similarity index 100%
rename from src/strategy/shaman/ElementalShamanStrategy.cpp
rename to src/Extend/ClassAi/Shaman/Strategy/ElementalShamanStrategy.cpp
diff --git a/src/strategy/shaman/ElementalShamanStrategy.h b/src/Extend/ClassAi/Shaman/Strategy/ElementalShamanStrategy.h
similarity index 100%
rename from src/strategy/shaman/ElementalShamanStrategy.h
rename to src/Extend/ClassAi/Shaman/Strategy/ElementalShamanStrategy.h
diff --git a/src/strategy/shaman/EnhancementShamanStrategy.cpp b/src/Extend/ClassAi/Shaman/Strategy/EnhancementShamanStrategy.cpp
similarity index 100%
rename from src/strategy/shaman/EnhancementShamanStrategy.cpp
rename to src/Extend/ClassAi/Shaman/Strategy/EnhancementShamanStrategy.cpp
diff --git a/src/strategy/shaman/EnhancementShamanStrategy.h b/src/Extend/ClassAi/Shaman/Strategy/EnhancementShamanStrategy.h
similarity index 100%
rename from src/strategy/shaman/EnhancementShamanStrategy.h
rename to src/Extend/ClassAi/Shaman/Strategy/EnhancementShamanStrategy.h
diff --git a/src/strategy/shaman/GenericShamanStrategy.cpp b/src/Extend/ClassAi/Shaman/Strategy/GenericShamanStrategy.cpp
similarity index 100%
rename from src/strategy/shaman/GenericShamanStrategy.cpp
rename to src/Extend/ClassAi/Shaman/Strategy/GenericShamanStrategy.cpp
diff --git a/src/strategy/shaman/GenericShamanStrategy.h b/src/Extend/ClassAi/Shaman/Strategy/GenericShamanStrategy.h
similarity index 100%
rename from src/strategy/shaman/GenericShamanStrategy.h
rename to src/Extend/ClassAi/Shaman/Strategy/GenericShamanStrategy.h
diff --git a/src/strategy/shaman/RestoShamanStrategy.cpp b/src/Extend/ClassAi/Shaman/Strategy/RestoShamanStrategy.cpp
similarity index 100%
rename from src/strategy/shaman/RestoShamanStrategy.cpp
rename to src/Extend/ClassAi/Shaman/Strategy/RestoShamanStrategy.cpp
diff --git a/src/strategy/shaman/RestoShamanStrategy.h b/src/Extend/ClassAi/Shaman/Strategy/RestoShamanStrategy.h
similarity index 100%
rename from src/strategy/shaman/RestoShamanStrategy.h
rename to src/Extend/ClassAi/Shaman/Strategy/RestoShamanStrategy.h
diff --git a/src/strategy/shaman/ShamanNonCombatStrategy.cpp b/src/Extend/ClassAi/Shaman/Strategy/ShamanNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/shaman/ShamanNonCombatStrategy.cpp
rename to src/Extend/ClassAi/Shaman/Strategy/ShamanNonCombatStrategy.cpp
diff --git a/src/strategy/shaman/ShamanNonCombatStrategy.h b/src/Extend/ClassAi/Shaman/Strategy/ShamanNonCombatStrategy.h
similarity index 100%
rename from src/strategy/shaman/ShamanNonCombatStrategy.h
rename to src/Extend/ClassAi/Shaman/Strategy/ShamanNonCombatStrategy.h
diff --git a/src/strategy/shaman/TotemsShamanStrategy.cpp b/src/Extend/ClassAi/Shaman/Strategy/TotemsShamanStrategy.cpp
similarity index 100%
rename from src/strategy/shaman/TotemsShamanStrategy.cpp
rename to src/Extend/ClassAi/Shaman/Strategy/TotemsShamanStrategy.cpp
diff --git a/src/strategy/shaman/TotemsShamanStrategy.h b/src/Extend/ClassAi/Shaman/Strategy/TotemsShamanStrategy.h
similarity index 100%
rename from src/strategy/shaman/TotemsShamanStrategy.h
rename to src/Extend/ClassAi/Shaman/Strategy/TotemsShamanStrategy.h
diff --git a/src/strategy/shaman/ShamanTriggers.cpp b/src/Extend/ClassAi/Shaman/Trigger/ShamanTriggers.cpp
similarity index 100%
rename from src/strategy/shaman/ShamanTriggers.cpp
rename to src/Extend/ClassAi/Shaman/Trigger/ShamanTriggers.cpp
diff --git a/src/strategy/shaman/ShamanTriggers.h b/src/Extend/ClassAi/Shaman/Trigger/ShamanTriggers.h
similarity index 100%
rename from src/strategy/shaman/ShamanTriggers.h
rename to src/Extend/ClassAi/Shaman/Trigger/ShamanTriggers.h
diff --git a/src/strategy/warlock/WarlockActions.cpp b/src/Extend/ClassAi/Warlock/Action/WarlockActions.cpp
similarity index 100%
rename from src/strategy/warlock/WarlockActions.cpp
rename to src/Extend/ClassAi/Warlock/Action/WarlockActions.cpp
diff --git a/src/strategy/warlock/WarlockActions.h b/src/Extend/ClassAi/Warlock/Action/WarlockActions.h
similarity index 100%
rename from src/strategy/warlock/WarlockActions.h
rename to src/Extend/ClassAi/Warlock/Action/WarlockActions.h
diff --git a/src/strategy/warlock/AfflictionWarlockStrategy.cpp b/src/Extend/ClassAi/Warlock/Strategy/AfflictionWarlockStrategy.cpp
similarity index 100%
rename from src/strategy/warlock/AfflictionWarlockStrategy.cpp
rename to src/Extend/ClassAi/Warlock/Strategy/AfflictionWarlockStrategy.cpp
diff --git a/src/strategy/warlock/AfflictionWarlockStrategy.h b/src/Extend/ClassAi/Warlock/Strategy/AfflictionWarlockStrategy.h
similarity index 100%
rename from src/strategy/warlock/AfflictionWarlockStrategy.h
rename to src/Extend/ClassAi/Warlock/Strategy/AfflictionWarlockStrategy.h
diff --git a/src/strategy/warlock/DemonologyWarlockStrategy.cpp b/src/Extend/ClassAi/Warlock/Strategy/DemonologyWarlockStrategy.cpp
similarity index 100%
rename from src/strategy/warlock/DemonologyWarlockStrategy.cpp
rename to src/Extend/ClassAi/Warlock/Strategy/DemonologyWarlockStrategy.cpp
diff --git a/src/strategy/warlock/DemonologyWarlockStrategy.h b/src/Extend/ClassAi/Warlock/Strategy/DemonologyWarlockStrategy.h
similarity index 100%
rename from src/strategy/warlock/DemonologyWarlockStrategy.h
rename to src/Extend/ClassAi/Warlock/Strategy/DemonologyWarlockStrategy.h
diff --git a/src/strategy/warlock/DestructionWarlockStrategy.cpp b/src/Extend/ClassAi/Warlock/Strategy/DestructionWarlockStrategy.cpp
similarity index 100%
rename from src/strategy/warlock/DestructionWarlockStrategy.cpp
rename to src/Extend/ClassAi/Warlock/Strategy/DestructionWarlockStrategy.cpp
diff --git a/src/strategy/warlock/DestructionWarlockStrategy.h b/src/Extend/ClassAi/Warlock/Strategy/DestructionWarlockStrategy.h
similarity index 100%
rename from src/strategy/warlock/DestructionWarlockStrategy.h
rename to src/Extend/ClassAi/Warlock/Strategy/DestructionWarlockStrategy.h
diff --git a/src/strategy/warlock/GenericWarlockNonCombatStrategy.cpp b/src/Extend/ClassAi/Warlock/Strategy/GenericWarlockNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/warlock/GenericWarlockNonCombatStrategy.cpp
rename to src/Extend/ClassAi/Warlock/Strategy/GenericWarlockNonCombatStrategy.cpp
diff --git a/src/strategy/warlock/GenericWarlockNonCombatStrategy.h b/src/Extend/ClassAi/Warlock/Strategy/GenericWarlockNonCombatStrategy.h
similarity index 100%
rename from src/strategy/warlock/GenericWarlockNonCombatStrategy.h
rename to src/Extend/ClassAi/Warlock/Strategy/GenericWarlockNonCombatStrategy.h
diff --git a/src/strategy/warlock/GenericWarlockStrategy.cpp b/src/Extend/ClassAi/Warlock/Strategy/GenericWarlockStrategy.cpp
similarity index 100%
rename from src/strategy/warlock/GenericWarlockStrategy.cpp
rename to src/Extend/ClassAi/Warlock/Strategy/GenericWarlockStrategy.cpp
diff --git a/src/strategy/warlock/GenericWarlockStrategy.h b/src/Extend/ClassAi/Warlock/Strategy/GenericWarlockStrategy.h
similarity index 100%
rename from src/strategy/warlock/GenericWarlockStrategy.h
rename to src/Extend/ClassAi/Warlock/Strategy/GenericWarlockStrategy.h
diff --git a/src/strategy/warlock/TankWarlockStrategy.cpp b/src/Extend/ClassAi/Warlock/Strategy/TankWarlockStrategy.cpp
similarity index 100%
rename from src/strategy/warlock/TankWarlockStrategy.cpp
rename to src/Extend/ClassAi/Warlock/Strategy/TankWarlockStrategy.cpp
diff --git a/src/strategy/warlock/TankWarlockStrategy.h b/src/Extend/ClassAi/Warlock/Strategy/TankWarlockStrategy.h
similarity index 100%
rename from src/strategy/warlock/TankWarlockStrategy.h
rename to src/Extend/ClassAi/Warlock/Strategy/TankWarlockStrategy.h
diff --git a/src/strategy/warlock/WarlockTriggers.cpp b/src/Extend/ClassAi/Warlock/Trigger/WarlockTriggers.cpp
similarity index 100%
rename from src/strategy/warlock/WarlockTriggers.cpp
rename to src/Extend/ClassAi/Warlock/Trigger/WarlockTriggers.cpp
diff --git a/src/strategy/warlock/WarlockTriggers.h b/src/Extend/ClassAi/Warlock/Trigger/WarlockTriggers.h
similarity index 100%
rename from src/strategy/warlock/WarlockTriggers.h
rename to src/Extend/ClassAi/Warlock/Trigger/WarlockTriggers.h
diff --git a/src/strategy/warlock/WarlockAiObjectContext.cpp b/src/Extend/ClassAi/Warlock/WarlockAiObjectContext.cpp
similarity index 100%
rename from src/strategy/warlock/WarlockAiObjectContext.cpp
rename to src/Extend/ClassAi/Warlock/WarlockAiObjectContext.cpp
diff --git a/src/strategy/warlock/WarlockAiObjectContext.h b/src/Extend/ClassAi/Warlock/WarlockAiObjectContext.h
similarity index 100%
rename from src/strategy/warlock/WarlockAiObjectContext.h
rename to src/Extend/ClassAi/Warlock/WarlockAiObjectContext.h
diff --git a/src/strategy/warrior/WarriorActions.cpp b/src/Extend/ClassAi/Warrior/Action/WarriorActions.cpp
similarity index 100%
rename from src/strategy/warrior/WarriorActions.cpp
rename to src/Extend/ClassAi/Warrior/Action/WarriorActions.cpp
diff --git a/src/strategy/warrior/WarriorActions.h b/src/Extend/ClassAi/Warrior/Action/WarriorActions.h
similarity index 100%
rename from src/strategy/warrior/WarriorActions.h
rename to src/Extend/ClassAi/Warrior/Action/WarriorActions.h
diff --git a/src/strategy/warrior/ArmsWarriorStrategy.cpp b/src/Extend/ClassAi/Warrior/Strategy/ArmsWarriorStrategy.cpp
similarity index 100%
rename from src/strategy/warrior/ArmsWarriorStrategy.cpp
rename to src/Extend/ClassAi/Warrior/Strategy/ArmsWarriorStrategy.cpp
diff --git a/src/strategy/warrior/ArmsWarriorStrategy.h b/src/Extend/ClassAi/Warrior/Strategy/ArmsWarriorStrategy.h
similarity index 100%
rename from src/strategy/warrior/ArmsWarriorStrategy.h
rename to src/Extend/ClassAi/Warrior/Strategy/ArmsWarriorStrategy.h
diff --git a/src/strategy/warrior/FuryWarriorStrategy.cpp b/src/Extend/ClassAi/Warrior/Strategy/FuryWarriorStrategy.cpp
similarity index 100%
rename from src/strategy/warrior/FuryWarriorStrategy.cpp
rename to src/Extend/ClassAi/Warrior/Strategy/FuryWarriorStrategy.cpp
diff --git a/src/strategy/warrior/FuryWarriorStrategy.h b/src/Extend/ClassAi/Warrior/Strategy/FuryWarriorStrategy.h
similarity index 100%
rename from src/strategy/warrior/FuryWarriorStrategy.h
rename to src/Extend/ClassAi/Warrior/Strategy/FuryWarriorStrategy.h
diff --git a/src/strategy/warrior/GenericWarriorNonCombatStrategy.cpp b/src/Extend/ClassAi/Warrior/Strategy/GenericWarriorNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/warrior/GenericWarriorNonCombatStrategy.cpp
rename to src/Extend/ClassAi/Warrior/Strategy/GenericWarriorNonCombatStrategy.cpp
diff --git a/src/strategy/warrior/GenericWarriorNonCombatStrategy.h b/src/Extend/ClassAi/Warrior/Strategy/GenericWarriorNonCombatStrategy.h
similarity index 100%
rename from src/strategy/warrior/GenericWarriorNonCombatStrategy.h
rename to src/Extend/ClassAi/Warrior/Strategy/GenericWarriorNonCombatStrategy.h
diff --git a/src/strategy/warrior/GenericWarriorStrategy.cpp b/src/Extend/ClassAi/Warrior/Strategy/GenericWarriorStrategy.cpp
similarity index 100%
rename from src/strategy/warrior/GenericWarriorStrategy.cpp
rename to src/Extend/ClassAi/Warrior/Strategy/GenericWarriorStrategy.cpp
diff --git a/src/strategy/warrior/GenericWarriorStrategy.h b/src/Extend/ClassAi/Warrior/Strategy/GenericWarriorStrategy.h
similarity index 100%
rename from src/strategy/warrior/GenericWarriorStrategy.h
rename to src/Extend/ClassAi/Warrior/Strategy/GenericWarriorStrategy.h
diff --git a/src/strategy/warrior/TankWarriorStrategy.cpp b/src/Extend/ClassAi/Warrior/Strategy/TankWarriorStrategy.cpp
similarity index 100%
rename from src/strategy/warrior/TankWarriorStrategy.cpp
rename to src/Extend/ClassAi/Warrior/Strategy/TankWarriorStrategy.cpp
diff --git a/src/strategy/warrior/TankWarriorStrategy.h b/src/Extend/ClassAi/Warrior/Strategy/TankWarriorStrategy.h
similarity index 100%
rename from src/strategy/warrior/TankWarriorStrategy.h
rename to src/Extend/ClassAi/Warrior/Strategy/TankWarriorStrategy.h
diff --git a/src/strategy/warrior/WarriorTriggers.cpp b/src/Extend/ClassAi/Warrior/Trigger/WarriorTriggers.cpp
similarity index 100%
rename from src/strategy/warrior/WarriorTriggers.cpp
rename to src/Extend/ClassAi/Warrior/Trigger/WarriorTriggers.cpp
diff --git a/src/strategy/warrior/WarriorTriggers.h b/src/Extend/ClassAi/Warrior/Trigger/WarriorTriggers.h
similarity index 100%
rename from src/strategy/warrior/WarriorTriggers.h
rename to src/Extend/ClassAi/Warrior/Trigger/WarriorTriggers.h
diff --git a/src/strategy/warrior/WarriorAiObjectContext.cpp b/src/Extend/ClassAi/Warrior/WarriorAiObjectContext.cpp
similarity index 100%
rename from src/strategy/warrior/WarriorAiObjectContext.cpp
rename to src/Extend/ClassAi/Warrior/WarriorAiObjectContext.cpp
diff --git a/src/strategy/warrior/WarriorAiObjectContext.h b/src/Extend/ClassAi/Warrior/WarriorAiObjectContext.h
similarity index 100%
rename from src/strategy/warrior/WarriorAiObjectContext.h
rename to src/Extend/ClassAi/Warrior/WarriorAiObjectContext.h
diff --git a/src/strategy/dungeons/DungeonStrategyContext.h b/src/Extend/DungeonAi/DungeonStrategyContext.h
similarity index 81%
rename from src/strategy/dungeons/DungeonStrategyContext.h
rename to src/Extend/DungeonAi/DungeonStrategyContext.h
index cc606afe..c3136294 100644
--- a/src/strategy/dungeons/DungeonStrategyContext.h
+++ b/src/Extend/DungeonAi/DungeonStrategyContext.h
@@ -2,21 +2,21 @@
 #define _PLAYERBOT_DUNGEONSTRATEGYCONTEXT_H
 
 #include "Strategy.h"
-#include "wotlk/utgardekeep/UtgardeKeepStrategy.h"
-#include "wotlk/nexus/NexusStrategy.h"
-#include "wotlk/azjolnerub/AzjolNerubStrategy.h"
-#include "wotlk/oldkingdom/OldKingdomStrategy.h"
-#include "wotlk/draktharonkeep/DrakTharonKeepStrategy.h"
-#include "wotlk/violethold/VioletHoldStrategy.h"
-#include "wotlk/gundrak/GundrakStrategy.h"
-#include "wotlk/hallsofstone/HallsOfStoneStrategy.h"
-#include "wotlk/hallsoflightning/HallsOfLightningStrategy.h"
-#include "wotlk/oculus/OculusStrategy.h"
-#include "wotlk/utgardepinnacle/UtgardePinnacleStrategy.h"
-#include "wotlk/cullingofstratholme/CullingOfStratholmeStrategy.h"
-#include "wotlk/forgeofsouls/ForgeOfSoulsStrategy.h"
-#include "wotlk/pitofsaron/PitOfSaronStrategy.h"
-#include "wotlk/trialofthechampion/TrialOfTheChampionStrategy.h"
+#include "Wotlk/UtgardeKeep/Strategy/UtgardeKeepStrategy.h"
+#include "Wotlk/Nexus/Strategy/NexusStrategy.h"
+#include "Wotlk/AzjolNerub/Strategy/AzjolNerubStrategy.h"
+#include "Wotlk/OldKingdom/Strategy/OldKingdomStrategy.h"
+#include "Wotlk/DraktharonKeep/Strategy/DrakTharonKeepStrategy.h"
+#include "Wotlk/VioletHold/Strategy/VioletHoldStrategy.h"
+#include "Wotlk/Gundrak/Strategy/GundrakStrategy.h"
+#include "Wotlk/HallsOfStone/Strategy/HallsOfStoneStrategy.h"
+#include "Wotlk/HallsOfLightning/Strategy/HallsOfLightningStrategy.h"
+#include "Wotlk/Oculus/Strategy/OculusStrategy.h"
+#include "Wotlk/UtgardePinnacle/Strategy/UtgardePinnacleStrategy.h"
+#include "Wotlk/CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.h"
+#include "Wotlk/ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.h"
+#include "Wotlk/PitOfSaron/Strategy/PitOfSaronStrategy.h"
+#include "Wotlk/TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.h"
 
 /*
 Full list/TODO:
diff --git a/src/strategy/dungeons/DungeonStrategyUtils.h b/src/Extend/DungeonAi/DungeonStrategyUtils.h
similarity index 100%
rename from src/strategy/dungeons/DungeonStrategyUtils.h
rename to src/Extend/DungeonAi/DungeonStrategyUtils.h
diff --git a/src/strategy/dungeons/wotlk/azjolnerub/AzjolNerubActions.cpp b/src/Extend/DungeonAi/Wotlk/AzjolNerub/Action/AzjolNerubActions.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/azjolnerub/AzjolNerubActions.cpp
rename to src/Extend/DungeonAi/Wotlk/AzjolNerub/Action/AzjolNerubActions.cpp
diff --git a/src/strategy/dungeons/wotlk/azjolnerub/AzjolNerubActions.h b/src/Extend/DungeonAi/Wotlk/AzjolNerub/Action/AzjolNerubActions.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/azjolnerub/AzjolNerubActions.h
rename to src/Extend/DungeonAi/Wotlk/AzjolNerub/Action/AzjolNerubActions.h
diff --git a/src/strategy/dungeons/wotlk/azjolnerub/AzjolNerubActionContext.h b/src/Extend/DungeonAi/Wotlk/AzjolNerub/AzjolNerubActionContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/azjolnerub/AzjolNerubActionContext.h
rename to src/Extend/DungeonAi/Wotlk/AzjolNerub/AzjolNerubActionContext.h
diff --git a/src/strategy/dungeons/wotlk/azjolnerub/AzjolNerubTriggerContext.h b/src/Extend/DungeonAi/Wotlk/AzjolNerub/AzjolNerubTriggerContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/azjolnerub/AzjolNerubTriggerContext.h
rename to src/Extend/DungeonAi/Wotlk/AzjolNerub/AzjolNerubTriggerContext.h
diff --git a/src/strategy/dungeons/wotlk/azjolnerub/AzjolNerubMultipliers.cpp b/src/Extend/DungeonAi/Wotlk/AzjolNerub/Multiplier/AzjolNerubMultipliers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/azjolnerub/AzjolNerubMultipliers.cpp
rename to src/Extend/DungeonAi/Wotlk/AzjolNerub/Multiplier/AzjolNerubMultipliers.cpp
diff --git a/src/strategy/dungeons/wotlk/azjolnerub/AzjolNerubMultipliers.h b/src/Extend/DungeonAi/Wotlk/AzjolNerub/Multiplier/AzjolNerubMultipliers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/azjolnerub/AzjolNerubMultipliers.h
rename to src/Extend/DungeonAi/Wotlk/AzjolNerub/Multiplier/AzjolNerubMultipliers.h
diff --git a/src/strategy/dungeons/wotlk/azjolnerub/AzjolNerubStrategy.cpp b/src/Extend/DungeonAi/Wotlk/AzjolNerub/Strategy/AzjolNerubStrategy.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/azjolnerub/AzjolNerubStrategy.cpp
rename to src/Extend/DungeonAi/Wotlk/AzjolNerub/Strategy/AzjolNerubStrategy.cpp
diff --git a/src/strategy/dungeons/wotlk/azjolnerub/AzjolNerubStrategy.h b/src/Extend/DungeonAi/Wotlk/AzjolNerub/Strategy/AzjolNerubStrategy.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/azjolnerub/AzjolNerubStrategy.h
rename to src/Extend/DungeonAi/Wotlk/AzjolNerub/Strategy/AzjolNerubStrategy.h
diff --git a/src/strategy/dungeons/wotlk/azjolnerub/AzjolNerubTriggers.cpp b/src/Extend/DungeonAi/Wotlk/AzjolNerub/Trigger/AzjolNerubTriggers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/azjolnerub/AzjolNerubTriggers.cpp
rename to src/Extend/DungeonAi/Wotlk/AzjolNerub/Trigger/AzjolNerubTriggers.cpp
diff --git a/src/strategy/dungeons/wotlk/azjolnerub/AzjolNerubTriggers.h b/src/Extend/DungeonAi/Wotlk/AzjolNerub/Trigger/AzjolNerubTriggers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/azjolnerub/AzjolNerubTriggers.h
rename to src/Extend/DungeonAi/Wotlk/AzjolNerub/Trigger/AzjolNerubTriggers.h
diff --git a/src/strategy/dungeons/wotlk/cullingofstratholme/CullingOfStratholmeActions.cpp b/src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Action/CullingOfStratholmeActions.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/cullingofstratholme/CullingOfStratholmeActions.cpp
rename to src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Action/CullingOfStratholmeActions.cpp
diff --git a/src/strategy/dungeons/wotlk/cullingofstratholme/CullingOfStratholmeActions.h b/src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Action/CullingOfStratholmeActions.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/cullingofstratholme/CullingOfStratholmeActions.h
rename to src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Action/CullingOfStratholmeActions.h
diff --git a/src/strategy/dungeons/wotlk/cullingofstratholme/CullingOfStratholmeActionContext.h b/src/Extend/DungeonAi/Wotlk/CullingOfStratholme/CullingOfStratholmeActionContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/cullingofstratholme/CullingOfStratholmeActionContext.h
rename to src/Extend/DungeonAi/Wotlk/CullingOfStratholme/CullingOfStratholmeActionContext.h
diff --git a/src/strategy/dungeons/wotlk/cullingofstratholme/CullingOfStratholmeTriggerContext.h b/src/Extend/DungeonAi/Wotlk/CullingOfStratholme/CullingOfStratholmeTriggerContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/cullingofstratholme/CullingOfStratholmeTriggerContext.h
rename to src/Extend/DungeonAi/Wotlk/CullingOfStratholme/CullingOfStratholmeTriggerContext.h
diff --git a/src/strategy/dungeons/wotlk/cullingofstratholme/CullingOfStratholmeMultipliers.cpp b/src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Multiplier/CullingOfStratholmeMultipliers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/cullingofstratholme/CullingOfStratholmeMultipliers.cpp
rename to src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Multiplier/CullingOfStratholmeMultipliers.cpp
diff --git a/src/strategy/dungeons/wotlk/cullingofstratholme/CullingOfStratholmeMultipliers.h b/src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Multiplier/CullingOfStratholmeMultipliers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/cullingofstratholme/CullingOfStratholmeMultipliers.h
rename to src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Multiplier/CullingOfStratholmeMultipliers.h
diff --git a/src/strategy/dungeons/wotlk/cullingofstratholme/CullingOfStratholmeStrategy.cpp b/src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/cullingofstratholme/CullingOfStratholmeStrategy.cpp
rename to src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.cpp
diff --git a/src/strategy/dungeons/wotlk/cullingofstratholme/CullingOfStratholmeStrategy.h b/src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/cullingofstratholme/CullingOfStratholmeStrategy.h
rename to src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.h
diff --git a/src/strategy/dungeons/wotlk/cullingofstratholme/CullingOfStratholmeTriggers.cpp b/src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Trigger/CullingOfStratholmeTriggers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/cullingofstratholme/CullingOfStratholmeTriggers.cpp
rename to src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Trigger/CullingOfStratholmeTriggers.cpp
diff --git a/src/strategy/dungeons/wotlk/cullingofstratholme/CullingOfStratholmeTriggers.h b/src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Trigger/CullingOfStratholmeTriggers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/cullingofstratholme/CullingOfStratholmeTriggers.h
rename to src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Trigger/CullingOfStratholmeTriggers.h
diff --git a/src/strategy/dungeons/wotlk/draktharonkeep/DrakTharonKeepActions.cpp b/src/Extend/DungeonAi/Wotlk/DraktharonKeep/Action/DrakTharonKeepActions.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/draktharonkeep/DrakTharonKeepActions.cpp
rename to src/Extend/DungeonAi/Wotlk/DraktharonKeep/Action/DrakTharonKeepActions.cpp
diff --git a/src/strategy/dungeons/wotlk/draktharonkeep/DrakTharonKeepActions.h b/src/Extend/DungeonAi/Wotlk/DraktharonKeep/Action/DrakTharonKeepActions.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/draktharonkeep/DrakTharonKeepActions.h
rename to src/Extend/DungeonAi/Wotlk/DraktharonKeep/Action/DrakTharonKeepActions.h
diff --git a/src/strategy/dungeons/wotlk/draktharonkeep/DrakTharonKeepActionContext.h b/src/Extend/DungeonAi/Wotlk/DraktharonKeep/DrakTharonKeepActionContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/draktharonkeep/DrakTharonKeepActionContext.h
rename to src/Extend/DungeonAi/Wotlk/DraktharonKeep/DrakTharonKeepActionContext.h
diff --git a/src/strategy/dungeons/wotlk/draktharonkeep/DrakTharonKeepTriggerContext.h b/src/Extend/DungeonAi/Wotlk/DraktharonKeep/DrakTharonKeepTriggerContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/draktharonkeep/DrakTharonKeepTriggerContext.h
rename to src/Extend/DungeonAi/Wotlk/DraktharonKeep/DrakTharonKeepTriggerContext.h
diff --git a/src/strategy/dungeons/wotlk/draktharonkeep/DrakTharonKeepMultipliers.cpp b/src/Extend/DungeonAi/Wotlk/DraktharonKeep/Multiplier/DrakTharonKeepMultipliers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/draktharonkeep/DrakTharonKeepMultipliers.cpp
rename to src/Extend/DungeonAi/Wotlk/DraktharonKeep/Multiplier/DrakTharonKeepMultipliers.cpp
diff --git a/src/strategy/dungeons/wotlk/draktharonkeep/DrakTharonKeepMultipliers.h b/src/Extend/DungeonAi/Wotlk/DraktharonKeep/Multiplier/DrakTharonKeepMultipliers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/draktharonkeep/DrakTharonKeepMultipliers.h
rename to src/Extend/DungeonAi/Wotlk/DraktharonKeep/Multiplier/DrakTharonKeepMultipliers.h
diff --git a/src/strategy/dungeons/wotlk/draktharonkeep/DrakTharonKeepStrategy.cpp b/src/Extend/DungeonAi/Wotlk/DraktharonKeep/Strategy/DrakTharonKeepStrategy.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/draktharonkeep/DrakTharonKeepStrategy.cpp
rename to src/Extend/DungeonAi/Wotlk/DraktharonKeep/Strategy/DrakTharonKeepStrategy.cpp
diff --git a/src/strategy/dungeons/wotlk/draktharonkeep/DrakTharonKeepStrategy.h b/src/Extend/DungeonAi/Wotlk/DraktharonKeep/Strategy/DrakTharonKeepStrategy.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/draktharonkeep/DrakTharonKeepStrategy.h
rename to src/Extend/DungeonAi/Wotlk/DraktharonKeep/Strategy/DrakTharonKeepStrategy.h
diff --git a/src/strategy/dungeons/wotlk/draktharonkeep/DrakTharonKeepTriggers.cpp b/src/Extend/DungeonAi/Wotlk/DraktharonKeep/Trigger/DrakTharonKeepTriggers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/draktharonkeep/DrakTharonKeepTriggers.cpp
rename to src/Extend/DungeonAi/Wotlk/DraktharonKeep/Trigger/DrakTharonKeepTriggers.cpp
diff --git a/src/strategy/dungeons/wotlk/draktharonkeep/DrakTharonKeepTriggers.h b/src/Extend/DungeonAi/Wotlk/DraktharonKeep/Trigger/DrakTharonKeepTriggers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/draktharonkeep/DrakTharonKeepTriggers.h
rename to src/Extend/DungeonAi/Wotlk/DraktharonKeep/Trigger/DrakTharonKeepTriggers.h
diff --git a/src/strategy/dungeons/wotlk/forgeofsouls/ForgeOfSoulsActions.cpp b/src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Action/ForgeOfSoulsActions.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/forgeofsouls/ForgeOfSoulsActions.cpp
rename to src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Action/ForgeOfSoulsActions.cpp
diff --git a/src/strategy/dungeons/wotlk/forgeofsouls/ForgeOfSoulsActions.h b/src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Action/ForgeOfSoulsActions.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/forgeofsouls/ForgeOfSoulsActions.h
rename to src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Action/ForgeOfSoulsActions.h
diff --git a/src/strategy/dungeons/wotlk/forgeofsouls/ForgeOfSoulsActionContext.h b/src/Extend/DungeonAi/Wotlk/ForgeOfSouls/ForgeOfSoulsActionContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/forgeofsouls/ForgeOfSoulsActionContext.h
rename to src/Extend/DungeonAi/Wotlk/ForgeOfSouls/ForgeOfSoulsActionContext.h
diff --git a/src/strategy/dungeons/wotlk/forgeofsouls/ForgeOfSoulsTriggerContext.h b/src/Extend/DungeonAi/Wotlk/ForgeOfSouls/ForgeOfSoulsTriggerContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/forgeofsouls/ForgeOfSoulsTriggerContext.h
rename to src/Extend/DungeonAi/Wotlk/ForgeOfSouls/ForgeOfSoulsTriggerContext.h
diff --git a/src/strategy/dungeons/wotlk/forgeofsouls/ForgeOfSoulsMultipliers.cpp b/src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Multiplier/ForgeOfSoulsMultipliers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/forgeofsouls/ForgeOfSoulsMultipliers.cpp
rename to src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Multiplier/ForgeOfSoulsMultipliers.cpp
diff --git a/src/strategy/dungeons/wotlk/forgeofsouls/ForgeOfSoulsMultipliers.h b/src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Multiplier/ForgeOfSoulsMultipliers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/forgeofsouls/ForgeOfSoulsMultipliers.h
rename to src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Multiplier/ForgeOfSoulsMultipliers.h
diff --git a/src/strategy/dungeons/wotlk/forgeofsouls/ForgeOfSoulsStrategy.cpp b/src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/forgeofsouls/ForgeOfSoulsStrategy.cpp
rename to src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.cpp
diff --git a/src/strategy/dungeons/wotlk/forgeofsouls/ForgeOfSoulsStrategy.h b/src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/forgeofsouls/ForgeOfSoulsStrategy.h
rename to src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.h
diff --git a/src/strategy/dungeons/wotlk/forgeofsouls/ForgeOfSoulsTriggers.cpp b/src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Trigger/ForgeOfSoulsTriggers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/forgeofsouls/ForgeOfSoulsTriggers.cpp
rename to src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Trigger/ForgeOfSoulsTriggers.cpp
diff --git a/src/strategy/dungeons/wotlk/forgeofsouls/ForgeOfSoulsTriggers.h b/src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Trigger/ForgeOfSoulsTriggers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/forgeofsouls/ForgeOfSoulsTriggers.h
rename to src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Trigger/ForgeOfSoulsTriggers.h
diff --git a/src/strategy/dungeons/wotlk/gundrak/GundrakActions.cpp b/src/Extend/DungeonAi/Wotlk/Gundrak/Action/GundrakActions.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/gundrak/GundrakActions.cpp
rename to src/Extend/DungeonAi/Wotlk/Gundrak/Action/GundrakActions.cpp
diff --git a/src/strategy/dungeons/wotlk/gundrak/GundrakActions.h b/src/Extend/DungeonAi/Wotlk/Gundrak/Action/GundrakActions.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/gundrak/GundrakActions.h
rename to src/Extend/DungeonAi/Wotlk/Gundrak/Action/GundrakActions.h
diff --git a/src/strategy/dungeons/wotlk/gundrak/GundrakActionContext.h b/src/Extend/DungeonAi/Wotlk/Gundrak/GundrakActionContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/gundrak/GundrakActionContext.h
rename to src/Extend/DungeonAi/Wotlk/Gundrak/GundrakActionContext.h
diff --git a/src/strategy/dungeons/wotlk/gundrak/GundrakTriggerContext.h b/src/Extend/DungeonAi/Wotlk/Gundrak/GundrakTriggerContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/gundrak/GundrakTriggerContext.h
rename to src/Extend/DungeonAi/Wotlk/Gundrak/GundrakTriggerContext.h
diff --git a/src/strategy/dungeons/wotlk/gundrak/GundrakMultipliers.cpp b/src/Extend/DungeonAi/Wotlk/Gundrak/Multiplier/GundrakMultipliers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/gundrak/GundrakMultipliers.cpp
rename to src/Extend/DungeonAi/Wotlk/Gundrak/Multiplier/GundrakMultipliers.cpp
diff --git a/src/strategy/dungeons/wotlk/gundrak/GundrakMultipliers.h b/src/Extend/DungeonAi/Wotlk/Gundrak/Multiplier/GundrakMultipliers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/gundrak/GundrakMultipliers.h
rename to src/Extend/DungeonAi/Wotlk/Gundrak/Multiplier/GundrakMultipliers.h
diff --git a/src/strategy/dungeons/wotlk/gundrak/GundrakStrategy.cpp b/src/Extend/DungeonAi/Wotlk/Gundrak/Strategy/GundrakStrategy.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/gundrak/GundrakStrategy.cpp
rename to src/Extend/DungeonAi/Wotlk/Gundrak/Strategy/GundrakStrategy.cpp
diff --git a/src/strategy/dungeons/wotlk/gundrak/GundrakStrategy.h b/src/Extend/DungeonAi/Wotlk/Gundrak/Strategy/GundrakStrategy.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/gundrak/GundrakStrategy.h
rename to src/Extend/DungeonAi/Wotlk/Gundrak/Strategy/GundrakStrategy.h
diff --git a/src/strategy/dungeons/wotlk/gundrak/GundrakTriggers.cpp b/src/Extend/DungeonAi/Wotlk/Gundrak/Trigger/GundrakTriggers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/gundrak/GundrakTriggers.cpp
rename to src/Extend/DungeonAi/Wotlk/Gundrak/Trigger/GundrakTriggers.cpp
diff --git a/src/strategy/dungeons/wotlk/gundrak/GundrakTriggers.h b/src/Extend/DungeonAi/Wotlk/Gundrak/Trigger/GundrakTriggers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/gundrak/GundrakTriggers.h
rename to src/Extend/DungeonAi/Wotlk/Gundrak/Trigger/GundrakTriggers.h
diff --git a/src/strategy/dungeons/wotlk/hallsoflightning/HallsOfLightningActions.cpp b/src/Extend/DungeonAi/Wotlk/HallsOfLightning/Action/HallsOfLightningActions.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsoflightning/HallsOfLightningActions.cpp
rename to src/Extend/DungeonAi/Wotlk/HallsOfLightning/Action/HallsOfLightningActions.cpp
diff --git a/src/strategy/dungeons/wotlk/hallsoflightning/HallsOfLightningActions.h b/src/Extend/DungeonAi/Wotlk/HallsOfLightning/Action/HallsOfLightningActions.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsoflightning/HallsOfLightningActions.h
rename to src/Extend/DungeonAi/Wotlk/HallsOfLightning/Action/HallsOfLightningActions.h
diff --git a/src/strategy/dungeons/wotlk/hallsoflightning/HallsOfLightningActionContext.h b/src/Extend/DungeonAi/Wotlk/HallsOfLightning/HallsOfLightningActionContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsoflightning/HallsOfLightningActionContext.h
rename to src/Extend/DungeonAi/Wotlk/HallsOfLightning/HallsOfLightningActionContext.h
diff --git a/src/strategy/dungeons/wotlk/hallsoflightning/HallsOfLightningTriggerContext.h b/src/Extend/DungeonAi/Wotlk/HallsOfLightning/HallsOfLightningTriggerContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsoflightning/HallsOfLightningTriggerContext.h
rename to src/Extend/DungeonAi/Wotlk/HallsOfLightning/HallsOfLightningTriggerContext.h
diff --git a/src/strategy/dungeons/wotlk/hallsoflightning/HallsOfLightningMultipliers.cpp b/src/Extend/DungeonAi/Wotlk/HallsOfLightning/Multiplier/HallsOfLightningMultipliers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsoflightning/HallsOfLightningMultipliers.cpp
rename to src/Extend/DungeonAi/Wotlk/HallsOfLightning/Multiplier/HallsOfLightningMultipliers.cpp
diff --git a/src/strategy/dungeons/wotlk/hallsoflightning/HallsOfLightningMultipliers.h b/src/Extend/DungeonAi/Wotlk/HallsOfLightning/Multiplier/HallsOfLightningMultipliers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsoflightning/HallsOfLightningMultipliers.h
rename to src/Extend/DungeonAi/Wotlk/HallsOfLightning/Multiplier/HallsOfLightningMultipliers.h
diff --git a/src/strategy/dungeons/wotlk/hallsoflightning/HallsOfLightningStrategy.cpp b/src/Extend/DungeonAi/Wotlk/HallsOfLightning/Strategy/HallsOfLightningStrategy.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsoflightning/HallsOfLightningStrategy.cpp
rename to src/Extend/DungeonAi/Wotlk/HallsOfLightning/Strategy/HallsOfLightningStrategy.cpp
diff --git a/src/strategy/dungeons/wotlk/hallsoflightning/HallsOfLightningStrategy.h b/src/Extend/DungeonAi/Wotlk/HallsOfLightning/Strategy/HallsOfLightningStrategy.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsoflightning/HallsOfLightningStrategy.h
rename to src/Extend/DungeonAi/Wotlk/HallsOfLightning/Strategy/HallsOfLightningStrategy.h
diff --git a/src/strategy/dungeons/wotlk/hallsoflightning/HallsOfLightningTriggers.cpp b/src/Extend/DungeonAi/Wotlk/HallsOfLightning/Trigger/HallsOfLightningTriggers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsoflightning/HallsOfLightningTriggers.cpp
rename to src/Extend/DungeonAi/Wotlk/HallsOfLightning/Trigger/HallsOfLightningTriggers.cpp
diff --git a/src/strategy/dungeons/wotlk/hallsoflightning/HallsOfLightningTriggers.h b/src/Extend/DungeonAi/Wotlk/HallsOfLightning/Trigger/HallsOfLightningTriggers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsoflightning/HallsOfLightningTriggers.h
rename to src/Extend/DungeonAi/Wotlk/HallsOfLightning/Trigger/HallsOfLightningTriggers.h
diff --git a/src/strategy/dungeons/wotlk/hallsofreflection/TODO b/src/Extend/DungeonAi/Wotlk/HallsOfReflection/TODO
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsofreflection/TODO
rename to src/Extend/DungeonAi/Wotlk/HallsOfReflection/TODO
diff --git a/src/strategy/dungeons/wotlk/hallsofstone/HallsOfStoneActions.cpp b/src/Extend/DungeonAi/Wotlk/HallsOfStone/Action/HallsOfStoneActions.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsofstone/HallsOfStoneActions.cpp
rename to src/Extend/DungeonAi/Wotlk/HallsOfStone/Action/HallsOfStoneActions.cpp
diff --git a/src/strategy/dungeons/wotlk/hallsofstone/HallsOfStoneActions.h b/src/Extend/DungeonAi/Wotlk/HallsOfStone/Action/HallsOfStoneActions.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsofstone/HallsOfStoneActions.h
rename to src/Extend/DungeonAi/Wotlk/HallsOfStone/Action/HallsOfStoneActions.h
diff --git a/src/strategy/dungeons/wotlk/hallsofstone/HallsOfStoneActionContext.h b/src/Extend/DungeonAi/Wotlk/HallsOfStone/HallsOfStoneActionContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsofstone/HallsOfStoneActionContext.h
rename to src/Extend/DungeonAi/Wotlk/HallsOfStone/HallsOfStoneActionContext.h
diff --git a/src/strategy/dungeons/wotlk/hallsofstone/HallsOfStoneTriggerContext.h b/src/Extend/DungeonAi/Wotlk/HallsOfStone/HallsOfStoneTriggerContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsofstone/HallsOfStoneTriggerContext.h
rename to src/Extend/DungeonAi/Wotlk/HallsOfStone/HallsOfStoneTriggerContext.h
diff --git a/src/strategy/dungeons/wotlk/hallsofstone/HallsOfStoneMultipliers.cpp b/src/Extend/DungeonAi/Wotlk/HallsOfStone/Multiplier/HallsOfStoneMultipliers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsofstone/HallsOfStoneMultipliers.cpp
rename to src/Extend/DungeonAi/Wotlk/HallsOfStone/Multiplier/HallsOfStoneMultipliers.cpp
diff --git a/src/strategy/dungeons/wotlk/hallsofstone/HallsOfStoneMultipliers.h b/src/Extend/DungeonAi/Wotlk/HallsOfStone/Multiplier/HallsOfStoneMultipliers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsofstone/HallsOfStoneMultipliers.h
rename to src/Extend/DungeonAi/Wotlk/HallsOfStone/Multiplier/HallsOfStoneMultipliers.h
diff --git a/src/strategy/dungeons/wotlk/hallsofstone/HallsOfStoneStrategy.cpp b/src/Extend/DungeonAi/Wotlk/HallsOfStone/Strategy/HallsOfStoneStrategy.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsofstone/HallsOfStoneStrategy.cpp
rename to src/Extend/DungeonAi/Wotlk/HallsOfStone/Strategy/HallsOfStoneStrategy.cpp
diff --git a/src/strategy/dungeons/wotlk/hallsofstone/HallsOfStoneStrategy.h b/src/Extend/DungeonAi/Wotlk/HallsOfStone/Strategy/HallsOfStoneStrategy.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsofstone/HallsOfStoneStrategy.h
rename to src/Extend/DungeonAi/Wotlk/HallsOfStone/Strategy/HallsOfStoneStrategy.h
diff --git a/src/strategy/dungeons/wotlk/hallsofstone/HallsOfStoneTriggers.cpp b/src/Extend/DungeonAi/Wotlk/HallsOfStone/Trigger/HallsOfStoneTriggers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsofstone/HallsOfStoneTriggers.cpp
rename to src/Extend/DungeonAi/Wotlk/HallsOfStone/Trigger/HallsOfStoneTriggers.cpp
diff --git a/src/strategy/dungeons/wotlk/hallsofstone/HallsOfStoneTriggers.h b/src/Extend/DungeonAi/Wotlk/HallsOfStone/Trigger/HallsOfStoneTriggers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/hallsofstone/HallsOfStoneTriggers.h
rename to src/Extend/DungeonAi/Wotlk/HallsOfStone/Trigger/HallsOfStoneTriggers.h
diff --git a/src/strategy/dungeons/wotlk/nexus/NexusActions.cpp b/src/Extend/DungeonAi/Wotlk/Nexus/Action/NexusActions.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/nexus/NexusActions.cpp
rename to src/Extend/DungeonAi/Wotlk/Nexus/Action/NexusActions.cpp
diff --git a/src/strategy/dungeons/wotlk/nexus/NexusActions.h b/src/Extend/DungeonAi/Wotlk/Nexus/Action/NexusActions.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/nexus/NexusActions.h
rename to src/Extend/DungeonAi/Wotlk/Nexus/Action/NexusActions.h
diff --git a/src/strategy/dungeons/wotlk/nexus/NexusMultipliers.cpp b/src/Extend/DungeonAi/Wotlk/Nexus/Multiplier/NexusMultipliers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/nexus/NexusMultipliers.cpp
rename to src/Extend/DungeonAi/Wotlk/Nexus/Multiplier/NexusMultipliers.cpp
diff --git a/src/strategy/dungeons/wotlk/nexus/NexusMultipliers.h b/src/Extend/DungeonAi/Wotlk/Nexus/Multiplier/NexusMultipliers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/nexus/NexusMultipliers.h
rename to src/Extend/DungeonAi/Wotlk/Nexus/Multiplier/NexusMultipliers.h
diff --git a/src/strategy/dungeons/wotlk/nexus/NexusActionContext.h b/src/Extend/DungeonAi/Wotlk/Nexus/NexusActionContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/nexus/NexusActionContext.h
rename to src/Extend/DungeonAi/Wotlk/Nexus/NexusActionContext.h
diff --git a/src/strategy/dungeons/wotlk/nexus/NexusTriggerContext.h b/src/Extend/DungeonAi/Wotlk/Nexus/NexusTriggerContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/nexus/NexusTriggerContext.h
rename to src/Extend/DungeonAi/Wotlk/Nexus/NexusTriggerContext.h
diff --git a/src/strategy/dungeons/wotlk/nexus/NexusStrategy.cpp b/src/Extend/DungeonAi/Wotlk/Nexus/Strategy/NexusStrategy.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/nexus/NexusStrategy.cpp
rename to src/Extend/DungeonAi/Wotlk/Nexus/Strategy/NexusStrategy.cpp
diff --git a/src/strategy/dungeons/wotlk/nexus/NexusStrategy.h b/src/Extend/DungeonAi/Wotlk/Nexus/Strategy/NexusStrategy.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/nexus/NexusStrategy.h
rename to src/Extend/DungeonAi/Wotlk/Nexus/Strategy/NexusStrategy.h
diff --git a/src/strategy/dungeons/wotlk/nexus/NexusTriggers.cpp b/src/Extend/DungeonAi/Wotlk/Nexus/Trigger/NexusTriggers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/nexus/NexusTriggers.cpp
rename to src/Extend/DungeonAi/Wotlk/Nexus/Trigger/NexusTriggers.cpp
diff --git a/src/strategy/dungeons/wotlk/nexus/NexusTriggers.h b/src/Extend/DungeonAi/Wotlk/Nexus/Trigger/NexusTriggers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/nexus/NexusTriggers.h
rename to src/Extend/DungeonAi/Wotlk/Nexus/Trigger/NexusTriggers.h
diff --git a/src/strategy/dungeons/wotlk/oculus/OculusActions.cpp b/src/Extend/DungeonAi/Wotlk/Oculus/Action/OculusActions.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/oculus/OculusActions.cpp
rename to src/Extend/DungeonAi/Wotlk/Oculus/Action/OculusActions.cpp
diff --git a/src/strategy/dungeons/wotlk/oculus/OculusActions.h b/src/Extend/DungeonAi/Wotlk/Oculus/Action/OculusActions.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/oculus/OculusActions.h
rename to src/Extend/DungeonAi/Wotlk/Oculus/Action/OculusActions.h
diff --git a/src/strategy/dungeons/wotlk/oculus/OculusMultipliers.cpp b/src/Extend/DungeonAi/Wotlk/Oculus/Multiplier/OculusMultipliers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/oculus/OculusMultipliers.cpp
rename to src/Extend/DungeonAi/Wotlk/Oculus/Multiplier/OculusMultipliers.cpp
diff --git a/src/strategy/dungeons/wotlk/oculus/OculusMultipliers.h b/src/Extend/DungeonAi/Wotlk/Oculus/Multiplier/OculusMultipliers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/oculus/OculusMultipliers.h
rename to src/Extend/DungeonAi/Wotlk/Oculus/Multiplier/OculusMultipliers.h
diff --git a/src/strategy/dungeons/wotlk/oculus/OculusActionContext.h b/src/Extend/DungeonAi/Wotlk/Oculus/OculusActionContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/oculus/OculusActionContext.h
rename to src/Extend/DungeonAi/Wotlk/Oculus/OculusActionContext.h
diff --git a/src/strategy/dungeons/wotlk/oculus/OculusTriggerContext.h b/src/Extend/DungeonAi/Wotlk/Oculus/OculusTriggerContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/oculus/OculusTriggerContext.h
rename to src/Extend/DungeonAi/Wotlk/Oculus/OculusTriggerContext.h
diff --git a/src/strategy/dungeons/wotlk/oculus/OculusStrategy.cpp b/src/Extend/DungeonAi/Wotlk/Oculus/Strategy/OculusStrategy.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/oculus/OculusStrategy.cpp
rename to src/Extend/DungeonAi/Wotlk/Oculus/Strategy/OculusStrategy.cpp
diff --git a/src/strategy/dungeons/wotlk/oculus/OculusStrategy.h b/src/Extend/DungeonAi/Wotlk/Oculus/Strategy/OculusStrategy.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/oculus/OculusStrategy.h
rename to src/Extend/DungeonAi/Wotlk/Oculus/Strategy/OculusStrategy.h
diff --git a/src/strategy/dungeons/wotlk/oculus/OculusTriggers.cpp b/src/Extend/DungeonAi/Wotlk/Oculus/Trigger/OculusTriggers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/oculus/OculusTriggers.cpp
rename to src/Extend/DungeonAi/Wotlk/Oculus/Trigger/OculusTriggers.cpp
diff --git a/src/strategy/dungeons/wotlk/oculus/OculusTriggers.h b/src/Extend/DungeonAi/Wotlk/Oculus/Trigger/OculusTriggers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/oculus/OculusTriggers.h
rename to src/Extend/DungeonAi/Wotlk/Oculus/Trigger/OculusTriggers.h
diff --git a/src/strategy/dungeons/wotlk/oldkingdom/OldKingdomActions.cpp b/src/Extend/DungeonAi/Wotlk/OldKingdom/Action/OldKingdomActions.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/oldkingdom/OldKingdomActions.cpp
rename to src/Extend/DungeonAi/Wotlk/OldKingdom/Action/OldKingdomActions.cpp
diff --git a/src/strategy/dungeons/wotlk/oldkingdom/OldKingdomActions.h b/src/Extend/DungeonAi/Wotlk/OldKingdom/Action/OldKingdomActions.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/oldkingdom/OldKingdomActions.h
rename to src/Extend/DungeonAi/Wotlk/OldKingdom/Action/OldKingdomActions.h
diff --git a/src/strategy/dungeons/wotlk/oldkingdom/OldKingdomMultipliers.cpp b/src/Extend/DungeonAi/Wotlk/OldKingdom/Multiplier/OldKingdomMultipliers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/oldkingdom/OldKingdomMultipliers.cpp
rename to src/Extend/DungeonAi/Wotlk/OldKingdom/Multiplier/OldKingdomMultipliers.cpp
diff --git a/src/strategy/dungeons/wotlk/oldkingdom/OldKingdomMultipliers.h b/src/Extend/DungeonAi/Wotlk/OldKingdom/Multiplier/OldKingdomMultipliers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/oldkingdom/OldKingdomMultipliers.h
rename to src/Extend/DungeonAi/Wotlk/OldKingdom/Multiplier/OldKingdomMultipliers.h
diff --git a/src/strategy/dungeons/wotlk/oldkingdom/OldKingdomActionContext.h b/src/Extend/DungeonAi/Wotlk/OldKingdom/OldKingdomActionContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/oldkingdom/OldKingdomActionContext.h
rename to src/Extend/DungeonAi/Wotlk/OldKingdom/OldKingdomActionContext.h
diff --git a/src/strategy/dungeons/wotlk/oldkingdom/OldKingdomTriggerContext.h b/src/Extend/DungeonAi/Wotlk/OldKingdom/OldKingdomTriggerContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/oldkingdom/OldKingdomTriggerContext.h
rename to src/Extend/DungeonAi/Wotlk/OldKingdom/OldKingdomTriggerContext.h
diff --git a/src/strategy/dungeons/wotlk/oldkingdom/OldKingdomStrategy.cpp b/src/Extend/DungeonAi/Wotlk/OldKingdom/Strategy/OldKingdomStrategy.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/oldkingdom/OldKingdomStrategy.cpp
rename to src/Extend/DungeonAi/Wotlk/OldKingdom/Strategy/OldKingdomStrategy.cpp
diff --git a/src/strategy/dungeons/wotlk/oldkingdom/OldKingdomStrategy.h b/src/Extend/DungeonAi/Wotlk/OldKingdom/Strategy/OldKingdomStrategy.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/oldkingdom/OldKingdomStrategy.h
rename to src/Extend/DungeonAi/Wotlk/OldKingdom/Strategy/OldKingdomStrategy.h
diff --git a/src/strategy/dungeons/wotlk/oldkingdom/OldKingdomTriggers.cpp b/src/Extend/DungeonAi/Wotlk/OldKingdom/Trigger/OldKingdomTriggers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/oldkingdom/OldKingdomTriggers.cpp
rename to src/Extend/DungeonAi/Wotlk/OldKingdom/Trigger/OldKingdomTriggers.cpp
diff --git a/src/strategy/dungeons/wotlk/oldkingdom/OldKingdomTriggers.h b/src/Extend/DungeonAi/Wotlk/OldKingdom/Trigger/OldKingdomTriggers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/oldkingdom/OldKingdomTriggers.h
rename to src/Extend/DungeonAi/Wotlk/OldKingdom/Trigger/OldKingdomTriggers.h
diff --git a/src/strategy/dungeons/wotlk/pitofsaron/PitOfSaronActions.cpp b/src/Extend/DungeonAi/Wotlk/PitOfSaron/Action/PitOfSaronActions.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/pitofsaron/PitOfSaronActions.cpp
rename to src/Extend/DungeonAi/Wotlk/PitOfSaron/Action/PitOfSaronActions.cpp
diff --git a/src/strategy/dungeons/wotlk/pitofsaron/PitOfSaronActions.h b/src/Extend/DungeonAi/Wotlk/PitOfSaron/Action/PitOfSaronActions.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/pitofsaron/PitOfSaronActions.h
rename to src/Extend/DungeonAi/Wotlk/PitOfSaron/Action/PitOfSaronActions.h
diff --git a/src/strategy/dungeons/wotlk/pitofsaron/PitOfSaronMultipliers.cpp b/src/Extend/DungeonAi/Wotlk/PitOfSaron/Multiplier/PitOfSaronMultipliers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/pitofsaron/PitOfSaronMultipliers.cpp
rename to src/Extend/DungeonAi/Wotlk/PitOfSaron/Multiplier/PitOfSaronMultipliers.cpp
diff --git a/src/strategy/dungeons/wotlk/pitofsaron/PitOfSaronMultipliers.h b/src/Extend/DungeonAi/Wotlk/PitOfSaron/Multiplier/PitOfSaronMultipliers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/pitofsaron/PitOfSaronMultipliers.h
rename to src/Extend/DungeonAi/Wotlk/PitOfSaron/Multiplier/PitOfSaronMultipliers.h
diff --git a/src/strategy/dungeons/wotlk/pitofsaron/PitOfSaronActionContext.h b/src/Extend/DungeonAi/Wotlk/PitOfSaron/PitOfSaronActionContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/pitofsaron/PitOfSaronActionContext.h
rename to src/Extend/DungeonAi/Wotlk/PitOfSaron/PitOfSaronActionContext.h
diff --git a/src/strategy/dungeons/wotlk/pitofsaron/PitOfSaronTriggerContext.h b/src/Extend/DungeonAi/Wotlk/PitOfSaron/PitOfSaronTriggerContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/pitofsaron/PitOfSaronTriggerContext.h
rename to src/Extend/DungeonAi/Wotlk/PitOfSaron/PitOfSaronTriggerContext.h
diff --git a/src/strategy/dungeons/wotlk/pitofsaron/PitOfSaronStrategy.cpp b/src/Extend/DungeonAi/Wotlk/PitOfSaron/Strategy/PitOfSaronStrategy.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/pitofsaron/PitOfSaronStrategy.cpp
rename to src/Extend/DungeonAi/Wotlk/PitOfSaron/Strategy/PitOfSaronStrategy.cpp
diff --git a/src/strategy/dungeons/wotlk/pitofsaron/PitOfSaronStrategy.h b/src/Extend/DungeonAi/Wotlk/PitOfSaron/Strategy/PitOfSaronStrategy.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/pitofsaron/PitOfSaronStrategy.h
rename to src/Extend/DungeonAi/Wotlk/PitOfSaron/Strategy/PitOfSaronStrategy.h
diff --git a/src/strategy/dungeons/wotlk/pitofsaron/PitOfSaronTriggers.cpp b/src/Extend/DungeonAi/Wotlk/PitOfSaron/Trigger/PitOfSaronTriggers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/pitofsaron/PitOfSaronTriggers.cpp
rename to src/Extend/DungeonAi/Wotlk/PitOfSaron/Trigger/PitOfSaronTriggers.cpp
diff --git a/src/strategy/dungeons/wotlk/pitofsaron/PitOfSaronTriggers.h b/src/Extend/DungeonAi/Wotlk/PitOfSaron/Trigger/PitOfSaronTriggers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/pitofsaron/PitOfSaronTriggers.h
rename to src/Extend/DungeonAi/Wotlk/PitOfSaron/Trigger/PitOfSaronTriggers.h
diff --git a/src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionActions.cpp b/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Action/TrialOfTheChampionActions.cpp
similarity index 99%
rename from src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionActions.cpp
rename to src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Action/TrialOfTheChampionActions.cpp
index 5dd1ef8b..92b687b2 100644
--- a/src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionActions.cpp
+++ b/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Action/TrialOfTheChampionActions.cpp
@@ -1,7 +1,7 @@
 #include "Playerbots.h"
 #include "TrialOfTheChampionActions.h"
 #include "TrialOfTheChampionStrategy.h"
-#include "strategy/values/NearestNpcsValue.h"
+#include "NearestNpcsValue.h"
 #include "ObjectAccessor.h"
 #include "Timer.h"
 #include "Vehicle.h"
diff --git a/src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionActions.h b/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Action/TrialOfTheChampionActions.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionActions.h
rename to src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Action/TrialOfTheChampionActions.h
diff --git a/src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionMultipliers.cpp b/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Multiplier/TrialOfTheChampionMultipliers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionMultipliers.cpp
rename to src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Multiplier/TrialOfTheChampionMultipliers.cpp
diff --git a/src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionMultipliers.h b/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Multiplier/TrialOfTheChampionMultipliers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionMultipliers.h
rename to src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Multiplier/TrialOfTheChampionMultipliers.h
diff --git a/src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionStrategy.cpp b/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionStrategy.cpp
rename to src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.cpp
diff --git a/src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionStrategy.h b/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionStrategy.h
rename to src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.h
diff --git a/src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionActionContext.h b/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/TrialOfTheChampionActionContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionActionContext.h
rename to src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/TrialOfTheChampionActionContext.h
diff --git a/src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionTriggerContext.h b/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/TrialOfTheChampionTriggerContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionTriggerContext.h
rename to src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/TrialOfTheChampionTriggerContext.h
diff --git a/src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionTriggers.cpp b/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Trigger/TrialOfTheChampionTriggers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionTriggers.cpp
rename to src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Trigger/TrialOfTheChampionTriggers.cpp
diff --git a/src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionTriggers.h b/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Trigger/TrialOfTheChampionTriggers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/trialofthechampion/TrialOfTheChampionTriggers.h
rename to src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Trigger/TrialOfTheChampionTriggers.h
diff --git a/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepActions.cpp b/src/Extend/DungeonAi/Wotlk/UtgardeKeep/Action/UtgardeKeepActions.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepActions.cpp
rename to src/Extend/DungeonAi/Wotlk/UtgardeKeep/Action/UtgardeKeepActions.cpp
diff --git a/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepActions.h b/src/Extend/DungeonAi/Wotlk/UtgardeKeep/Action/UtgardeKeepActions.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepActions.h
rename to src/Extend/DungeonAi/Wotlk/UtgardeKeep/Action/UtgardeKeepActions.h
diff --git a/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepMultipliers.cpp b/src/Extend/DungeonAi/Wotlk/UtgardeKeep/Multiplier/UtgardeKeepMultipliers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepMultipliers.cpp
rename to src/Extend/DungeonAi/Wotlk/UtgardeKeep/Multiplier/UtgardeKeepMultipliers.cpp
diff --git a/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepMultipliers.h b/src/Extend/DungeonAi/Wotlk/UtgardeKeep/Multiplier/UtgardeKeepMultipliers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepMultipliers.h
rename to src/Extend/DungeonAi/Wotlk/UtgardeKeep/Multiplier/UtgardeKeepMultipliers.h
diff --git a/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepStrategy.cpp b/src/Extend/DungeonAi/Wotlk/UtgardeKeep/Strategy/UtgardeKeepStrategy.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepStrategy.cpp
rename to src/Extend/DungeonAi/Wotlk/UtgardeKeep/Strategy/UtgardeKeepStrategy.cpp
diff --git a/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepStrategy.h b/src/Extend/DungeonAi/Wotlk/UtgardeKeep/Strategy/UtgardeKeepStrategy.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepStrategy.h
rename to src/Extend/DungeonAi/Wotlk/UtgardeKeep/Strategy/UtgardeKeepStrategy.h
diff --git a/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepTriggers.cpp b/src/Extend/DungeonAi/Wotlk/UtgardeKeep/Trigger/UtgardeKeepTriggers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepTriggers.cpp
rename to src/Extend/DungeonAi/Wotlk/UtgardeKeep/Trigger/UtgardeKeepTriggers.cpp
diff --git a/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepTriggers.h b/src/Extend/DungeonAi/Wotlk/UtgardeKeep/Trigger/UtgardeKeepTriggers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepTriggers.h
rename to src/Extend/DungeonAi/Wotlk/UtgardeKeep/Trigger/UtgardeKeepTriggers.h
diff --git a/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepActionContext.h b/src/Extend/DungeonAi/Wotlk/UtgardeKeep/UtgardeKeepActionContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepActionContext.h
rename to src/Extend/DungeonAi/Wotlk/UtgardeKeep/UtgardeKeepActionContext.h
diff --git a/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepTriggerContext.h b/src/Extend/DungeonAi/Wotlk/UtgardeKeep/UtgardeKeepTriggerContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepTriggerContext.h
rename to src/Extend/DungeonAi/Wotlk/UtgardeKeep/UtgardeKeepTriggerContext.h
diff --git a/src/strategy/dungeons/wotlk/utgardepinnacle/UtgardePinnacleActions.cpp b/src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Action/UtgardePinnacleActions.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/utgardepinnacle/UtgardePinnacleActions.cpp
rename to src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Action/UtgardePinnacleActions.cpp
diff --git a/src/strategy/dungeons/wotlk/utgardepinnacle/UtgardePinnacleActions.h b/src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Action/UtgardePinnacleActions.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/utgardepinnacle/UtgardePinnacleActions.h
rename to src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Action/UtgardePinnacleActions.h
diff --git a/src/strategy/dungeons/wotlk/utgardepinnacle/UtgardePinnacleMultipliers.cpp b/src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Multiplier/UtgardePinnacleMultipliers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/utgardepinnacle/UtgardePinnacleMultipliers.cpp
rename to src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Multiplier/UtgardePinnacleMultipliers.cpp
diff --git a/src/strategy/dungeons/wotlk/utgardepinnacle/UtgardePinnacleMultipliers.h b/src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Multiplier/UtgardePinnacleMultipliers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/utgardepinnacle/UtgardePinnacleMultipliers.h
rename to src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Multiplier/UtgardePinnacleMultipliers.h
diff --git a/src/strategy/dungeons/wotlk/utgardepinnacle/UtgardePinnacleStrategy.cpp b/src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Strategy/UtgardePinnacleStrategy.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/utgardepinnacle/UtgardePinnacleStrategy.cpp
rename to src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Strategy/UtgardePinnacleStrategy.cpp
diff --git a/src/strategy/dungeons/wotlk/utgardepinnacle/UtgardePinnacleStrategy.h b/src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Strategy/UtgardePinnacleStrategy.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/utgardepinnacle/UtgardePinnacleStrategy.h
rename to src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Strategy/UtgardePinnacleStrategy.h
diff --git a/src/strategy/dungeons/wotlk/utgardepinnacle/UtgardePinnacleTriggers.cpp b/src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Trigger/UtgardePinnacleTriggers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/utgardepinnacle/UtgardePinnacleTriggers.cpp
rename to src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Trigger/UtgardePinnacleTriggers.cpp
diff --git a/src/strategy/dungeons/wotlk/utgardepinnacle/UtgardePinnacleTriggers.h b/src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Trigger/UtgardePinnacleTriggers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/utgardepinnacle/UtgardePinnacleTriggers.h
rename to src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Trigger/UtgardePinnacleTriggers.h
diff --git a/src/strategy/dungeons/wotlk/utgardepinnacle/UtgardePinnacleActionContext.h b/src/Extend/DungeonAi/Wotlk/UtgardePinnacle/UtgardePinnacleActionContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/utgardepinnacle/UtgardePinnacleActionContext.h
rename to src/Extend/DungeonAi/Wotlk/UtgardePinnacle/UtgardePinnacleActionContext.h
diff --git a/src/strategy/dungeons/wotlk/utgardepinnacle/UtgardePinnacleTriggerContext.h b/src/Extend/DungeonAi/Wotlk/UtgardePinnacle/UtgardePinnacleTriggerContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/utgardepinnacle/UtgardePinnacleTriggerContext.h
rename to src/Extend/DungeonAi/Wotlk/UtgardePinnacle/UtgardePinnacleTriggerContext.h
diff --git a/src/strategy/dungeons/wotlk/violethold/VioletHoldActions.cpp b/src/Extend/DungeonAi/Wotlk/VioletHold/Action/VioletHoldActions.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/violethold/VioletHoldActions.cpp
rename to src/Extend/DungeonAi/Wotlk/VioletHold/Action/VioletHoldActions.cpp
diff --git a/src/strategy/dungeons/wotlk/violethold/VioletHoldActions.h b/src/Extend/DungeonAi/Wotlk/VioletHold/Action/VioletHoldActions.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/violethold/VioletHoldActions.h
rename to src/Extend/DungeonAi/Wotlk/VioletHold/Action/VioletHoldActions.h
diff --git a/src/strategy/dungeons/wotlk/violethold/VioletHoldMultipliers.cpp b/src/Extend/DungeonAi/Wotlk/VioletHold/Multiplier/VioletHoldMultipliers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/violethold/VioletHoldMultipliers.cpp
rename to src/Extend/DungeonAi/Wotlk/VioletHold/Multiplier/VioletHoldMultipliers.cpp
diff --git a/src/strategy/dungeons/wotlk/violethold/VioletHoldMultipliers.h b/src/Extend/DungeonAi/Wotlk/VioletHold/Multiplier/VioletHoldMultipliers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/violethold/VioletHoldMultipliers.h
rename to src/Extend/DungeonAi/Wotlk/VioletHold/Multiplier/VioletHoldMultipliers.h
diff --git a/src/strategy/dungeons/wotlk/violethold/VioletHoldStrategy.cpp b/src/Extend/DungeonAi/Wotlk/VioletHold/Strategy/VioletHoldStrategy.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/violethold/VioletHoldStrategy.cpp
rename to src/Extend/DungeonAi/Wotlk/VioletHold/Strategy/VioletHoldStrategy.cpp
diff --git a/src/strategy/dungeons/wotlk/violethold/VioletHoldStrategy.h b/src/Extend/DungeonAi/Wotlk/VioletHold/Strategy/VioletHoldStrategy.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/violethold/VioletHoldStrategy.h
rename to src/Extend/DungeonAi/Wotlk/VioletHold/Strategy/VioletHoldStrategy.h
diff --git a/src/strategy/dungeons/wotlk/violethold/VioletHoldTriggers.cpp b/src/Extend/DungeonAi/Wotlk/VioletHold/Trigger/VioletHoldTriggers.cpp
similarity index 100%
rename from src/strategy/dungeons/wotlk/violethold/VioletHoldTriggers.cpp
rename to src/Extend/DungeonAi/Wotlk/VioletHold/Trigger/VioletHoldTriggers.cpp
diff --git a/src/strategy/dungeons/wotlk/violethold/VioletHoldTriggers.h b/src/Extend/DungeonAi/Wotlk/VioletHold/Trigger/VioletHoldTriggers.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/violethold/VioletHoldTriggers.h
rename to src/Extend/DungeonAi/Wotlk/VioletHold/Trigger/VioletHoldTriggers.h
diff --git a/src/strategy/dungeons/wotlk/violethold/VioletHoldActionContext.h b/src/Extend/DungeonAi/Wotlk/VioletHold/VioletHoldActionContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/violethold/VioletHoldActionContext.h
rename to src/Extend/DungeonAi/Wotlk/VioletHold/VioletHoldActionContext.h
diff --git a/src/strategy/dungeons/wotlk/violethold/VioletHoldTriggerContext.h b/src/Extend/DungeonAi/Wotlk/VioletHold/VioletHoldTriggerContext.h
similarity index 100%
rename from src/strategy/dungeons/wotlk/violethold/VioletHoldTriggerContext.h
rename to src/Extend/DungeonAi/Wotlk/VioletHold/VioletHoldTriggerContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/WotlkDungeonActionContext.h b/src/Extend/DungeonAi/Wotlk/WotlkDungeonActionContext.h
new file mode 100644
index 00000000..c7202de6
--- /dev/null
+++ b/src/Extend/DungeonAi/Wotlk/WotlkDungeonActionContext.h
@@ -0,0 +1,21 @@
+#ifndef _PLAYERBOT_WOTLKDUNGEONACTIONCONTEXT_H
+#define _PLAYERBOT_WOTLKDUNGEONACTIONCONTEXT_H
+
+#include "UtgardeKeep/UtgardeKeepActionContext.h"
+#include "Nexus/NexusActionContext.h"
+#include "AzjolNerub/AzjolNerubActionContext.h"
+#include "OldKingdom/OldKingdomActionContext.h"
+#include "DraktharonKeep/DrakTharonKeepActionContext.h"
+#include "VioletHold/VioletHoldActionContext.h"
+#include "Gundrak/GundrakActionContext.h"
+#include "HallsOfStone/HallsOfStoneActionContext.h"
+#include "HallsOfLightning/HallsOfLightningActionContext.h"
+#include "Oculus/OculusActionContext.h"
+#include "UtgardePinnacle/UtgardePinnacleActionContext.h"
+#include "CullingOfStratholme/CullingOfStratholmeActionContext.h"
+#include "ForgeOfSouls/ForgeOfSoulsActionContext.h"
+#include "PitOfSaron/PitOfSaronActionContext.h"
+#include "TrialOfTheChampion/TrialOfTheChampionActionContext.h"
+// #include "HallsOfReflection/HallsOfReflectionActionContext.h"
+
+#endif
diff --git a/src/Extend/DungeonAi/Wotlk/WotlkDungeonTriggerContext.h b/src/Extend/DungeonAi/Wotlk/WotlkDungeonTriggerContext.h
new file mode 100644
index 00000000..630aecbd
--- /dev/null
+++ b/src/Extend/DungeonAi/Wotlk/WotlkDungeonTriggerContext.h
@@ -0,0 +1,21 @@
+#ifndef _PLAYERBOT_WOTLKDUNGEONTRIGGERCONTEXT_H
+#define _PLAYERBOT_WOTLKDUNGEONTRIGGERCONTEXT_H
+
+#include "UtgardeKeep/UtgardeKeepTriggerContext.h"
+#include "Nexus/NexusTriggerContext.h"
+#include "AzjolNerub/AzjolNerubTriggerContext.h"
+#include "OldKingdom/OldKingdomTriggerContext.h"
+#include "DraktharonKeep/DrakTharonKeepTriggerContext.h"
+#include "VioletHold/VioletHoldTriggerContext.h"
+#include "Gundrak/GundrakTriggerContext.h"
+#include "HallsOfStone/HallsOfStoneTriggerContext.h"
+#include "HallsOfLightning/HallsOfLightningTriggerContext.h"
+#include "Oculus/OculusTriggerContext.h"
+#include "UtgardePinnacle/UtgardePinnacleTriggerContext.h"
+#include "CullingOfStratholme/CullingOfStratholmeTriggerContext.h"
+#include "ForgeOfSouls/ForgeOfSoulsTriggerContext.h"
+#include "PitOfSaron/PitOfSaronTriggerContext.h"
+#include "TrialOfTheChampion/TrialOfTheChampionTriggerContext.h"
+// #include "HallsOfReflection/HallsOfReflectionTriggerContext.h"
+
+#endif
diff --git a/src/strategy/raids/aq20/RaidAq20Actions.cpp b/src/Extend/RaidAi/Aq20/Action/RaidAq20Actions.cpp
similarity index 100%
rename from src/strategy/raids/aq20/RaidAq20Actions.cpp
rename to src/Extend/RaidAi/Aq20/Action/RaidAq20Actions.cpp
diff --git a/src/strategy/raids/aq20/RaidAq20Actions.h b/src/Extend/RaidAi/Aq20/Action/RaidAq20Actions.h
similarity index 100%
rename from src/strategy/raids/aq20/RaidAq20Actions.h
rename to src/Extend/RaidAi/Aq20/Action/RaidAq20Actions.h
diff --git a/src/strategy/raids/aq20/RaidAq20ActionContext.h b/src/Extend/RaidAi/Aq20/RaidAq20ActionContext.h
similarity index 100%
rename from src/strategy/raids/aq20/RaidAq20ActionContext.h
rename to src/Extend/RaidAi/Aq20/RaidAq20ActionContext.h
diff --git a/src/strategy/raids/aq20/RaidAq20TriggerContext.h b/src/Extend/RaidAi/Aq20/RaidAq20TriggerContext.h
similarity index 100%
rename from src/strategy/raids/aq20/RaidAq20TriggerContext.h
rename to src/Extend/RaidAi/Aq20/RaidAq20TriggerContext.h
diff --git a/src/strategy/raids/aq20/RaidAq20Strategy.cpp b/src/Extend/RaidAi/Aq20/Strategy/RaidAq20Strategy.cpp
similarity index 100%
rename from src/strategy/raids/aq20/RaidAq20Strategy.cpp
rename to src/Extend/RaidAi/Aq20/Strategy/RaidAq20Strategy.cpp
diff --git a/src/strategy/raids/aq20/RaidAq20Strategy.h b/src/Extend/RaidAi/Aq20/Strategy/RaidAq20Strategy.h
similarity index 100%
rename from src/strategy/raids/aq20/RaidAq20Strategy.h
rename to src/Extend/RaidAi/Aq20/Strategy/RaidAq20Strategy.h
diff --git a/src/strategy/raids/aq20/RaidAq20Triggers.cpp b/src/Extend/RaidAi/Aq20/Trigger/RaidAq20Triggers.cpp
similarity index 100%
rename from src/strategy/raids/aq20/RaidAq20Triggers.cpp
rename to src/Extend/RaidAi/Aq20/Trigger/RaidAq20Triggers.cpp
diff --git a/src/strategy/raids/aq20/RaidAq20Triggers.h b/src/Extend/RaidAi/Aq20/Trigger/RaidAq20Triggers.h
similarity index 100%
rename from src/strategy/raids/aq20/RaidAq20Triggers.h
rename to src/Extend/RaidAi/Aq20/Trigger/RaidAq20Triggers.h
diff --git a/src/strategy/raids/aq20/RaidAq20Utils.cpp b/src/Extend/RaidAi/Aq20/Util/RaidAq20Utils.cpp
similarity index 100%
rename from src/strategy/raids/aq20/RaidAq20Utils.cpp
rename to src/Extend/RaidAi/Aq20/Util/RaidAq20Utils.cpp
diff --git a/src/strategy/raids/aq20/RaidAq20Utils.h b/src/Extend/RaidAi/Aq20/Util/RaidAq20Utils.h
similarity index 100%
rename from src/strategy/raids/aq20/RaidAq20Utils.h
rename to src/Extend/RaidAi/Aq20/Util/RaidAq20Utils.h
diff --git a/src/strategy/raids/blackwinglair/RaidBwlActions.cpp b/src/Extend/RaidAi/BlackwingLair/Action/RaidBwlActions.cpp
similarity index 100%
rename from src/strategy/raids/blackwinglair/RaidBwlActions.cpp
rename to src/Extend/RaidAi/BlackwingLair/Action/RaidBwlActions.cpp
diff --git a/src/strategy/raids/blackwinglair/RaidBwlActions.h b/src/Extend/RaidAi/BlackwingLair/Action/RaidBwlActions.h
similarity index 100%
rename from src/strategy/raids/blackwinglair/RaidBwlActions.h
rename to src/Extend/RaidAi/BlackwingLair/Action/RaidBwlActions.h
diff --git a/src/strategy/raids/blackwinglair/RaidBwlActionContext.h b/src/Extend/RaidAi/BlackwingLair/RaidBwlActionContext.h
similarity index 100%
rename from src/strategy/raids/blackwinglair/RaidBwlActionContext.h
rename to src/Extend/RaidAi/BlackwingLair/RaidBwlActionContext.h
diff --git a/src/strategy/raids/blackwinglair/RaidBwlTriggerContext.h b/src/Extend/RaidAi/BlackwingLair/RaidBwlTriggerContext.h
similarity index 100%
rename from src/strategy/raids/blackwinglair/RaidBwlTriggerContext.h
rename to src/Extend/RaidAi/BlackwingLair/RaidBwlTriggerContext.h
diff --git a/src/strategy/raids/blackwinglair/RaidBwlStrategy.cpp b/src/Extend/RaidAi/BlackwingLair/Strategy/RaidBwlStrategy.cpp
similarity index 100%
rename from src/strategy/raids/blackwinglair/RaidBwlStrategy.cpp
rename to src/Extend/RaidAi/BlackwingLair/Strategy/RaidBwlStrategy.cpp
diff --git a/src/strategy/raids/blackwinglair/RaidBwlStrategy.h b/src/Extend/RaidAi/BlackwingLair/Strategy/RaidBwlStrategy.h
similarity index 100%
rename from src/strategy/raids/blackwinglair/RaidBwlStrategy.h
rename to src/Extend/RaidAi/BlackwingLair/Strategy/RaidBwlStrategy.h
diff --git a/src/strategy/raids/blackwinglair/RaidBwlTriggers.cpp b/src/Extend/RaidAi/BlackwingLair/Trigger/RaidBwlTriggers.cpp
similarity index 100%
rename from src/strategy/raids/blackwinglair/RaidBwlTriggers.cpp
rename to src/Extend/RaidAi/BlackwingLair/Trigger/RaidBwlTriggers.cpp
diff --git a/src/strategy/raids/blackwinglair/RaidBwlTriggers.h b/src/Extend/RaidAi/BlackwingLair/Trigger/RaidBwlTriggers.h
similarity index 100%
rename from src/strategy/raids/blackwinglair/RaidBwlTriggers.h
rename to src/Extend/RaidAi/BlackwingLair/Trigger/RaidBwlTriggers.h
diff --git a/src/strategy/raids/eyeofeternity/RaidEoEActions.cpp b/src/Extend/RaidAi/EyeOfEternity/Action/RaidEoEActions.cpp
similarity index 100%
rename from src/strategy/raids/eyeofeternity/RaidEoEActions.cpp
rename to src/Extend/RaidAi/EyeOfEternity/Action/RaidEoEActions.cpp
diff --git a/src/strategy/raids/eyeofeternity/RaidEoEActions.h b/src/Extend/RaidAi/EyeOfEternity/Action/RaidEoEActions.h
similarity index 100%
rename from src/strategy/raids/eyeofeternity/RaidEoEActions.h
rename to src/Extend/RaidAi/EyeOfEternity/Action/RaidEoEActions.h
diff --git a/src/strategy/raids/eyeofeternity/RaidEoEMultipliers.cpp b/src/Extend/RaidAi/EyeOfEternity/Multiplier/RaidEoEMultipliers.cpp
similarity index 100%
rename from src/strategy/raids/eyeofeternity/RaidEoEMultipliers.cpp
rename to src/Extend/RaidAi/EyeOfEternity/Multiplier/RaidEoEMultipliers.cpp
diff --git a/src/strategy/raids/eyeofeternity/RaidEoEMultipliers.h b/src/Extend/RaidAi/EyeOfEternity/Multiplier/RaidEoEMultipliers.h
similarity index 100%
rename from src/strategy/raids/eyeofeternity/RaidEoEMultipliers.h
rename to src/Extend/RaidAi/EyeOfEternity/Multiplier/RaidEoEMultipliers.h
diff --git a/src/strategy/raids/eyeofeternity/RaidEoEActionContext.h b/src/Extend/RaidAi/EyeOfEternity/RaidEoEActionContext.h
similarity index 100%
rename from src/strategy/raids/eyeofeternity/RaidEoEActionContext.h
rename to src/Extend/RaidAi/EyeOfEternity/RaidEoEActionContext.h
diff --git a/src/strategy/raids/eyeofeternity/RaidEoETriggerContext.h b/src/Extend/RaidAi/EyeOfEternity/RaidEoETriggerContext.h
similarity index 100%
rename from src/strategy/raids/eyeofeternity/RaidEoETriggerContext.h
rename to src/Extend/RaidAi/EyeOfEternity/RaidEoETriggerContext.h
diff --git a/src/strategy/raids/eyeofeternity/RaidEoEStrategy.cpp b/src/Extend/RaidAi/EyeOfEternity/Strategy/RaidEoEStrategy.cpp
similarity index 100%
rename from src/strategy/raids/eyeofeternity/RaidEoEStrategy.cpp
rename to src/Extend/RaidAi/EyeOfEternity/Strategy/RaidEoEStrategy.cpp
diff --git a/src/strategy/raids/eyeofeternity/RaidEoEStrategy.h b/src/Extend/RaidAi/EyeOfEternity/Strategy/RaidEoEStrategy.h
similarity index 100%
rename from src/strategy/raids/eyeofeternity/RaidEoEStrategy.h
rename to src/Extend/RaidAi/EyeOfEternity/Strategy/RaidEoEStrategy.h
diff --git a/src/strategy/raids/eyeofeternity/RaidEoETriggers.cpp b/src/Extend/RaidAi/EyeOfEternity/Trigger/RaidEoETriggers.cpp
similarity index 100%
rename from src/strategy/raids/eyeofeternity/RaidEoETriggers.cpp
rename to src/Extend/RaidAi/EyeOfEternity/Trigger/RaidEoETriggers.cpp
diff --git a/src/strategy/raids/eyeofeternity/RaidEoETriggers.h b/src/Extend/RaidAi/EyeOfEternity/Trigger/RaidEoETriggers.h
similarity index 100%
rename from src/strategy/raids/eyeofeternity/RaidEoETriggers.h
rename to src/Extend/RaidAi/EyeOfEternity/Trigger/RaidEoETriggers.h
diff --git a/src/strategy/raids/gruulslair/RaidGruulsLairActions.cpp b/src/Extend/RaidAi/GruulsLair/Action/RaidGruulsLairActions.cpp
similarity index 100%
rename from src/strategy/raids/gruulslair/RaidGruulsLairActions.cpp
rename to src/Extend/RaidAi/GruulsLair/Action/RaidGruulsLairActions.cpp
diff --git a/src/strategy/raids/gruulslair/RaidGruulsLairActions.h b/src/Extend/RaidAi/GruulsLair/Action/RaidGruulsLairActions.h
similarity index 100%
rename from src/strategy/raids/gruulslair/RaidGruulsLairActions.h
rename to src/Extend/RaidAi/GruulsLair/Action/RaidGruulsLairActions.h
diff --git a/src/strategy/raids/gruulslair/RaidGruulsLairMultipliers.cpp b/src/Extend/RaidAi/GruulsLair/Multiplier/RaidGruulsLairMultipliers.cpp
similarity index 100%
rename from src/strategy/raids/gruulslair/RaidGruulsLairMultipliers.cpp
rename to src/Extend/RaidAi/GruulsLair/Multiplier/RaidGruulsLairMultipliers.cpp
diff --git a/src/strategy/raids/gruulslair/RaidGruulsLairMultipliers.h b/src/Extend/RaidAi/GruulsLair/Multiplier/RaidGruulsLairMultipliers.h
similarity index 100%
rename from src/strategy/raids/gruulslair/RaidGruulsLairMultipliers.h
rename to src/Extend/RaidAi/GruulsLair/Multiplier/RaidGruulsLairMultipliers.h
diff --git a/src/strategy/raids/gruulslair/RaidGruulsLairActionContext.h b/src/Extend/RaidAi/GruulsLair/RaidGruulsLairActionContext.h
similarity index 100%
rename from src/strategy/raids/gruulslair/RaidGruulsLairActionContext.h
rename to src/Extend/RaidAi/GruulsLair/RaidGruulsLairActionContext.h
diff --git a/src/strategy/raids/gruulslair/RaidGruulsLairTriggerContext.h b/src/Extend/RaidAi/GruulsLair/RaidGruulsLairTriggerContext.h
similarity index 100%
rename from src/strategy/raids/gruulslair/RaidGruulsLairTriggerContext.h
rename to src/Extend/RaidAi/GruulsLair/RaidGruulsLairTriggerContext.h
diff --git a/src/strategy/raids/gruulslair/RaidGruulsLairStrategy.cpp b/src/Extend/RaidAi/GruulsLair/Strategy/RaidGruulsLairStrategy.cpp
similarity index 100%
rename from src/strategy/raids/gruulslair/RaidGruulsLairStrategy.cpp
rename to src/Extend/RaidAi/GruulsLair/Strategy/RaidGruulsLairStrategy.cpp
diff --git a/src/strategy/raids/gruulslair/RaidGruulsLairStrategy.h b/src/Extend/RaidAi/GruulsLair/Strategy/RaidGruulsLairStrategy.h
similarity index 100%
rename from src/strategy/raids/gruulslair/RaidGruulsLairStrategy.h
rename to src/Extend/RaidAi/GruulsLair/Strategy/RaidGruulsLairStrategy.h
diff --git a/src/strategy/raids/gruulslair/RaidGruulsLairTriggers.cpp b/src/Extend/RaidAi/GruulsLair/Trigger/RaidGruulsLairTriggers.cpp
similarity index 100%
rename from src/strategy/raids/gruulslair/RaidGruulsLairTriggers.cpp
rename to src/Extend/RaidAi/GruulsLair/Trigger/RaidGruulsLairTriggers.cpp
diff --git a/src/strategy/raids/gruulslair/RaidGruulsLairTriggers.h b/src/Extend/RaidAi/GruulsLair/Trigger/RaidGruulsLairTriggers.h
similarity index 100%
rename from src/strategy/raids/gruulslair/RaidGruulsLairTriggers.h
rename to src/Extend/RaidAi/GruulsLair/Trigger/RaidGruulsLairTriggers.h
diff --git a/src/strategy/raids/gruulslair/RaidGruulsLairHelpers.cpp b/src/Extend/RaidAi/GruulsLair/Util/RaidGruulsLairHelpers.cpp
similarity index 100%
rename from src/strategy/raids/gruulslair/RaidGruulsLairHelpers.cpp
rename to src/Extend/RaidAi/GruulsLair/Util/RaidGruulsLairHelpers.cpp
diff --git a/src/strategy/raids/gruulslair/RaidGruulsLairHelpers.h b/src/Extend/RaidAi/GruulsLair/Util/RaidGruulsLairHelpers.h
similarity index 100%
rename from src/strategy/raids/gruulslair/RaidGruulsLairHelpers.h
rename to src/Extend/RaidAi/GruulsLair/Util/RaidGruulsLairHelpers.h
diff --git a/src/strategy/raids/icecrown/RaidIccActions.cpp b/src/Extend/RaidAi/Icecrown/Action/RaidIccActions.cpp
similarity index 99%
rename from src/strategy/raids/icecrown/RaidIccActions.cpp
rename to src/Extend/RaidAi/Icecrown/Action/RaidIccActions.cpp
index 4f763ecb..14c8ada9 100644
--- a/src/strategy/raids/icecrown/RaidIccActions.cpp
+++ b/src/Extend/RaidAi/Icecrown/Action/RaidIccActions.cpp
@@ -1,5 +1,5 @@
 #include "RaidIccActions.h"
-#include "strategy/values/NearestNpcsValue.h"
+#include "NearestNpcsValue.h"
 #include "ObjectAccessor.h"
 #include "RaidIccStrategy.h"
 #include "Playerbots.h"
diff --git a/src/strategy/raids/icecrown/RaidIccActions.h b/src/Extend/RaidAi/Icecrown/Action/RaidIccActions.h
similarity index 100%
rename from src/strategy/raids/icecrown/RaidIccActions.h
rename to src/Extend/RaidAi/Icecrown/Action/RaidIccActions.h
diff --git a/src/strategy/raids/icecrown/RaidIccMultipliers.cpp b/src/Extend/RaidAi/Icecrown/Multiplier/RaidIccMultipliers.cpp
similarity index 100%
rename from src/strategy/raids/icecrown/RaidIccMultipliers.cpp
rename to src/Extend/RaidAi/Icecrown/Multiplier/RaidIccMultipliers.cpp
diff --git a/src/strategy/raids/icecrown/RaidIccMultipliers.h b/src/Extend/RaidAi/Icecrown/Multiplier/RaidIccMultipliers.h
similarity index 100%
rename from src/strategy/raids/icecrown/RaidIccMultipliers.h
rename to src/Extend/RaidAi/Icecrown/Multiplier/RaidIccMultipliers.h
diff --git a/src/strategy/raids/icecrown/RaidIccActionContext.h b/src/Extend/RaidAi/Icecrown/RaidIccActionContext.h
similarity index 100%
rename from src/strategy/raids/icecrown/RaidIccActionContext.h
rename to src/Extend/RaidAi/Icecrown/RaidIccActionContext.h
diff --git a/src/strategy/raids/icecrown/RaidIccScripts.h b/src/Extend/RaidAi/Icecrown/RaidIccScripts.h
similarity index 100%
rename from src/strategy/raids/icecrown/RaidIccScripts.h
rename to src/Extend/RaidAi/Icecrown/RaidIccScripts.h
diff --git a/src/strategy/raids/icecrown/RaidIccTriggerContext.h b/src/Extend/RaidAi/Icecrown/RaidIccTriggerContext.h
similarity index 100%
rename from src/strategy/raids/icecrown/RaidIccTriggerContext.h
rename to src/Extend/RaidAi/Icecrown/RaidIccTriggerContext.h
diff --git a/src/strategy/raids/icecrown/RaidIccStrategy.cpp b/src/Extend/RaidAi/Icecrown/Strategy/RaidIccStrategy.cpp
similarity index 100%
rename from src/strategy/raids/icecrown/RaidIccStrategy.cpp
rename to src/Extend/RaidAi/Icecrown/Strategy/RaidIccStrategy.cpp
diff --git a/src/strategy/raids/icecrown/RaidIccStrategy.h b/src/Extend/RaidAi/Icecrown/Strategy/RaidIccStrategy.h
similarity index 100%
rename from src/strategy/raids/icecrown/RaidIccStrategy.h
rename to src/Extend/RaidAi/Icecrown/Strategy/RaidIccStrategy.h
diff --git a/src/strategy/raids/icecrown/RaidIccTriggers.cpp b/src/Extend/RaidAi/Icecrown/Trigger/RaidIccTriggers.cpp
similarity index 99%
rename from src/strategy/raids/icecrown/RaidIccTriggers.cpp
rename to src/Extend/RaidAi/Icecrown/Trigger/RaidIccTriggers.cpp
index 44a2008b..55cfe9fc 100644
--- a/src/strategy/raids/icecrown/RaidIccTriggers.cpp
+++ b/src/Extend/RaidAi/Icecrown/Trigger/RaidIccTriggers.cpp
@@ -1,6 +1,6 @@
 #include "RaidIccTriggers.h"
 #include "RaidIccActions.h"
-#include "strategy/values/NearestNpcsValue.h"
+#include "NearestNpcsValue.h"
 #include "PlayerbotAIConfig.h"
 #include "ObjectAccessor.h"
 #include "GenericTriggers.h"
diff --git a/src/strategy/raids/icecrown/RaidIccTriggers.h b/src/Extend/RaidAi/Icecrown/Trigger/RaidIccTriggers.h
similarity index 100%
rename from src/strategy/raids/icecrown/RaidIccTriggers.h
rename to src/Extend/RaidAi/Icecrown/Trigger/RaidIccTriggers.h
diff --git a/src/strategy/raids/karazhan/RaidKarazhanActions.cpp b/src/Extend/RaidAi/Karazhan/Action/RaidKarazhanActions.cpp
similarity index 100%
rename from src/strategy/raids/karazhan/RaidKarazhanActions.cpp
rename to src/Extend/RaidAi/Karazhan/Action/RaidKarazhanActions.cpp
diff --git a/src/strategy/raids/karazhan/RaidKarazhanActions.h b/src/Extend/RaidAi/Karazhan/Action/RaidKarazhanActions.h
similarity index 100%
rename from src/strategy/raids/karazhan/RaidKarazhanActions.h
rename to src/Extend/RaidAi/Karazhan/Action/RaidKarazhanActions.h
diff --git a/src/strategy/raids/karazhan/RaidKarazhanMultipliers.cpp b/src/Extend/RaidAi/Karazhan/Multiplier/RaidKarazhanMultipliers.cpp
similarity index 100%
rename from src/strategy/raids/karazhan/RaidKarazhanMultipliers.cpp
rename to src/Extend/RaidAi/Karazhan/Multiplier/RaidKarazhanMultipliers.cpp
diff --git a/src/strategy/raids/karazhan/RaidKarazhanMultipliers.h b/src/Extend/RaidAi/Karazhan/Multiplier/RaidKarazhanMultipliers.h
similarity index 100%
rename from src/strategy/raids/karazhan/RaidKarazhanMultipliers.h
rename to src/Extend/RaidAi/Karazhan/Multiplier/RaidKarazhanMultipliers.h
diff --git a/src/strategy/raids/karazhan/RaidKarazhanActionContext.h b/src/Extend/RaidAi/Karazhan/RaidKarazhanActionContext.h
similarity index 100%
rename from src/strategy/raids/karazhan/RaidKarazhanActionContext.h
rename to src/Extend/RaidAi/Karazhan/RaidKarazhanActionContext.h
diff --git a/src/strategy/raids/karazhan/RaidKarazhanTriggerContext.h b/src/Extend/RaidAi/Karazhan/RaidKarazhanTriggerContext.h
similarity index 100%
rename from src/strategy/raids/karazhan/RaidKarazhanTriggerContext.h
rename to src/Extend/RaidAi/Karazhan/RaidKarazhanTriggerContext.h
diff --git a/src/strategy/raids/karazhan/RaidKarazhanStrategy.cpp b/src/Extend/RaidAi/Karazhan/Strategy/RaidKarazhanStrategy.cpp
similarity index 100%
rename from src/strategy/raids/karazhan/RaidKarazhanStrategy.cpp
rename to src/Extend/RaidAi/Karazhan/Strategy/RaidKarazhanStrategy.cpp
diff --git a/src/strategy/raids/karazhan/RaidKarazhanStrategy.h b/src/Extend/RaidAi/Karazhan/Strategy/RaidKarazhanStrategy.h
similarity index 100%
rename from src/strategy/raids/karazhan/RaidKarazhanStrategy.h
rename to src/Extend/RaidAi/Karazhan/Strategy/RaidKarazhanStrategy.h
diff --git a/src/strategy/raids/karazhan/RaidKarazhanTriggers.cpp b/src/Extend/RaidAi/Karazhan/Trigger/RaidKarazhanTriggers.cpp
similarity index 100%
rename from src/strategy/raids/karazhan/RaidKarazhanTriggers.cpp
rename to src/Extend/RaidAi/Karazhan/Trigger/RaidKarazhanTriggers.cpp
diff --git a/src/strategy/raids/karazhan/RaidKarazhanTriggers.h b/src/Extend/RaidAi/Karazhan/Trigger/RaidKarazhanTriggers.h
similarity index 100%
rename from src/strategy/raids/karazhan/RaidKarazhanTriggers.h
rename to src/Extend/RaidAi/Karazhan/Trigger/RaidKarazhanTriggers.h
diff --git a/src/strategy/raids/karazhan/RaidKarazhanHelpers.cpp b/src/Extend/RaidAi/Karazhan/Util/RaidKarazhanHelpers.cpp
similarity index 100%
rename from src/strategy/raids/karazhan/RaidKarazhanHelpers.cpp
rename to src/Extend/RaidAi/Karazhan/Util/RaidKarazhanHelpers.cpp
diff --git a/src/strategy/raids/karazhan/RaidKarazhanHelpers.h b/src/Extend/RaidAi/Karazhan/Util/RaidKarazhanHelpers.h
similarity index 100%
rename from src/strategy/raids/karazhan/RaidKarazhanHelpers.h
rename to src/Extend/RaidAi/Karazhan/Util/RaidKarazhanHelpers.h
diff --git a/src/strategy/raids/magtheridon/RaidMagtheridonActions.cpp b/src/Extend/RaidAi/Magtheridon/Action/RaidMagtheridonActions.cpp
similarity index 100%
rename from src/strategy/raids/magtheridon/RaidMagtheridonActions.cpp
rename to src/Extend/RaidAi/Magtheridon/Action/RaidMagtheridonActions.cpp
diff --git a/src/strategy/raids/magtheridon/RaidMagtheridonActions.h b/src/Extend/RaidAi/Magtheridon/Action/RaidMagtheridonActions.h
similarity index 100%
rename from src/strategy/raids/magtheridon/RaidMagtheridonActions.h
rename to src/Extend/RaidAi/Magtheridon/Action/RaidMagtheridonActions.h
diff --git a/src/strategy/raids/magtheridon/RaidMagtheridonMultipliers.cpp b/src/Extend/RaidAi/Magtheridon/Multiplier/RaidMagtheridonMultipliers.cpp
similarity index 100%
rename from src/strategy/raids/magtheridon/RaidMagtheridonMultipliers.cpp
rename to src/Extend/RaidAi/Magtheridon/Multiplier/RaidMagtheridonMultipliers.cpp
diff --git a/src/strategy/raids/magtheridon/RaidMagtheridonMultipliers.h b/src/Extend/RaidAi/Magtheridon/Multiplier/RaidMagtheridonMultipliers.h
similarity index 100%
rename from src/strategy/raids/magtheridon/RaidMagtheridonMultipliers.h
rename to src/Extend/RaidAi/Magtheridon/Multiplier/RaidMagtheridonMultipliers.h
diff --git a/src/strategy/raids/magtheridon/RaidMagtheridonActionContext.h b/src/Extend/RaidAi/Magtheridon/RaidMagtheridonActionContext.h
similarity index 100%
rename from src/strategy/raids/magtheridon/RaidMagtheridonActionContext.h
rename to src/Extend/RaidAi/Magtheridon/RaidMagtheridonActionContext.h
diff --git a/src/strategy/raids/magtheridon/RaidMagtheridonTriggerContext.h b/src/Extend/RaidAi/Magtheridon/RaidMagtheridonTriggerContext.h
similarity index 100%
rename from src/strategy/raids/magtheridon/RaidMagtheridonTriggerContext.h
rename to src/Extend/RaidAi/Magtheridon/RaidMagtheridonTriggerContext.h
diff --git a/src/strategy/raids/magtheridon/RaidMagtheridonStrategy.cpp b/src/Extend/RaidAi/Magtheridon/Strategy/RaidMagtheridonStrategy.cpp
similarity index 100%
rename from src/strategy/raids/magtheridon/RaidMagtheridonStrategy.cpp
rename to src/Extend/RaidAi/Magtheridon/Strategy/RaidMagtheridonStrategy.cpp
diff --git a/src/strategy/raids/magtheridon/RaidMagtheridonStrategy.h b/src/Extend/RaidAi/Magtheridon/Strategy/RaidMagtheridonStrategy.h
similarity index 100%
rename from src/strategy/raids/magtheridon/RaidMagtheridonStrategy.h
rename to src/Extend/RaidAi/Magtheridon/Strategy/RaidMagtheridonStrategy.h
diff --git a/src/strategy/raids/magtheridon/RaidMagtheridonTriggers.cpp b/src/Extend/RaidAi/Magtheridon/Trigger/RaidMagtheridonTriggers.cpp
similarity index 100%
rename from src/strategy/raids/magtheridon/RaidMagtheridonTriggers.cpp
rename to src/Extend/RaidAi/Magtheridon/Trigger/RaidMagtheridonTriggers.cpp
diff --git a/src/strategy/raids/magtheridon/RaidMagtheridonTriggers.h b/src/Extend/RaidAi/Magtheridon/Trigger/RaidMagtheridonTriggers.h
similarity index 100%
rename from src/strategy/raids/magtheridon/RaidMagtheridonTriggers.h
rename to src/Extend/RaidAi/Magtheridon/Trigger/RaidMagtheridonTriggers.h
diff --git a/src/strategy/raids/magtheridon/RaidMagtheridonHelpers.cpp b/src/Extend/RaidAi/Magtheridon/Util/RaidMagtheridonHelpers.cpp
similarity index 100%
rename from src/strategy/raids/magtheridon/RaidMagtheridonHelpers.cpp
rename to src/Extend/RaidAi/Magtheridon/Util/RaidMagtheridonHelpers.cpp
diff --git a/src/strategy/raids/magtheridon/RaidMagtheridonHelpers.h b/src/Extend/RaidAi/Magtheridon/Util/RaidMagtheridonHelpers.h
similarity index 100%
rename from src/strategy/raids/magtheridon/RaidMagtheridonHelpers.h
rename to src/Extend/RaidAi/Magtheridon/Util/RaidMagtheridonHelpers.h
diff --git a/src/strategy/raids/moltencore/RaidMcActions.cpp b/src/Extend/RaidAi/MoltenCore/Action/RaidMcActions.cpp
similarity index 100%
rename from src/strategy/raids/moltencore/RaidMcActions.cpp
rename to src/Extend/RaidAi/MoltenCore/Action/RaidMcActions.cpp
diff --git a/src/strategy/raids/moltencore/RaidMcActions.h b/src/Extend/RaidAi/MoltenCore/Action/RaidMcActions.h
similarity index 100%
rename from src/strategy/raids/moltencore/RaidMcActions.h
rename to src/Extend/RaidAi/MoltenCore/Action/RaidMcActions.h
diff --git a/src/strategy/raids/moltencore/RaidMcMultipliers.cpp b/src/Extend/RaidAi/MoltenCore/Multiplier/RaidMcMultipliers.cpp
similarity index 100%
rename from src/strategy/raids/moltencore/RaidMcMultipliers.cpp
rename to src/Extend/RaidAi/MoltenCore/Multiplier/RaidMcMultipliers.cpp
diff --git a/src/strategy/raids/moltencore/RaidMcMultipliers.h b/src/Extend/RaidAi/MoltenCore/Multiplier/RaidMcMultipliers.h
similarity index 100%
rename from src/strategy/raids/moltencore/RaidMcMultipliers.h
rename to src/Extend/RaidAi/MoltenCore/Multiplier/RaidMcMultipliers.h
diff --git a/src/strategy/raids/moltencore/RaidMcActionContext.h b/src/Extend/RaidAi/MoltenCore/RaidMcActionContext.h
similarity index 100%
rename from src/strategy/raids/moltencore/RaidMcActionContext.h
rename to src/Extend/RaidAi/MoltenCore/RaidMcActionContext.h
diff --git a/src/strategy/raids/moltencore/RaidMcHelpers.h b/src/Extend/RaidAi/MoltenCore/RaidMcHelpers.h
similarity index 100%
rename from src/strategy/raids/moltencore/RaidMcHelpers.h
rename to src/Extend/RaidAi/MoltenCore/RaidMcHelpers.h
diff --git a/src/strategy/raids/moltencore/RaidMcTriggerContext.h b/src/Extend/RaidAi/MoltenCore/RaidMcTriggerContext.h
similarity index 100%
rename from src/strategy/raids/moltencore/RaidMcTriggerContext.h
rename to src/Extend/RaidAi/MoltenCore/RaidMcTriggerContext.h
diff --git a/src/strategy/raids/moltencore/RaidMcStrategy.cpp b/src/Extend/RaidAi/MoltenCore/Strategy/RaidMcStrategy.cpp
similarity index 100%
rename from src/strategy/raids/moltencore/RaidMcStrategy.cpp
rename to src/Extend/RaidAi/MoltenCore/Strategy/RaidMcStrategy.cpp
diff --git a/src/strategy/raids/moltencore/RaidMcStrategy.h b/src/Extend/RaidAi/MoltenCore/Strategy/RaidMcStrategy.h
similarity index 100%
rename from src/strategy/raids/moltencore/RaidMcStrategy.h
rename to src/Extend/RaidAi/MoltenCore/Strategy/RaidMcStrategy.h
diff --git a/src/strategy/raids/moltencore/RaidMcTriggers.cpp b/src/Extend/RaidAi/MoltenCore/Trigger/RaidMcTriggers.cpp
similarity index 100%
rename from src/strategy/raids/moltencore/RaidMcTriggers.cpp
rename to src/Extend/RaidAi/MoltenCore/Trigger/RaidMcTriggers.cpp
diff --git a/src/strategy/raids/moltencore/RaidMcTriggers.h b/src/Extend/RaidAi/MoltenCore/Trigger/RaidMcTriggers.h
similarity index 100%
rename from src/strategy/raids/moltencore/RaidMcTriggers.h
rename to src/Extend/RaidAi/MoltenCore/Trigger/RaidMcTriggers.h
diff --git a/src/strategy/raids/obsidiansanctum/RaidOsActions.cpp b/src/Extend/RaidAi/ObsidianSanctum/Action/RaidOsActions.cpp
similarity index 100%
rename from src/strategy/raids/obsidiansanctum/RaidOsActions.cpp
rename to src/Extend/RaidAi/ObsidianSanctum/Action/RaidOsActions.cpp
diff --git a/src/strategy/raids/obsidiansanctum/RaidOsActions.h b/src/Extend/RaidAi/ObsidianSanctum/Action/RaidOsActions.h
similarity index 100%
rename from src/strategy/raids/obsidiansanctum/RaidOsActions.h
rename to src/Extend/RaidAi/ObsidianSanctum/Action/RaidOsActions.h
diff --git a/src/strategy/raids/obsidiansanctum/RaidOsMultipliers.cpp b/src/Extend/RaidAi/ObsidianSanctum/Multiplier/RaidOsMultipliers.cpp
similarity index 100%
rename from src/strategy/raids/obsidiansanctum/RaidOsMultipliers.cpp
rename to src/Extend/RaidAi/ObsidianSanctum/Multiplier/RaidOsMultipliers.cpp
diff --git a/src/strategy/raids/obsidiansanctum/RaidOsMultipliers.h b/src/Extend/RaidAi/ObsidianSanctum/Multiplier/RaidOsMultipliers.h
similarity index 100%
rename from src/strategy/raids/obsidiansanctum/RaidOsMultipliers.h
rename to src/Extend/RaidAi/ObsidianSanctum/Multiplier/RaidOsMultipliers.h
diff --git a/src/strategy/raids/obsidiansanctum/RaidOsActionContext.h b/src/Extend/RaidAi/ObsidianSanctum/RaidOsActionContext.h
similarity index 100%
rename from src/strategy/raids/obsidiansanctum/RaidOsActionContext.h
rename to src/Extend/RaidAi/ObsidianSanctum/RaidOsActionContext.h
diff --git a/src/strategy/raids/obsidiansanctum/RaidOsTriggerContext.h b/src/Extend/RaidAi/ObsidianSanctum/RaidOsTriggerContext.h
similarity index 100%
rename from src/strategy/raids/obsidiansanctum/RaidOsTriggerContext.h
rename to src/Extend/RaidAi/ObsidianSanctum/RaidOsTriggerContext.h
diff --git a/src/strategy/raids/obsidiansanctum/RaidOsStrategy.cpp b/src/Extend/RaidAi/ObsidianSanctum/Strategy/RaidOsStrategy.cpp
similarity index 100%
rename from src/strategy/raids/obsidiansanctum/RaidOsStrategy.cpp
rename to src/Extend/RaidAi/ObsidianSanctum/Strategy/RaidOsStrategy.cpp
diff --git a/src/strategy/raids/obsidiansanctum/RaidOsStrategy.h b/src/Extend/RaidAi/ObsidianSanctum/Strategy/RaidOsStrategy.h
similarity index 100%
rename from src/strategy/raids/obsidiansanctum/RaidOsStrategy.h
rename to src/Extend/RaidAi/ObsidianSanctum/Strategy/RaidOsStrategy.h
diff --git a/src/strategy/raids/obsidiansanctum/RaidOsTriggers.cpp b/src/Extend/RaidAi/ObsidianSanctum/Trigger/RaidOsTriggers.cpp
similarity index 100%
rename from src/strategy/raids/obsidiansanctum/RaidOsTriggers.cpp
rename to src/Extend/RaidAi/ObsidianSanctum/Trigger/RaidOsTriggers.cpp
diff --git a/src/strategy/raids/obsidiansanctum/RaidOsTriggers.h b/src/Extend/RaidAi/ObsidianSanctum/Trigger/RaidOsTriggers.h
similarity index 100%
rename from src/strategy/raids/obsidiansanctum/RaidOsTriggers.h
rename to src/Extend/RaidAi/ObsidianSanctum/Trigger/RaidOsTriggers.h
diff --git a/src/strategy/raids/onyxia/RaidOnyxiaActions.cpp b/src/Extend/RaidAi/Onyxia/Action/RaidOnyxiaActions.cpp
similarity index 100%
rename from src/strategy/raids/onyxia/RaidOnyxiaActions.cpp
rename to src/Extend/RaidAi/Onyxia/Action/RaidOnyxiaActions.cpp
diff --git a/src/strategy/raids/onyxia/RaidOnyxiaActions.h b/src/Extend/RaidAi/Onyxia/Action/RaidOnyxiaActions.h
similarity index 100%
rename from src/strategy/raids/onyxia/RaidOnyxiaActions.h
rename to src/Extend/RaidAi/Onyxia/Action/RaidOnyxiaActions.h
diff --git a/src/strategy/raids/onyxia/RaidOnyxiaActionContext.h b/src/Extend/RaidAi/Onyxia/RaidOnyxiaActionContext.h
similarity index 100%
rename from src/strategy/raids/onyxia/RaidOnyxiaActionContext.h
rename to src/Extend/RaidAi/Onyxia/RaidOnyxiaActionContext.h
diff --git a/src/strategy/raids/onyxia/RaidOnyxiaTriggerContext.h b/src/Extend/RaidAi/Onyxia/RaidOnyxiaTriggerContext.h
similarity index 100%
rename from src/strategy/raids/onyxia/RaidOnyxiaTriggerContext.h
rename to src/Extend/RaidAi/Onyxia/RaidOnyxiaTriggerContext.h
diff --git a/src/strategy/raids/onyxia/RaidOnyxiaStrategy.cpp b/src/Extend/RaidAi/Onyxia/Strategy/RaidOnyxiaStrategy.cpp
similarity index 100%
rename from src/strategy/raids/onyxia/RaidOnyxiaStrategy.cpp
rename to src/Extend/RaidAi/Onyxia/Strategy/RaidOnyxiaStrategy.cpp
diff --git a/src/strategy/raids/onyxia/RaidOnyxiaStrategy.h b/src/Extend/RaidAi/Onyxia/Strategy/RaidOnyxiaStrategy.h
similarity index 100%
rename from src/strategy/raids/onyxia/RaidOnyxiaStrategy.h
rename to src/Extend/RaidAi/Onyxia/Strategy/RaidOnyxiaStrategy.h
diff --git a/src/strategy/raids/onyxia/RaidOnyxiaTriggers.cpp b/src/Extend/RaidAi/Onyxia/Trigger/RaidOnyxiaTriggers.cpp
similarity index 98%
rename from src/strategy/raids/onyxia/RaidOnyxiaTriggers.cpp
rename to src/Extend/RaidAi/Onyxia/Trigger/RaidOnyxiaTriggers.cpp
index f74f34e3..aed3a826 100644
--- a/src/strategy/raids/onyxia/RaidOnyxiaTriggers.cpp
+++ b/src/Extend/RaidAi/Onyxia/Trigger/RaidOnyxiaTriggers.cpp
@@ -4,7 +4,7 @@
 #include "ObjectAccessor.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "strategy/values/NearestNpcsValue.h"
+#include "NearestNpcsValue.h"
 
 OnyxiaDeepBreathTrigger::OnyxiaDeepBreathTrigger(PlayerbotAI* botAI) : Trigger(botAI, "ony deep breath warning") {}
 
diff --git a/src/strategy/raids/onyxia/RaidOnyxiaTriggers.h b/src/Extend/RaidAi/Onyxia/Trigger/RaidOnyxiaTriggers.h
similarity index 100%
rename from src/strategy/raids/onyxia/RaidOnyxiaTriggers.h
rename to src/Extend/RaidAi/Onyxia/Trigger/RaidOnyxiaTriggers.h
diff --git a/src/strategy/raids/RaidStrategyContext.h b/src/Extend/RaidAi/RaidStrategyContext.h
similarity index 100%
rename from src/strategy/raids/RaidStrategyContext.h
rename to src/Extend/RaidAi/RaidStrategyContext.h
diff --git a/src/strategy/raids/ulduar/RaidUlduarActions.cpp b/src/Extend/RaidAi/Ulduar/Action/RaidUlduarActions.cpp
similarity index 100%
rename from src/strategy/raids/ulduar/RaidUlduarActions.cpp
rename to src/Extend/RaidAi/Ulduar/Action/RaidUlduarActions.cpp
diff --git a/src/strategy/raids/ulduar/RaidUlduarActions.h b/src/Extend/RaidAi/Ulduar/Action/RaidUlduarActions.h
similarity index 100%
rename from src/strategy/raids/ulduar/RaidUlduarActions.h
rename to src/Extend/RaidAi/Ulduar/Action/RaidUlduarActions.h
diff --git a/src/strategy/raids/ulduar/RaidUlduarMultipliers.cpp b/src/Extend/RaidAi/Ulduar/Multiplier/RaidUlduarMultipliers.cpp
similarity index 100%
rename from src/strategy/raids/ulduar/RaidUlduarMultipliers.cpp
rename to src/Extend/RaidAi/Ulduar/Multiplier/RaidUlduarMultipliers.cpp
diff --git a/src/strategy/raids/ulduar/RaidUlduarMultipliers.h b/src/Extend/RaidAi/Ulduar/Multiplier/RaidUlduarMultipliers.h
similarity index 85%
rename from src/strategy/raids/ulduar/RaidUlduarMultipliers.h
rename to src/Extend/RaidAi/Ulduar/Multiplier/RaidUlduarMultipliers.h
index aef41be5..05bf76b9 100644
--- a/src/strategy/raids/ulduar/RaidUlduarMultipliers.h
+++ b/src/Extend/RaidAi/Ulduar/Multiplier/RaidUlduarMultipliers.h
@@ -3,7 +3,7 @@
 #define _PLAYERRBOT_RAIDULDUARMULTIPLIERS_H_
 
 #include "Multiplier.h"
-#include "raids/ulduar/RaidUlduarBossHelper.h"
+#include "Extend/RaidAi/Ulduar/RaidUlduarBossHelper.h"
 
 class FlameLeviathanMultiplier : public Multiplier
 {
diff --git a/src/strategy/raids/ulduar/RaidUlduarActionContext.h b/src/Extend/RaidAi/Ulduar/RaidUlduarActionContext.h
similarity index 100%
rename from src/strategy/raids/ulduar/RaidUlduarActionContext.h
rename to src/Extend/RaidAi/Ulduar/RaidUlduarActionContext.h
diff --git a/src/strategy/raids/ulduar/RaidUlduarBossHelper.cpp b/src/Extend/RaidAi/Ulduar/RaidUlduarBossHelper.cpp
similarity index 100%
rename from src/strategy/raids/ulduar/RaidUlduarBossHelper.cpp
rename to src/Extend/RaidAi/Ulduar/RaidUlduarBossHelper.cpp
diff --git a/src/strategy/raids/ulduar/RaidUlduarBossHelper.h b/src/Extend/RaidAi/Ulduar/RaidUlduarBossHelper.h
similarity index 100%
rename from src/strategy/raids/ulduar/RaidUlduarBossHelper.h
rename to src/Extend/RaidAi/Ulduar/RaidUlduarBossHelper.h
diff --git a/src/strategy/raids/ulduar/RaidUlduarScripts.h b/src/Extend/RaidAi/Ulduar/RaidUlduarScripts.h
similarity index 100%
rename from src/strategy/raids/ulduar/RaidUlduarScripts.h
rename to src/Extend/RaidAi/Ulduar/RaidUlduarScripts.h
diff --git a/src/strategy/raids/ulduar/RaidUlduarTriggerContext.h b/src/Extend/RaidAi/Ulduar/RaidUlduarTriggerContext.h
similarity index 100%
rename from src/strategy/raids/ulduar/RaidUlduarTriggerContext.h
rename to src/Extend/RaidAi/Ulduar/RaidUlduarTriggerContext.h
diff --git a/src/strategy/raids/ulduar/RaidUlduarStrategy.cpp b/src/Extend/RaidAi/Ulduar/Strategy/RaidUlduarStrategy.cpp
similarity index 100%
rename from src/strategy/raids/ulduar/RaidUlduarStrategy.cpp
rename to src/Extend/RaidAi/Ulduar/Strategy/RaidUlduarStrategy.cpp
diff --git a/src/strategy/raids/ulduar/RaidUlduarStrategy.h b/src/Extend/RaidAi/Ulduar/Strategy/RaidUlduarStrategy.h
similarity index 100%
rename from src/strategy/raids/ulduar/RaidUlduarStrategy.h
rename to src/Extend/RaidAi/Ulduar/Strategy/RaidUlduarStrategy.h
diff --git a/src/strategy/raids/ulduar/RaidUlduarTriggers.cpp b/src/Extend/RaidAi/Ulduar/Trigger/RaidUlduarTriggers.cpp
similarity index 100%
rename from src/strategy/raids/ulduar/RaidUlduarTriggers.cpp
rename to src/Extend/RaidAi/Ulduar/Trigger/RaidUlduarTriggers.cpp
diff --git a/src/strategy/raids/ulduar/RaidUlduarTriggers.h b/src/Extend/RaidAi/Ulduar/Trigger/RaidUlduarTriggers.h
similarity index 100%
rename from src/strategy/raids/ulduar/RaidUlduarTriggers.h
rename to src/Extend/RaidAi/Ulduar/Trigger/RaidUlduarTriggers.h
diff --git a/src/strategy/raids/vaultofarchavon/RaidVoAActions.cpp b/src/Extend/RaidAi/VaultOfArchavon/Action/RaidVoAActions.cpp
similarity index 100%
rename from src/strategy/raids/vaultofarchavon/RaidVoAActions.cpp
rename to src/Extend/RaidAi/VaultOfArchavon/Action/RaidVoAActions.cpp
diff --git a/src/strategy/raids/vaultofarchavon/RaidVoAActions.h b/src/Extend/RaidAi/VaultOfArchavon/Action/RaidVoAActions.h
similarity index 100%
rename from src/strategy/raids/vaultofarchavon/RaidVoAActions.h
rename to src/Extend/RaidAi/VaultOfArchavon/Action/RaidVoAActions.h
diff --git a/src/strategy/raids/vaultofarchavon/RaidVoAActionContext.h b/src/Extend/RaidAi/VaultOfArchavon/RaidVoAActionContext.h
similarity index 100%
rename from src/strategy/raids/vaultofarchavon/RaidVoAActionContext.h
rename to src/Extend/RaidAi/VaultOfArchavon/RaidVoAActionContext.h
diff --git a/src/strategy/raids/vaultofarchavon/RaidVoATriggerContext.h b/src/Extend/RaidAi/VaultOfArchavon/RaidVoATriggerContext.h
similarity index 100%
rename from src/strategy/raids/vaultofarchavon/RaidVoATriggerContext.h
rename to src/Extend/RaidAi/VaultOfArchavon/RaidVoATriggerContext.h
diff --git a/src/strategy/raids/vaultofarchavon/RaidVoAStrategy.cpp b/src/Extend/RaidAi/VaultOfArchavon/Strategy/RaidVoAStrategy.cpp
similarity index 100%
rename from src/strategy/raids/vaultofarchavon/RaidVoAStrategy.cpp
rename to src/Extend/RaidAi/VaultOfArchavon/Strategy/RaidVoAStrategy.cpp
diff --git a/src/strategy/raids/vaultofarchavon/RaidVoAStrategy.h b/src/Extend/RaidAi/VaultOfArchavon/Strategy/RaidVoAStrategy.h
similarity index 100%
rename from src/strategy/raids/vaultofarchavon/RaidVoAStrategy.h
rename to src/Extend/RaidAi/VaultOfArchavon/Strategy/RaidVoAStrategy.h
diff --git a/src/strategy/raids/vaultofarchavon/RaidVoATriggers.cpp b/src/Extend/RaidAi/VaultOfArchavon/Trigger/RaidVoATriggers.cpp
similarity index 100%
rename from src/strategy/raids/vaultofarchavon/RaidVoATriggers.cpp
rename to src/Extend/RaidAi/VaultOfArchavon/Trigger/RaidVoATriggers.cpp
diff --git a/src/strategy/raids/vaultofarchavon/RaidVoATriggers.h b/src/Extend/RaidAi/VaultOfArchavon/Trigger/RaidVoATriggers.h
similarity index 100%
rename from src/strategy/raids/vaultofarchavon/RaidVoATriggers.h
rename to src/Extend/RaidAi/VaultOfArchavon/Trigger/RaidVoATriggers.h
diff --git a/src/strategy/rpg/NewRpgAction.cpp b/src/Extend/WorldAi/Rpg/Action/NewRpgAction.cpp
similarity index 100%
rename from src/strategy/rpg/NewRpgAction.cpp
rename to src/Extend/WorldAi/Rpg/Action/NewRpgAction.cpp
diff --git a/src/strategy/rpg/NewRpgAction.h b/src/Extend/WorldAi/Rpg/Action/NewRpgAction.h
similarity index 100%
rename from src/strategy/rpg/NewRpgAction.h
rename to src/Extend/WorldAi/Rpg/Action/NewRpgAction.h
diff --git a/src/strategy/rpg/NewRpgBaseAction.cpp b/src/Extend/WorldAi/Rpg/Action/NewRpgBaseAction.cpp
similarity index 100%
rename from src/strategy/rpg/NewRpgBaseAction.cpp
rename to src/Extend/WorldAi/Rpg/Action/NewRpgBaseAction.cpp
diff --git a/src/strategy/rpg/NewRpgBaseAction.h b/src/Extend/WorldAi/Rpg/Action/NewRpgBaseAction.h
similarity index 100%
rename from src/strategy/rpg/NewRpgBaseAction.h
rename to src/Extend/WorldAi/Rpg/Action/NewRpgBaseAction.h
diff --git a/src/strategy/rpg/NewRpgInfo.cpp b/src/Extend/WorldAi/Rpg/NewRpgInfo.cpp
similarity index 100%
rename from src/strategy/rpg/NewRpgInfo.cpp
rename to src/Extend/WorldAi/Rpg/NewRpgInfo.cpp
diff --git a/src/strategy/rpg/NewRpgInfo.h b/src/Extend/WorldAi/Rpg/NewRpgInfo.h
similarity index 100%
rename from src/strategy/rpg/NewRpgInfo.h
rename to src/Extend/WorldAi/Rpg/NewRpgInfo.h
diff --git a/src/strategy/rpg/NewRpgStrategy.cpp b/src/Extend/WorldAi/Rpg/Strategy/NewRpgStrategy.cpp
similarity index 100%
rename from src/strategy/rpg/NewRpgStrategy.cpp
rename to src/Extend/WorldAi/Rpg/Strategy/NewRpgStrategy.cpp
diff --git a/src/strategy/rpg/NewRpgStrategy.h b/src/Extend/WorldAi/Rpg/Strategy/NewRpgStrategy.h
similarity index 100%
rename from src/strategy/rpg/NewRpgStrategy.h
rename to src/Extend/WorldAi/Rpg/Strategy/NewRpgStrategy.h
diff --git a/src/strategy/rpg/NewRpgTrigger.cpp b/src/Extend/WorldAi/Rpg/Trigger/NewRpgTrigger.cpp
similarity index 100%
rename from src/strategy/rpg/NewRpgTrigger.cpp
rename to src/Extend/WorldAi/Rpg/Trigger/NewRpgTrigger.cpp
diff --git a/src/strategy/rpg/NewRpgTriggers.h b/src/Extend/WorldAi/Rpg/Trigger/NewRpgTriggers.h
similarity index 100%
rename from src/strategy/rpg/NewRpgTriggers.h
rename to src/Extend/WorldAi/Rpg/Trigger/NewRpgTriggers.h
diff --git a/src/GuildTaskMgr.cpp b/src/Manager/Guild/GuildTaskMgr.cpp
similarity index 100%
rename from src/GuildTaskMgr.cpp
rename to src/Manager/Guild/GuildTaskMgr.cpp
diff --git a/src/GuildTaskMgr.h b/src/Manager/Guild/GuildTaskMgr.h
similarity index 100%
rename from src/GuildTaskMgr.h
rename to src/Manager/Guild/GuildTaskMgr.h
diff --git a/src/PlayerbotGuildMgr.cpp b/src/Manager/Guild/PlayerbotGuildMgr.cpp
similarity index 100%
rename from src/PlayerbotGuildMgr.cpp
rename to src/Manager/Guild/PlayerbotGuildMgr.cpp
diff --git a/src/PlayerbotGuildMgr.h b/src/Manager/Guild/PlayerbotGuildMgr.h
similarity index 100%
rename from src/PlayerbotGuildMgr.h
rename to src/Manager/Guild/PlayerbotGuildMgr.h
diff --git a/src/strategy/ItemVisitors.cpp b/src/Manager/Item/ItemVisitors.cpp
similarity index 100%
rename from src/strategy/ItemVisitors.cpp
rename to src/Manager/Item/ItemVisitors.cpp
diff --git a/src/strategy/ItemVisitors.h b/src/Manager/Item/ItemVisitors.h
similarity index 100%
rename from src/strategy/ItemVisitors.h
rename to src/Manager/Item/ItemVisitors.h
diff --git a/src/LootObjectStack.cpp b/src/Manager/Item/LootObjectStack.cpp
similarity index 100%
rename from src/LootObjectStack.cpp
rename to src/Manager/Item/LootObjectStack.cpp
diff --git a/src/LootObjectStack.h b/src/Manager/Item/LootObjectStack.h
similarity index 100%
rename from src/LootObjectStack.h
rename to src/Manager/Item/LootObjectStack.h
diff --git a/src/RandomItemMgr.cpp b/src/Manager/Item/RandomItemMgr.cpp
similarity index 100%
rename from src/RandomItemMgr.cpp
rename to src/Manager/Item/RandomItemMgr.cpp
diff --git a/src/RandomItemMgr.h b/src/Manager/Item/RandomItemMgr.h
similarity index 100%
rename from src/RandomItemMgr.h
rename to src/Manager/Item/RandomItemMgr.h
diff --git a/src/factory/StatsCollector.cpp b/src/Manager/Item/StatsCollector.cpp
similarity index 100%
rename from src/factory/StatsCollector.cpp
rename to src/Manager/Item/StatsCollector.cpp
diff --git a/src/factory/StatsCollector.h b/src/Manager/Item/StatsCollector.h
similarity index 100%
rename from src/factory/StatsCollector.h
rename to src/Manager/Item/StatsCollector.h
diff --git a/src/factory/StatsWeightCalculator.cpp b/src/Manager/Item/StatsWeightCalculator.cpp
similarity index 100%
rename from src/factory/StatsWeightCalculator.cpp
rename to src/Manager/Item/StatsWeightCalculator.cpp
diff --git a/src/factory/StatsWeightCalculator.h b/src/Manager/Item/StatsWeightCalculator.h
similarity index 100%
rename from src/factory/StatsWeightCalculator.h
rename to src/Manager/Item/StatsWeightCalculator.h
diff --git a/src/FleeManager.cpp b/src/Manager/Movement/FleeManager.cpp
similarity index 100%
rename from src/FleeManager.cpp
rename to src/Manager/Movement/FleeManager.cpp
diff --git a/src/FleeManager.h b/src/Manager/Movement/FleeManager.h
similarity index 100%
rename from src/FleeManager.h
rename to src/Manager/Movement/FleeManager.h
diff --git a/src/PlayerbotSecurity.cpp b/src/Manager/Security/PlayerbotSecurity.cpp
similarity index 100%
rename from src/PlayerbotSecurity.cpp
rename to src/Manager/Security/PlayerbotSecurity.cpp
diff --git a/src/PlayerbotSecurity.h b/src/Manager/Security/PlayerbotSecurity.h
similarity index 100%
rename from src/PlayerbotSecurity.h
rename to src/Manager/Security/PlayerbotSecurity.h
diff --git a/src/Talentspec.cpp b/src/Manager/Talent/Talentspec.cpp
similarity index 100%
rename from src/Talentspec.cpp
rename to src/Manager/Talent/Talentspec.cpp
diff --git a/src/Talentspec.h b/src/Manager/Talent/Talentspec.h
similarity index 100%
rename from src/Talentspec.h
rename to src/Manager/Talent/Talentspec.h
diff --git a/src/PlayerbotTextMgr.cpp b/src/Manager/Text/PlayerbotTextMgr.cpp
similarity index 100%
rename from src/PlayerbotTextMgr.cpp
rename to src/Manager/Text/PlayerbotTextMgr.cpp
diff --git a/src/PlayerbotTextMgr.h b/src/Manager/Text/PlayerbotTextMgr.h
similarity index 100%
rename from src/PlayerbotTextMgr.h
rename to src/Manager/Text/PlayerbotTextMgr.h
diff --git a/src/TravelMgr.cpp b/src/Manager/Travel/TravelMgr.cpp
similarity index 100%
rename from src/TravelMgr.cpp
rename to src/Manager/Travel/TravelMgr.cpp
diff --git a/src/TravelMgr.h b/src/Manager/Travel/TravelMgr.h
similarity index 100%
rename from src/TravelMgr.h
rename to src/Manager/Travel/TravelMgr.h
diff --git a/src/TravelNode.cpp b/src/Manager/Travel/TravelNode.cpp
similarity index 100%
rename from src/TravelNode.cpp
rename to src/Manager/Travel/TravelNode.cpp
diff --git a/src/TravelNode.h b/src/Manager/Travel/TravelNode.h
similarity index 100%
rename from src/TravelNode.h
rename to src/Manager/Travel/TravelNode.h
diff --git a/src/PlayerbotDungeonSuggestionMgr.cpp b/src/Repository/PlayerbotDungeonRepository.cpp
similarity index 88%
rename from src/PlayerbotDungeonSuggestionMgr.cpp
rename to src/Repository/PlayerbotDungeonRepository.cpp
index 3df2d0d7..3ee40e56 100644
--- a/src/PlayerbotDungeonSuggestionMgr.cpp
+++ b/src/Repository/PlayerbotDungeonRepository.cpp
@@ -3,16 +3,16 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "PlayerbotDungeonSuggestionMgr.h"
+#include "PlayerbotDungeonRepository.h"
 
 #include "Playerbots.h"
 
-std::vector<DungeonSuggestion> const PlayerbotDungeonSuggestionMgr::GetDungeonSuggestions()
+std::vector<DungeonSuggestion> const PlayerbotDungeonRepository::GetDungeonSuggestions()
 {
     return m_dungeonSuggestions;
 }
 
-void PlayerbotDungeonSuggestionMgr::LoadDungeonSuggestions()
+void PlayerbotDungeonRepository::LoadDungeonSuggestions()
 {
     LOG_INFO("server.loading", "Loading playerbots dungeon suggestions...");
     uint32 oldMSTime = getMSTime();
diff --git a/src/PlayerbotDungeonSuggestionMgr.h b/src/Repository/PlayerbotDungeonRepository.h
similarity index 63%
rename from src/PlayerbotDungeonSuggestionMgr.h
rename to src/Repository/PlayerbotDungeonRepository.h
index 74354613..8c709152 100644
--- a/src/PlayerbotDungeonSuggestionMgr.h
+++ b/src/Repository/PlayerbotDungeonRepository.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PLAYERBOTDUNGEONSUGGESTIONMGR_H
-#define _PLAYERBOT_PLAYERBOTDUNGEONSUGGESTIONMGR_H
+#ifndef _PLAYERBOT_PLAYERBOTDUNGEONREPOSITORY_H
+#define _PLAYERBOT_PLAYERBOTDUNGEONREPOSITORY_H
 
 #include <map>
 #include <vector>
@@ -22,14 +22,14 @@ struct DungeonSuggestion
     std::string strategy;
 };
 
-class PlayerbotDungeonSuggestionMgr
+class PlayerbotDungeonRepository
 {
 public:
-    PlayerbotDungeonSuggestionMgr(){};
-    ~PlayerbotDungeonSuggestionMgr(){};
-    static PlayerbotDungeonSuggestionMgr* instance()
+    PlayerbotDungeonRepository(){};
+    ~PlayerbotDungeonRepository(){};
+    static PlayerbotDungeonRepository* instance()
     {
-        static PlayerbotDungeonSuggestionMgr instance;
+        static PlayerbotDungeonRepository instance;
         return &instance;
     }
 
@@ -40,6 +40,6 @@ private:
     std::vector<DungeonSuggestion> m_dungeonSuggestions;
 };
 
-#define sPlayerbotDungeonSuggestionMgr PlayerbotDungeonSuggestionMgr::instance()
+#define sPlayerbotDungeonRepository PlayerbotDungeonRepository::instance()
 
 #endif
diff --git a/src/PlayerbotDbStore.cpp b/src/Repository/PlayerbotRepository.cpp
similarity index 88%
rename from src/PlayerbotDbStore.cpp
rename to src/Repository/PlayerbotRepository.cpp
index a841e02b..886cebb8 100644
--- a/src/PlayerbotDbStore.cpp
+++ b/src/Repository/PlayerbotRepository.cpp
@@ -3,13 +3,13 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "PlayerbotDbStore.h"
+#include "PlayerbotRepository.h"
 
 #include <iostream>
 
 #include "Playerbots.h"
 
-void PlayerbotDbStore::Load(PlayerbotAI* botAI)
+void PlayerbotRepository::Load(PlayerbotAI* botAI)
 {
     ObjectGuid::LowType guid = botAI->GetBot()->GetGUID().GetCounter();
 
@@ -46,7 +46,7 @@ void PlayerbotDbStore::Load(PlayerbotAI* botAI)
     }
 }
 
-void PlayerbotDbStore::Save(PlayerbotAI* botAI)
+void PlayerbotRepository::Save(PlayerbotAI* botAI)
 {
     ObjectGuid::LowType guid = botAI->GetBot()->GetGUID().GetCounter();
 
@@ -68,7 +68,7 @@ void PlayerbotDbStore::Save(PlayerbotAI* botAI)
     SaveValue(guid, "dead", FormatStrategies("dead", botAI->GetStrategies(BOT_STATE_DEAD)));
 }
 
-std::string const PlayerbotDbStore::FormatStrategies(std::string const type, std::vector<std::string> strategies)
+std::string const PlayerbotRepository::FormatStrategies(std::string const type, std::vector<std::string> strategies)
 {
     std::ostringstream out;
     for (std::vector<std::string>::iterator i = strategies.begin(); i != strategies.end(); ++i)
@@ -78,7 +78,7 @@ std::string const PlayerbotDbStore::FormatStrategies(std::string const type, std
     return res.substr(0, res.size() - 1);
 }
 
-void PlayerbotDbStore::Reset(PlayerbotAI* botAI)
+void PlayerbotRepository::Reset(PlayerbotAI* botAI)
 {
     ObjectGuid::LowType guid = botAI->GetBot()->GetGUID().GetCounter();
 
@@ -87,7 +87,7 @@ void PlayerbotDbStore::Reset(PlayerbotAI* botAI)
     PlayerbotsDatabase.Execute(stmt);
 }
 
-void PlayerbotDbStore::SaveValue(uint32 guid, std::string const key, std::string const value)
+void PlayerbotRepository::SaveValue(uint32 guid, std::string const key, std::string const value)
 {
     PlayerbotsDatabasePreparedStatement* stmt = PlayerbotsDatabase.GetPreparedStatement(PLAYERBOTS_INS_DB_STORE);
     stmt->SetData(0, guid);
diff --git a/src/PlayerbotDbStore.h b/src/Repository/PlayerbotRepository.h
similarity index 66%
rename from src/PlayerbotDbStore.h
rename to src/Repository/PlayerbotRepository.h
index 713d7f65..90dbce54 100644
--- a/src/PlayerbotDbStore.h
+++ b/src/Repository/PlayerbotRepository.h
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PLAYERBOTDBSTORE_H
-#define _PLAYERBOT_PLAYERBOTDBSTORE_H
+#ifndef _PLAYERBOT_PLAYERBOTREPOSITORY_H
+#define _PLAYERBOT_PLAYERBOTREPOSITORY_H
 
 #include <vector>
 
@@ -12,14 +12,14 @@
 
 class PlayerbotAI;
 
-class PlayerbotDbStore
+class PlayerbotRepository
 {
 public:
-    PlayerbotDbStore() {}
-    virtual ~PlayerbotDbStore() {}
-    static PlayerbotDbStore* instance()
+    PlayerbotRepository() {}
+    virtual ~PlayerbotRepository() {}
+    static PlayerbotRepository* instance()
     {
-        static PlayerbotDbStore instance;
+        static PlayerbotRepository instance;
         return &instance;
     }
 
@@ -32,6 +32,6 @@ private:
     std::string const FormatStrategies(std::string const type, std::vector<std::string> strategies);
 };
 
-#define sPlayerbotDbStore PlayerbotDbStore::instance()
+#define sPlayerbotRepository PlayerbotRepository::instance()
 
 #endif
diff --git a/src/database/PlayerbotSpellCache.cpp b/src/Repository/PlayerbotSpellRepository.cpp
similarity index 76%
rename from src/database/PlayerbotSpellCache.cpp
rename to src/Repository/PlayerbotSpellRepository.cpp
index 02efcbd9..6642eeee 100644
--- a/src/database/PlayerbotSpellCache.cpp
+++ b/src/Repository/PlayerbotSpellRepository.cpp
@@ -1,9 +1,10 @@
-#include "PlayerbotSpellCache.h"
+#include "PlayerbotSpellRepository.h"
 
-void PlayerbotSpellCache::Initialize()
+//  caches the result set
+void PlayerbotSpellRepository::Initialize()
 {
-    LOG_INFO("playerbots",
-        "Playerbots: ListSpellsAction caches initialized");
+    LOG_INFO("playerbots", "Playerbots: ListSpellsAction caches initialized");
+
     for (uint32 j = 0; j < sSkillLineAbilityStore.GetNumRows(); ++j)
     {
         if (SkillLineAbilityEntry const* skillLine = sSkillLineAbilityStore.LookupEntry(j))
@@ -31,7 +32,7 @@ void PlayerbotSpellCache::Initialize()
             skillSpells.size(), vendorItems.size());
 }
 
-SkillLineAbilityEntry const* PlayerbotSpellCache::GetSkillLine(uint32 spellId) const
+SkillLineAbilityEntry const* PlayerbotSpellRepository::GetSkillLine(uint32 spellId) const
 {
     auto itr = skillSpells.find(spellId);
     if (itr != skillSpells.end())
@@ -39,7 +40,7 @@ SkillLineAbilityEntry const* PlayerbotSpellCache::GetSkillLine(uint32 spellId) c
     return nullptr;
 }
 
-bool PlayerbotSpellCache::IsItemBuyable(uint32 itemId) const
+bool PlayerbotSpellRepository::IsItemBuyable(uint32 itemId) const
 {
     return vendorItems.find(itemId) != vendorItems.end();
 }
diff --git a/src/database/PlayerbotSpellCache.h b/src/Repository/PlayerbotSpellRepository.h
similarity index 63%
rename from src/database/PlayerbotSpellCache.h
rename to src/Repository/PlayerbotSpellRepository.h
index 15502768..55046e59 100644
--- a/src/database/PlayerbotSpellCache.h
+++ b/src/Repository/PlayerbotSpellRepository.h
@@ -3,17 +3,17 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#ifndef _PLAYERBOT_PLAYERBOTSPELLCACHE_H
-#define _PLAYERBOT_PLAYERBOTSPELLCACHE_H
+#ifndef _PLAYERBOT_PLAYERBOTSPELLREPOSITORY_H
+#define _PLAYERBOT_PLAYERBOTSPELLREPOSITORY_H
 
 #include "Playerbots.h"
 
-class PlayerbotSpellCache
+class PlayerbotSpellRepository
 {
 public:
-    static PlayerbotSpellCache* Instance()
+    static PlayerbotSpellRepository* Instance()
     {
-        static PlayerbotSpellCache instance;
+        static PlayerbotSpellRepository instance;
         return &instance;
     }
 
@@ -23,12 +23,12 @@ public:
     bool IsItemBuyable(uint32 itemId) const;
 
 private:
-    PlayerbotSpellCache() = default;
+    PlayerbotSpellRepository() = default;
 
     std::map<uint32, SkillLineAbilityEntry const*> skillSpells;
     std::set<uint32> vendorItems;
 };
 
-#define sPlayerbotSpellCache PlayerbotSpellCache::Instance()
+#define sPlayerbotSpellRepository PlayerbotSpellRepository::Instance()
 
 #endif
diff --git a/src/BroadcastHelper.cpp b/src/Util/BroadcastHelper.cpp
similarity index 100%
rename from src/BroadcastHelper.cpp
rename to src/Util/BroadcastHelper.cpp
diff --git a/src/BroadcastHelper.h b/src/Util/BroadcastHelper.h
similarity index 100%
rename from src/BroadcastHelper.h
rename to src/Util/BroadcastHelper.h
diff --git a/src/Helpers.cpp b/src/Util/Helpers.cpp
similarity index 100%
rename from src/Helpers.cpp
rename to src/Util/Helpers.cpp
diff --git a/src/Helpers.h b/src/Util/Helpers.h
similarity index 100%
rename from src/Helpers.h
rename to src/Util/Helpers.h
diff --git a/src/LazyCalculatedValue.h b/src/Util/LazyCalculatedValue.h
similarity index 100%
rename from src/LazyCalculatedValue.h
rename to src/Util/LazyCalculatedValue.h
diff --git a/src/PlaceholderHelper.cpp b/src/Util/PlaceholderHelper.cpp
similarity index 100%
rename from src/PlaceholderHelper.cpp
rename to src/Util/PlaceholderHelper.cpp
diff --git a/src/PlaceholderHelper.h b/src/Util/PlaceholderHelper.h
similarity index 95%
rename from src/PlaceholderHelper.h
rename to src/Util/PlaceholderHelper.h
index 2f290b09..5ce57d72 100644
--- a/src/PlaceholderHelper.h
+++ b/src/Util/PlaceholderHelper.h
@@ -10,7 +10,7 @@
 
 #include "Common.h"
 #include "Player.h"
-#include "PlayerbotDungeonSuggestionMgr.h"
+#include "PlayerbotDungeonRepository.h"
 
 typedef std::map<std::string, std::string> PlaceholderMap;
 
diff --git a/src/ServerFacade.cpp b/src/Util/ServerFacade.cpp
similarity index 100%
rename from src/ServerFacade.cpp
rename to src/Util/ServerFacade.cpp
diff --git a/src/ServerFacade.h b/src/Util/ServerFacade.h
similarity index 100%
rename from src/ServerFacade.h
rename to src/Util/ServerFacade.h
diff --git a/src/cs_playerbots.h b/src/cs_playerbots.h
deleted file mode 100644
index e2e7de6d..00000000
--- a/src/cs_playerbots.h
+++ /dev/null
@@ -1 +0,0 @@
-void AddSC_playerbots_commandscript();
diff --git a/src/strategy/dungeons/wotlk/WotlkDungeonActionContext.h b/src/strategy/dungeons/wotlk/WotlkDungeonActionContext.h
deleted file mode 100644
index a53f9515..00000000
--- a/src/strategy/dungeons/wotlk/WotlkDungeonActionContext.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONACTIONCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONACTIONCONTEXT_H
-
-#include "utgardekeep/UtgardeKeepActionContext.h"
-#include "nexus/NexusActionContext.h"
-#include "azjolnerub/AzjolNerubActionContext.h"
-#include "oldkingdom/OldKingdomActionContext.h"
-#include "draktharonkeep/DrakTharonKeepActionContext.h"
-#include "violethold/VioletHoldActionContext.h"
-#include "gundrak/GundrakActionContext.h"
-#include "hallsofstone/HallsOfStoneActionContext.h"
-#include "hallsoflightning/HallsOfLightningActionContext.h"
-#include "oculus/OculusActionContext.h"
-#include "utgardepinnacle/UtgardePinnacleActionContext.h"
-#include "cullingofstratholme/CullingOfStratholmeActionContext.h"
-#include "forgeofsouls/ForgeOfSoulsActionContext.h"
-#include "pitofsaron/PitOfSaronActionContext.h"
-#include "trialofthechampion/TrialOfTheChampionActionContext.h"
-// #include "hallsofreflection/HallsOfReflectionActionContext.h"
-
-#endif
diff --git a/src/strategy/dungeons/wotlk/WotlkDungeonTriggerContext.h b/src/strategy/dungeons/wotlk/WotlkDungeonTriggerContext.h
deleted file mode 100644
index 1a3d7a94..00000000
--- a/src/strategy/dungeons/wotlk/WotlkDungeonTriggerContext.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _PLAYERBOT_WOTLKDUNGEONTRIGGERCONTEXT_H
-#define _PLAYERBOT_WOTLKDUNGEONTRIGGERCONTEXT_H
-
-#include "utgardekeep/UtgardeKeepTriggerContext.h"
-#include "nexus/NexusTriggerContext.h"
-#include "azjolnerub/AzjolNerubTriggerContext.h"
-#include "oldkingdom/OldKingdomTriggerContext.h"
-#include "draktharonkeep/DrakTharonKeepTriggerContext.h"
-#include "violethold/VioletHoldTriggerContext.h"
-#include "gundrak/GundrakTriggerContext.h"
-#include "hallsofstone/HallsOfStoneTriggerContext.h"
-#include "hallsoflightning/HallsOfLightningTriggerContext.h"
-#include "oculus/OculusTriggerContext.h"
-#include "utgardepinnacle/UtgardePinnacleTriggerContext.h"
-#include "cullingofstratholme/CullingOfStratholmeTriggerContext.h"
-#include "forgeofsouls/ForgeOfSoulsTriggerContext.h"
-#include "pitofsaron/PitOfSaronTriggerContext.h"
-#include "trialofthechampion/TrialOfTheChampionTriggerContext.h"
-// #include "hallsofreflection/HallsOfReflectionTriggerContext.h"
-
-#endif