diff --git a/src/Core/Ai/Generic/ActionContext.h b/src/Bot/BaseAi/ActionContext.h
similarity index 100%
rename from src/Core/Ai/Generic/ActionContext.h
rename to src/Bot/BaseAi/ActionContext.h
diff --git a/src/Core/Ai/Generic/Actions/AcceptBattlegroundInvitationAction.cpp b/src/Bot/BaseAi/Actions/AcceptBattlegroundInvitationAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/AcceptBattlegroundInvitationAction.cpp
rename to src/Bot/BaseAi/Actions/AcceptBattlegroundInvitationAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/AcceptBattlegroundInvitationAction.h b/src/Bot/BaseAi/Actions/AcceptBattlegroundInvitationAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/AcceptBattlegroundInvitationAction.h
rename to src/Bot/BaseAi/Actions/AcceptBattlegroundInvitationAction.h
diff --git a/src/Core/Ai/Generic/Actions/AcceptDuelAction.cpp b/src/Bot/BaseAi/Actions/AcceptDuelAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/AcceptDuelAction.cpp
rename to src/Bot/BaseAi/Actions/AcceptDuelAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/AcceptDuelAction.h b/src/Bot/BaseAi/Actions/AcceptDuelAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/AcceptDuelAction.h
rename to src/Bot/BaseAi/Actions/AcceptDuelAction.h
diff --git a/src/Core/Ai/Generic/Actions/AcceptInvitationAction.cpp b/src/Bot/BaseAi/Actions/AcceptInvitationAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/AcceptInvitationAction.cpp
rename to src/Bot/BaseAi/Actions/AcceptInvitationAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/AcceptInvitationAction.h b/src/Bot/BaseAi/Actions/AcceptInvitationAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/AcceptInvitationAction.h
rename to src/Bot/BaseAi/Actions/AcceptInvitationAction.h
diff --git a/src/Core/Ai/Generic/Actions/AcceptQuestAction.cpp b/src/Bot/BaseAi/Actions/AcceptQuestAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/AcceptQuestAction.cpp
rename to src/Bot/BaseAi/Actions/AcceptQuestAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/AcceptQuestAction.h b/src/Bot/BaseAi/Actions/AcceptQuestAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/AcceptQuestAction.h
rename to src/Bot/BaseAi/Actions/AcceptQuestAction.h
diff --git a/src/Core/Ai/Generic/Actions/AcceptResurrectAction.cpp b/src/Bot/BaseAi/Actions/AcceptResurrectAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/AcceptResurrectAction.cpp
rename to src/Bot/BaseAi/Actions/AcceptResurrectAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/AcceptResurrectAction.h b/src/Bot/BaseAi/Actions/AcceptResurrectAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/AcceptResurrectAction.h
rename to src/Bot/BaseAi/Actions/AcceptResurrectAction.h
diff --git a/src/Core/Ai/Generic/Actions/AddLootAction.cpp b/src/Bot/BaseAi/Actions/AddLootAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/AddLootAction.cpp
rename to src/Bot/BaseAi/Actions/AddLootAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/AddLootAction.h b/src/Bot/BaseAi/Actions/AddLootAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/AddLootAction.h
rename to src/Bot/BaseAi/Actions/AddLootAction.h
diff --git a/src/Core/Ai/Generic/Actions/AreaTriggerAction.cpp b/src/Bot/BaseAi/Actions/AreaTriggerAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/AreaTriggerAction.cpp
rename to src/Bot/BaseAi/Actions/AreaTriggerAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/AreaTriggerAction.h b/src/Bot/BaseAi/Actions/AreaTriggerAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/AreaTriggerAction.h
rename to src/Bot/BaseAi/Actions/AreaTriggerAction.h
diff --git a/src/Core/Ai/Generic/Actions/ArenaTeamActions.cpp b/src/Bot/BaseAi/Actions/ArenaTeamActions.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ArenaTeamActions.cpp
rename to src/Bot/BaseAi/Actions/ArenaTeamActions.cpp
diff --git a/src/Core/Ai/Generic/Actions/ArenaTeamActions.h b/src/Bot/BaseAi/Actions/ArenaTeamActions.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ArenaTeamActions.h
rename to src/Bot/BaseAi/Actions/ArenaTeamActions.h
diff --git a/src/Core/Ai/Generic/Actions/AttackAction.cpp b/src/Bot/BaseAi/Actions/AttackAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/AttackAction.cpp
rename to src/Bot/BaseAi/Actions/AttackAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/AttackAction.h b/src/Bot/BaseAi/Actions/AttackAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/AttackAction.h
rename to src/Bot/BaseAi/Actions/AttackAction.h
diff --git a/src/Core/Ai/Generic/Actions/AutoMaintenanceOnLevelupAction.cpp b/src/Bot/BaseAi/Actions/AutoMaintenanceOnLevelupAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/AutoMaintenanceOnLevelupAction.cpp
rename to src/Bot/BaseAi/Actions/AutoMaintenanceOnLevelupAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/AutoMaintenanceOnLevelupAction.h b/src/Bot/BaseAi/Actions/AutoMaintenanceOnLevelupAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/AutoMaintenanceOnLevelupAction.h
rename to src/Bot/BaseAi/Actions/AutoMaintenanceOnLevelupAction.h
diff --git a/src/Core/Ai/Generic/Actions/BankAction.cpp b/src/Bot/BaseAi/Actions/BankAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/BankAction.cpp
rename to src/Bot/BaseAi/Actions/BankAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/BankAction.h b/src/Bot/BaseAi/Actions/BankAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/BankAction.h
rename to src/Bot/BaseAi/Actions/BankAction.h
diff --git a/src/Core/Ai/Generic/Actions/BattleGroundJoinAction.cpp b/src/Bot/BaseAi/Actions/BattleGroundJoinAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/BattleGroundJoinAction.cpp
rename to src/Bot/BaseAi/Actions/BattleGroundJoinAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/BattleGroundJoinAction.h b/src/Bot/BaseAi/Actions/BattleGroundJoinAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/BattleGroundJoinAction.h
rename to src/Bot/BaseAi/Actions/BattleGroundJoinAction.h
diff --git a/src/Core/Ai/Generic/Actions/BattleGroundTactics.cpp b/src/Bot/BaseAi/Actions/BattleGroundTactics.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/BattleGroundTactics.cpp
rename to src/Bot/BaseAi/Actions/BattleGroundTactics.cpp
diff --git a/src/Core/Ai/Generic/Actions/BattleGroundTactics.h b/src/Bot/BaseAi/Actions/BattleGroundTactics.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/BattleGroundTactics.h
rename to src/Bot/BaseAi/Actions/BattleGroundTactics.h
diff --git a/src/Core/Ai/Generic/Actions/BossAuraActions.cpp b/src/Bot/BaseAi/Actions/BossAuraActions.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/BossAuraActions.cpp
rename to src/Bot/BaseAi/Actions/BossAuraActions.cpp
diff --git a/src/Core/Ai/Generic/Actions/BossAuraActions.h b/src/Bot/BaseAi/Actions/BossAuraActions.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/BossAuraActions.h
rename to src/Bot/BaseAi/Actions/BossAuraActions.h
diff --git a/src/Core/Ai/Generic/Actions/BuffAction.cpp b/src/Bot/BaseAi/Actions/BuffAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/BuffAction.cpp
rename to src/Bot/BaseAi/Actions/BuffAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/BuffAction.h b/src/Bot/BaseAi/Actions/BuffAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/BuffAction.h
rename to src/Bot/BaseAi/Actions/BuffAction.h
diff --git a/src/Core/Ai/Generic/Actions/BuyAction.cpp b/src/Bot/BaseAi/Actions/BuyAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/BuyAction.cpp
rename to src/Bot/BaseAi/Actions/BuyAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/BuyAction.h b/src/Bot/BaseAi/Actions/BuyAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/BuyAction.h
rename to src/Bot/BaseAi/Actions/BuyAction.h
diff --git a/src/Core/Ai/Generic/Actions/CancelChannelAction.cpp b/src/Bot/BaseAi/Actions/CancelChannelAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/CancelChannelAction.cpp
rename to src/Bot/BaseAi/Actions/CancelChannelAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/CancelChannelAction.h b/src/Bot/BaseAi/Actions/CancelChannelAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/CancelChannelAction.h
rename to src/Bot/BaseAi/Actions/CancelChannelAction.h
diff --git a/src/Core/Ai/Generic/Actions/CastCustomSpellAction.cpp b/src/Bot/BaseAi/Actions/CastCustomSpellAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/CastCustomSpellAction.cpp
rename to src/Bot/BaseAi/Actions/CastCustomSpellAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/CastCustomSpellAction.h b/src/Bot/BaseAi/Actions/CastCustomSpellAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/CastCustomSpellAction.h
rename to src/Bot/BaseAi/Actions/CastCustomSpellAction.h
diff --git a/src/Core/Ai/Generic/Actions/ChangeChatAction.cpp b/src/Bot/BaseAi/Actions/ChangeChatAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ChangeChatAction.cpp
rename to src/Bot/BaseAi/Actions/ChangeChatAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/ChangeChatAction.h b/src/Bot/BaseAi/Actions/ChangeChatAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ChangeChatAction.h
rename to src/Bot/BaseAi/Actions/ChangeChatAction.h
diff --git a/src/Core/Ai/Generic/Actions/ChangeStrategyAction.cpp b/src/Bot/BaseAi/Actions/ChangeStrategyAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ChangeStrategyAction.cpp
rename to src/Bot/BaseAi/Actions/ChangeStrategyAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/ChangeStrategyAction.h b/src/Bot/BaseAi/Actions/ChangeStrategyAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ChangeStrategyAction.h
rename to src/Bot/BaseAi/Actions/ChangeStrategyAction.h
diff --git a/src/Core/Ai/Generic/Actions/ChangeTalentsAction.cpp b/src/Bot/BaseAi/Actions/ChangeTalentsAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ChangeTalentsAction.cpp
rename to src/Bot/BaseAi/Actions/ChangeTalentsAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/ChangeTalentsAction.h b/src/Bot/BaseAi/Actions/ChangeTalentsAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ChangeTalentsAction.h
rename to src/Bot/BaseAi/Actions/ChangeTalentsAction.h
diff --git a/src/Core/Ai/Generic/Actions/ChatShortcutActions.cpp b/src/Bot/BaseAi/Actions/ChatShortcutActions.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ChatShortcutActions.cpp
rename to src/Bot/BaseAi/Actions/ChatShortcutActions.cpp
diff --git a/src/Core/Ai/Generic/Actions/ChatShortcutActions.h b/src/Bot/BaseAi/Actions/ChatShortcutActions.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ChatShortcutActions.h
rename to src/Bot/BaseAi/Actions/ChatShortcutActions.h
diff --git a/src/Core/Ai/Generic/Actions/CheatAction.cpp b/src/Bot/BaseAi/Actions/CheatAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/CheatAction.cpp
rename to src/Bot/BaseAi/Actions/CheatAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/CheatAction.h b/src/Bot/BaseAi/Actions/CheatAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/CheatAction.h
rename to src/Bot/BaseAi/Actions/CheatAction.h
diff --git a/src/Core/Ai/Generic/Actions/CheckMailAction.cpp b/src/Bot/BaseAi/Actions/CheckMailAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/CheckMailAction.cpp
rename to src/Bot/BaseAi/Actions/CheckMailAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/CheckMailAction.h b/src/Bot/BaseAi/Actions/CheckMailAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/CheckMailAction.h
rename to src/Bot/BaseAi/Actions/CheckMailAction.h
diff --git a/src/Core/Ai/Generic/Actions/CheckMountStateAction.cpp b/src/Bot/BaseAi/Actions/CheckMountStateAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/CheckMountStateAction.cpp
rename to src/Bot/BaseAi/Actions/CheckMountStateAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/CheckMountStateAction.h b/src/Bot/BaseAi/Actions/CheckMountStateAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/CheckMountStateAction.h
rename to src/Bot/BaseAi/Actions/CheckMountStateAction.h
diff --git a/src/Core/Ai/Generic/Actions/CheckValuesAction.cpp b/src/Bot/BaseAi/Actions/CheckValuesAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/CheckValuesAction.cpp
rename to src/Bot/BaseAi/Actions/CheckValuesAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/CheckValuesAction.h b/src/Bot/BaseAi/Actions/CheckValuesAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/CheckValuesAction.h
rename to src/Bot/BaseAi/Actions/CheckValuesAction.h
diff --git a/src/Core/Ai/Generic/Actions/ChooseRpgTargetAction.cpp b/src/Bot/BaseAi/Actions/ChooseRpgTargetAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ChooseRpgTargetAction.cpp
rename to src/Bot/BaseAi/Actions/ChooseRpgTargetAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/ChooseRpgTargetAction.h b/src/Bot/BaseAi/Actions/ChooseRpgTargetAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ChooseRpgTargetAction.h
rename to src/Bot/BaseAi/Actions/ChooseRpgTargetAction.h
diff --git a/src/Core/Ai/Generic/Actions/ChooseTargetActions.cpp b/src/Bot/BaseAi/Actions/ChooseTargetActions.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ChooseTargetActions.cpp
rename to src/Bot/BaseAi/Actions/ChooseTargetActions.cpp
diff --git a/src/Core/Ai/Generic/Actions/ChooseTargetActions.h b/src/Bot/BaseAi/Actions/ChooseTargetActions.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ChooseTargetActions.h
rename to src/Bot/BaseAi/Actions/ChooseTargetActions.h
diff --git a/src/Core/Ai/Generic/Actions/ChooseTravelTargetAction.cpp b/src/Bot/BaseAi/Actions/ChooseTravelTargetAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ChooseTravelTargetAction.cpp
rename to src/Bot/BaseAi/Actions/ChooseTravelTargetAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/ChooseTravelTargetAction.h b/src/Bot/BaseAi/Actions/ChooseTravelTargetAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ChooseTravelTargetAction.h
rename to src/Bot/BaseAi/Actions/ChooseTravelTargetAction.h
diff --git a/src/Core/Ai/Generic/Actions/CombatActions.cpp b/src/Bot/BaseAi/Actions/CombatActions.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/CombatActions.cpp
rename to src/Bot/BaseAi/Actions/CombatActions.cpp
diff --git a/src/Core/Ai/Generic/Actions/CombatActions.h b/src/Bot/BaseAi/Actions/CombatActions.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/CombatActions.h
rename to src/Bot/BaseAi/Actions/CombatActions.h
diff --git a/src/Core/Ai/Generic/Actions/CustomStrategyEditAction.cpp b/src/Bot/BaseAi/Actions/CustomStrategyEditAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/CustomStrategyEditAction.cpp
rename to src/Bot/BaseAi/Actions/CustomStrategyEditAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/CustomStrategyEditAction.h b/src/Bot/BaseAi/Actions/CustomStrategyEditAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/CustomStrategyEditAction.h
rename to src/Bot/BaseAi/Actions/CustomStrategyEditAction.h
diff --git a/src/Core/Ai/Generic/Actions/DebugAction.cpp b/src/Bot/BaseAi/Actions/DebugAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/DebugAction.cpp
rename to src/Bot/BaseAi/Actions/DebugAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/DebugAction.h b/src/Bot/BaseAi/Actions/DebugAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/DebugAction.h
rename to src/Bot/BaseAi/Actions/DebugAction.h
diff --git a/src/Core/Ai/Generic/Actions/DelayAction.cpp b/src/Bot/BaseAi/Actions/DelayAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/DelayAction.cpp
rename to src/Bot/BaseAi/Actions/DelayAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/DelayAction.h b/src/Bot/BaseAi/Actions/DelayAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/DelayAction.h
rename to src/Bot/BaseAi/Actions/DelayAction.h
diff --git a/src/Core/Ai/Generic/Actions/DestroyItemAction.cpp b/src/Bot/BaseAi/Actions/DestroyItemAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/DestroyItemAction.cpp
rename to src/Bot/BaseAi/Actions/DestroyItemAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/DestroyItemAction.h b/src/Bot/BaseAi/Actions/DestroyItemAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/DestroyItemAction.h
rename to src/Bot/BaseAi/Actions/DestroyItemAction.h
diff --git a/src/Core/Ai/Generic/Actions/DropQuestAction.cpp b/src/Bot/BaseAi/Actions/DropQuestAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/DropQuestAction.cpp
rename to src/Bot/BaseAi/Actions/DropQuestAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/DropQuestAction.h b/src/Bot/BaseAi/Actions/DropQuestAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/DropQuestAction.h
rename to src/Bot/BaseAi/Actions/DropQuestAction.h
diff --git a/src/Core/Ai/Generic/Actions/EmoteAction.cpp b/src/Bot/BaseAi/Actions/EmoteAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/EmoteAction.cpp
rename to src/Bot/BaseAi/Actions/EmoteAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/EmoteAction.h b/src/Bot/BaseAi/Actions/EmoteAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/EmoteAction.h
rename to src/Bot/BaseAi/Actions/EmoteAction.h
diff --git a/src/Core/Ai/Generic/Actions/EquipAction.cpp b/src/Bot/BaseAi/Actions/EquipAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/EquipAction.cpp
rename to src/Bot/BaseAi/Actions/EquipAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/EquipAction.h b/src/Bot/BaseAi/Actions/EquipAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/EquipAction.h
rename to src/Bot/BaseAi/Actions/EquipAction.h
diff --git a/src/Core/Ai/Generic/Actions/EquipGlyphsAction.cpp b/src/Bot/BaseAi/Actions/EquipGlyphsAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/EquipGlyphsAction.cpp
rename to src/Bot/BaseAi/Actions/EquipGlyphsAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/EquipGlyphsAction.h b/src/Bot/BaseAi/Actions/EquipGlyphsAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/EquipGlyphsAction.h
rename to src/Bot/BaseAi/Actions/EquipGlyphsAction.h
diff --git a/src/Core/Ai/Generic/Actions/FishingAction.cpp b/src/Bot/BaseAi/Actions/FishingAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/FishingAction.cpp
rename to src/Bot/BaseAi/Actions/FishingAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/FishingAction.h b/src/Bot/BaseAi/Actions/FishingAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/FishingAction.h
rename to src/Bot/BaseAi/Actions/FishingAction.h
diff --git a/src/Core/Ai/Generic/Actions/FlagAction.cpp b/src/Bot/BaseAi/Actions/FlagAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/FlagAction.cpp
rename to src/Bot/BaseAi/Actions/FlagAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/FlagAction.h b/src/Bot/BaseAi/Actions/FlagAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/FlagAction.h
rename to src/Bot/BaseAi/Actions/FlagAction.h
diff --git a/src/Core/Ai/Generic/Actions/FollowActions.cpp b/src/Bot/BaseAi/Actions/FollowActions.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/FollowActions.cpp
rename to src/Bot/BaseAi/Actions/FollowActions.cpp
diff --git a/src/Core/Ai/Generic/Actions/FollowActions.h b/src/Bot/BaseAi/Actions/FollowActions.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/FollowActions.h
rename to src/Bot/BaseAi/Actions/FollowActions.h
diff --git a/src/Core/Ai/Generic/Actions/GenericActions.cpp b/src/Bot/BaseAi/Actions/GenericActions.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GenericActions.cpp
rename to src/Bot/BaseAi/Actions/GenericActions.cpp
diff --git a/src/Core/Ai/Generic/Actions/GenericActions.h b/src/Bot/BaseAi/Actions/GenericActions.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GenericActions.h
rename to src/Bot/BaseAi/Actions/GenericActions.h
diff --git a/src/Core/Ai/Generic/Actions/GenericBuffUtils.cpp b/src/Bot/BaseAi/Actions/GenericBuffUtils.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GenericBuffUtils.cpp
rename to src/Bot/BaseAi/Actions/GenericBuffUtils.cpp
diff --git a/src/Core/Ai/Generic/Actions/GenericBuffUtils.h b/src/Bot/BaseAi/Actions/GenericBuffUtils.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GenericBuffUtils.h
rename to src/Bot/BaseAi/Actions/GenericBuffUtils.h
diff --git a/src/Core/Ai/Generic/Actions/GenericSpellActions.cpp b/src/Bot/BaseAi/Actions/GenericSpellActions.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GenericSpellActions.cpp
rename to src/Bot/BaseAi/Actions/GenericSpellActions.cpp
diff --git a/src/Core/Ai/Generic/Actions/GenericSpellActions.h b/src/Bot/BaseAi/Actions/GenericSpellActions.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GenericSpellActions.h
rename to src/Bot/BaseAi/Actions/GenericSpellActions.h
diff --git a/src/Core/Ai/Generic/Actions/GiveItemAction.cpp b/src/Bot/BaseAi/Actions/GiveItemAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GiveItemAction.cpp
rename to src/Bot/BaseAi/Actions/GiveItemAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/GiveItemAction.h b/src/Bot/BaseAi/Actions/GiveItemAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GiveItemAction.h
rename to src/Bot/BaseAi/Actions/GiveItemAction.h
diff --git a/src/Core/Ai/Generic/Actions/GoAction.cpp b/src/Bot/BaseAi/Actions/GoAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GoAction.cpp
rename to src/Bot/BaseAi/Actions/GoAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/GoAction.h b/src/Bot/BaseAi/Actions/GoAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GoAction.h
rename to src/Bot/BaseAi/Actions/GoAction.h
diff --git a/src/Core/Ai/Generic/Actions/GossipHelloAction.cpp b/src/Bot/BaseAi/Actions/GossipHelloAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GossipHelloAction.cpp
rename to src/Bot/BaseAi/Actions/GossipHelloAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/GossipHelloAction.h b/src/Bot/BaseAi/Actions/GossipHelloAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GossipHelloAction.h
rename to src/Bot/BaseAi/Actions/GossipHelloAction.h
diff --git a/src/Core/Ai/Generic/Actions/GreetAction.cpp b/src/Bot/BaseAi/Actions/GreetAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GreetAction.cpp
rename to src/Bot/BaseAi/Actions/GreetAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/GreetAction.h b/src/Bot/BaseAi/Actions/GreetAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GreetAction.h
rename to src/Bot/BaseAi/Actions/GreetAction.h
diff --git a/src/Core/Ai/Generic/Actions/GuildAcceptAction.cpp b/src/Bot/BaseAi/Actions/GuildAcceptAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GuildAcceptAction.cpp
rename to src/Bot/BaseAi/Actions/GuildAcceptAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/GuildAcceptAction.h b/src/Bot/BaseAi/Actions/GuildAcceptAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GuildAcceptAction.h
rename to src/Bot/BaseAi/Actions/GuildAcceptAction.h
diff --git a/src/Core/Ai/Generic/Actions/GuildBankAction.cpp b/src/Bot/BaseAi/Actions/GuildBankAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GuildBankAction.cpp
rename to src/Bot/BaseAi/Actions/GuildBankAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/GuildBankAction.h b/src/Bot/BaseAi/Actions/GuildBankAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GuildBankAction.h
rename to src/Bot/BaseAi/Actions/GuildBankAction.h
diff --git a/src/Core/Ai/Generic/Actions/GuildCreateActions.cpp b/src/Bot/BaseAi/Actions/GuildCreateActions.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GuildCreateActions.cpp
rename to src/Bot/BaseAi/Actions/GuildCreateActions.cpp
diff --git a/src/Core/Ai/Generic/Actions/GuildCreateActions.h b/src/Bot/BaseAi/Actions/GuildCreateActions.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GuildCreateActions.h
rename to src/Bot/BaseAi/Actions/GuildCreateActions.h
diff --git a/src/Core/Ai/Generic/Actions/GuildManagementActions.cpp b/src/Bot/BaseAi/Actions/GuildManagementActions.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GuildManagementActions.cpp
rename to src/Bot/BaseAi/Actions/GuildManagementActions.cpp
diff --git a/src/Core/Ai/Generic/Actions/GuildManagementActions.h b/src/Bot/BaseAi/Actions/GuildManagementActions.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/GuildManagementActions.h
rename to src/Bot/BaseAi/Actions/GuildManagementActions.h
diff --git a/src/Core/Ai/Generic/Actions/HelpAction.cpp b/src/Bot/BaseAi/Actions/HelpAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/HelpAction.cpp
rename to src/Bot/BaseAi/Actions/HelpAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/HelpAction.h b/src/Bot/BaseAi/Actions/HelpAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/HelpAction.h
rename to src/Bot/BaseAi/Actions/HelpAction.h
diff --git a/src/Core/Ai/Generic/Actions/HireAction.cpp b/src/Bot/BaseAi/Actions/HireAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/HireAction.cpp
rename to src/Bot/BaseAi/Actions/HireAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/HireAction.h b/src/Bot/BaseAi/Actions/HireAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/HireAction.h
rename to src/Bot/BaseAi/Actions/HireAction.h
diff --git a/src/Core/Ai/Generic/Actions/ImbueAction.cpp b/src/Bot/BaseAi/Actions/ImbueAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ImbueAction.cpp
rename to src/Bot/BaseAi/Actions/ImbueAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/ImbueAction.h b/src/Bot/BaseAi/Actions/ImbueAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ImbueAction.h
rename to src/Bot/BaseAi/Actions/ImbueAction.h
diff --git a/src/Core/Ai/Generic/Actions/InventoryAction.cpp b/src/Bot/BaseAi/Actions/InventoryAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/InventoryAction.cpp
rename to src/Bot/BaseAi/Actions/InventoryAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/InventoryAction.h b/src/Bot/BaseAi/Actions/InventoryAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/InventoryAction.h
rename to src/Bot/BaseAi/Actions/InventoryAction.h
diff --git a/src/Core/Ai/Generic/Actions/InventoryChangeFailureAction.cpp b/src/Bot/BaseAi/Actions/InventoryChangeFailureAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/InventoryChangeFailureAction.cpp
rename to src/Bot/BaseAi/Actions/InventoryChangeFailureAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/InventoryChangeFailureAction.h b/src/Bot/BaseAi/Actions/InventoryChangeFailureAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/InventoryChangeFailureAction.h
rename to src/Bot/BaseAi/Actions/InventoryChangeFailureAction.h
diff --git a/src/Core/Ai/Generic/Actions/InviteToGroupAction.cpp b/src/Bot/BaseAi/Actions/InviteToGroupAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/InviteToGroupAction.cpp
rename to src/Bot/BaseAi/Actions/InviteToGroupAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/InviteToGroupAction.h b/src/Bot/BaseAi/Actions/InviteToGroupAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/InviteToGroupAction.h
rename to src/Bot/BaseAi/Actions/InviteToGroupAction.h
diff --git a/src/Core/Ai/Generic/Actions/LeaveGroupAction.cpp b/src/Bot/BaseAi/Actions/LeaveGroupAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/LeaveGroupAction.cpp
rename to src/Bot/BaseAi/Actions/LeaveGroupAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/LeaveGroupAction.h b/src/Bot/BaseAi/Actions/LeaveGroupAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/LeaveGroupAction.h
rename to src/Bot/BaseAi/Actions/LeaveGroupAction.h
diff --git a/src/Core/Ai/Generic/Actions/LfgActions.cpp b/src/Bot/BaseAi/Actions/LfgActions.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/LfgActions.cpp
rename to src/Bot/BaseAi/Actions/LfgActions.cpp
diff --git a/src/Core/Ai/Generic/Actions/LfgActions.h b/src/Bot/BaseAi/Actions/LfgActions.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/LfgActions.h
rename to src/Bot/BaseAi/Actions/LfgActions.h
diff --git a/src/Core/Ai/Generic/Actions/ListQuestsActions.cpp b/src/Bot/BaseAi/Actions/ListQuestsActions.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ListQuestsActions.cpp
rename to src/Bot/BaseAi/Actions/ListQuestsActions.cpp
diff --git a/src/Core/Ai/Generic/Actions/ListQuestsActions.h b/src/Bot/BaseAi/Actions/ListQuestsActions.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ListQuestsActions.h
rename to src/Bot/BaseAi/Actions/ListQuestsActions.h
diff --git a/src/Core/Ai/Generic/Actions/ListSpellsAction.cpp b/src/Bot/BaseAi/Actions/ListSpellsAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ListSpellsAction.cpp
rename to src/Bot/BaseAi/Actions/ListSpellsAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/ListSpellsAction.h b/src/Bot/BaseAi/Actions/ListSpellsAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ListSpellsAction.h
rename to src/Bot/BaseAi/Actions/ListSpellsAction.h
diff --git a/src/Core/Ai/Generic/Actions/LogLevelAction.cpp b/src/Bot/BaseAi/Actions/LogLevelAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/LogLevelAction.cpp
rename to src/Bot/BaseAi/Actions/LogLevelAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/LogLevelAction.h b/src/Bot/BaseAi/Actions/LogLevelAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/LogLevelAction.h
rename to src/Bot/BaseAi/Actions/LogLevelAction.h
diff --git a/src/Core/Ai/Generic/Actions/LootAction.cpp b/src/Bot/BaseAi/Actions/LootAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/LootAction.cpp
rename to src/Bot/BaseAi/Actions/LootAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/LootAction.h b/src/Bot/BaseAi/Actions/LootAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/LootAction.h
rename to src/Bot/BaseAi/Actions/LootAction.h
diff --git a/src/Core/Ai/Generic/Actions/LootRollAction.cpp b/src/Bot/BaseAi/Actions/LootRollAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/LootRollAction.cpp
rename to src/Bot/BaseAi/Actions/LootRollAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/LootRollAction.h b/src/Bot/BaseAi/Actions/LootRollAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/LootRollAction.h
rename to src/Bot/BaseAi/Actions/LootRollAction.h
diff --git a/src/Core/Ai/Generic/Actions/LootStrategyAction.cpp b/src/Bot/BaseAi/Actions/LootStrategyAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/LootStrategyAction.cpp
rename to src/Bot/BaseAi/Actions/LootStrategyAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/LootStrategyAction.h b/src/Bot/BaseAi/Actions/LootStrategyAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/LootStrategyAction.h
rename to src/Bot/BaseAi/Actions/LootStrategyAction.h
diff --git a/src/Core/Ai/Generic/Actions/MailAction.cpp b/src/Bot/BaseAi/Actions/MailAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/MailAction.cpp
rename to src/Bot/BaseAi/Actions/MailAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/MailAction.h b/src/Bot/BaseAi/Actions/MailAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/MailAction.h
rename to src/Bot/BaseAi/Actions/MailAction.h
diff --git a/src/Core/Ai/Generic/Actions/MoveToRpgTargetAction.cpp b/src/Bot/BaseAi/Actions/MoveToRpgTargetAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/MoveToRpgTargetAction.cpp
rename to src/Bot/BaseAi/Actions/MoveToRpgTargetAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/MoveToRpgTargetAction.h b/src/Bot/BaseAi/Actions/MoveToRpgTargetAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/MoveToRpgTargetAction.h
rename to src/Bot/BaseAi/Actions/MoveToRpgTargetAction.h
diff --git a/src/Core/Ai/Generic/Actions/MoveToTravelTargetAction.cpp b/src/Bot/BaseAi/Actions/MoveToTravelTargetAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/MoveToTravelTargetAction.cpp
rename to src/Bot/BaseAi/Actions/MoveToTravelTargetAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/MoveToTravelTargetAction.h b/src/Bot/BaseAi/Actions/MoveToTravelTargetAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/MoveToTravelTargetAction.h
rename to src/Bot/BaseAi/Actions/MoveToTravelTargetAction.h
diff --git a/src/Core/Ai/Generic/Actions/MovementActions.cpp b/src/Bot/BaseAi/Actions/MovementActions.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/MovementActions.cpp
rename to src/Bot/BaseAi/Actions/MovementActions.cpp
diff --git a/src/Core/Ai/Generic/Actions/MovementActions.h b/src/Bot/BaseAi/Actions/MovementActions.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/MovementActions.h
rename to src/Bot/BaseAi/Actions/MovementActions.h
diff --git a/src/Core/Ai/Generic/Actions/NonCombatActions.cpp b/src/Bot/BaseAi/Actions/NonCombatActions.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/NonCombatActions.cpp
rename to src/Bot/BaseAi/Actions/NonCombatActions.cpp
diff --git a/src/Core/Ai/Generic/Actions/NonCombatActions.h b/src/Bot/BaseAi/Actions/NonCombatActions.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/NonCombatActions.h
rename to src/Bot/BaseAi/Actions/NonCombatActions.h
diff --git a/src/Core/Ai/Generic/Actions/OpenItemAction.cpp b/src/Bot/BaseAi/Actions/OpenItemAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/OpenItemAction.cpp
rename to src/Bot/BaseAi/Actions/OpenItemAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/OpenItemAction.h b/src/Bot/BaseAi/Actions/OpenItemAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/OpenItemAction.h
rename to src/Bot/BaseAi/Actions/OpenItemAction.h
diff --git a/src/Core/Ai/Generic/Actions/OutfitAction.cpp b/src/Bot/BaseAi/Actions/OutfitAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/OutfitAction.cpp
rename to src/Bot/BaseAi/Actions/OutfitAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/OutfitAction.h b/src/Bot/BaseAi/Actions/OutfitAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/OutfitAction.h
rename to src/Bot/BaseAi/Actions/OutfitAction.h
diff --git a/src/Core/Ai/Generic/Actions/PassLeadershipToMasterAction.cpp b/src/Bot/BaseAi/Actions/PassLeadershipToMasterAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/PassLeadershipToMasterAction.cpp
rename to src/Bot/BaseAi/Actions/PassLeadershipToMasterAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/PassLeadershipToMasterAction.h b/src/Bot/BaseAi/Actions/PassLeadershipToMasterAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/PassLeadershipToMasterAction.h
rename to src/Bot/BaseAi/Actions/PassLeadershipToMasterAction.h
diff --git a/src/Core/Ai/Generic/Actions/PetitionSignAction.cpp b/src/Bot/BaseAi/Actions/PetitionSignAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/PetitionSignAction.cpp
rename to src/Bot/BaseAi/Actions/PetitionSignAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/PetitionSignAction.h b/src/Bot/BaseAi/Actions/PetitionSignAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/PetitionSignAction.h
rename to src/Bot/BaseAi/Actions/PetitionSignAction.h
diff --git a/src/Core/Ai/Generic/Actions/PetsAction.cpp b/src/Bot/BaseAi/Actions/PetsAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/PetsAction.cpp
rename to src/Bot/BaseAi/Actions/PetsAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/PetsAction.h b/src/Bot/BaseAi/Actions/PetsAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/PetsAction.h
rename to src/Bot/BaseAi/Actions/PetsAction.h
diff --git a/src/Core/Ai/Generic/Actions/PositionAction.cpp b/src/Bot/BaseAi/Actions/PositionAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/PositionAction.cpp
rename to src/Bot/BaseAi/Actions/PositionAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/PositionAction.h b/src/Bot/BaseAi/Actions/PositionAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/PositionAction.h
rename to src/Bot/BaseAi/Actions/PositionAction.h
diff --git a/src/Core/Ai/Generic/Actions/QueryItemUsageAction.cpp b/src/Bot/BaseAi/Actions/QueryItemUsageAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/QueryItemUsageAction.cpp
rename to src/Bot/BaseAi/Actions/QueryItemUsageAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/QueryItemUsageAction.h b/src/Bot/BaseAi/Actions/QueryItemUsageAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/QueryItemUsageAction.h
rename to src/Bot/BaseAi/Actions/QueryItemUsageAction.h
diff --git a/src/Core/Ai/Generic/Actions/QueryQuestAction.cpp b/src/Bot/BaseAi/Actions/QueryQuestAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/QueryQuestAction.cpp
rename to src/Bot/BaseAi/Actions/QueryQuestAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/QueryQuestAction.h b/src/Bot/BaseAi/Actions/QueryQuestAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/QueryQuestAction.h
rename to src/Bot/BaseAi/Actions/QueryQuestAction.h
diff --git a/src/Core/Ai/Generic/Actions/QuestAction.cpp b/src/Bot/BaseAi/Actions/QuestAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/QuestAction.cpp
rename to src/Bot/BaseAi/Actions/QuestAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/QuestAction.h b/src/Bot/BaseAi/Actions/QuestAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/QuestAction.h
rename to src/Bot/BaseAi/Actions/QuestAction.h
diff --git a/src/Core/Ai/Generic/Actions/QuestConfirmAcceptAction.cpp b/src/Bot/BaseAi/Actions/QuestConfirmAcceptAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/QuestConfirmAcceptAction.cpp
rename to src/Bot/BaseAi/Actions/QuestConfirmAcceptAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/QuestConfirmAcceptAction.h b/src/Bot/BaseAi/Actions/QuestConfirmAcceptAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/QuestConfirmAcceptAction.h
rename to src/Bot/BaseAi/Actions/QuestConfirmAcceptAction.h
diff --git a/src/Core/Ai/Generic/Actions/RandomBotUpdateAction.cpp b/src/Bot/BaseAi/Actions/RandomBotUpdateAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RandomBotUpdateAction.cpp
rename to src/Bot/BaseAi/Actions/RandomBotUpdateAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/RandomBotUpdateAction.h b/src/Bot/BaseAi/Actions/RandomBotUpdateAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RandomBotUpdateAction.h
rename to src/Bot/BaseAi/Actions/RandomBotUpdateAction.h
diff --git a/src/Core/Ai/Generic/Actions/RangeAction.cpp b/src/Bot/BaseAi/Actions/RangeAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RangeAction.cpp
rename to src/Bot/BaseAi/Actions/RangeAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/RangeAction.h b/src/Bot/BaseAi/Actions/RangeAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RangeAction.h
rename to src/Bot/BaseAi/Actions/RangeAction.h
diff --git a/src/Core/Ai/Generic/Actions/ReachTargetActions.cpp b/src/Bot/BaseAi/Actions/ReachTargetActions.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ReachTargetActions.cpp
rename to src/Bot/BaseAi/Actions/ReachTargetActions.cpp
diff --git a/src/Core/Ai/Generic/Actions/ReachTargetActions.h b/src/Bot/BaseAi/Actions/ReachTargetActions.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ReachTargetActions.h
rename to src/Bot/BaseAi/Actions/ReachTargetActions.h
diff --git a/src/Core/Ai/Generic/Actions/ReadyCheckAction.cpp b/src/Bot/BaseAi/Actions/ReadyCheckAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ReadyCheckAction.cpp
rename to src/Bot/BaseAi/Actions/ReadyCheckAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/ReadyCheckAction.h b/src/Bot/BaseAi/Actions/ReadyCheckAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ReadyCheckAction.h
rename to src/Bot/BaseAi/Actions/ReadyCheckAction.h
diff --git a/src/Core/Ai/Generic/Actions/ReleaseSpiritAction.cpp b/src/Bot/BaseAi/Actions/ReleaseSpiritAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ReleaseSpiritAction.cpp
rename to src/Bot/BaseAi/Actions/ReleaseSpiritAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/ReleaseSpiritAction.h b/src/Bot/BaseAi/Actions/ReleaseSpiritAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ReleaseSpiritAction.h
rename to src/Bot/BaseAi/Actions/ReleaseSpiritAction.h
diff --git a/src/Core/Ai/Generic/Actions/RememberTaxiAction.cpp b/src/Bot/BaseAi/Actions/RememberTaxiAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RememberTaxiAction.cpp
rename to src/Bot/BaseAi/Actions/RememberTaxiAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/RememberTaxiAction.h b/src/Bot/BaseAi/Actions/RememberTaxiAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RememberTaxiAction.h
rename to src/Bot/BaseAi/Actions/RememberTaxiAction.h
diff --git a/src/Core/Ai/Generic/Actions/RemoveAuraAction.cpp b/src/Bot/BaseAi/Actions/RemoveAuraAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RemoveAuraAction.cpp
rename to src/Bot/BaseAi/Actions/RemoveAuraAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/RemoveAuraAction.h b/src/Bot/BaseAi/Actions/RemoveAuraAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RemoveAuraAction.h
rename to src/Bot/BaseAi/Actions/RemoveAuraAction.h
diff --git a/src/Core/Ai/Generic/Actions/RepairAllAction.cpp b/src/Bot/BaseAi/Actions/RepairAllAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RepairAllAction.cpp
rename to src/Bot/BaseAi/Actions/RepairAllAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/RepairAllAction.h b/src/Bot/BaseAi/Actions/RepairAllAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RepairAllAction.h
rename to src/Bot/BaseAi/Actions/RepairAllAction.h
diff --git a/src/Core/Ai/Generic/Actions/ResetAiAction.cpp b/src/Bot/BaseAi/Actions/ResetAiAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ResetAiAction.cpp
rename to src/Bot/BaseAi/Actions/ResetAiAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/ResetAiAction.h b/src/Bot/BaseAi/Actions/ResetAiAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ResetAiAction.h
rename to src/Bot/BaseAi/Actions/ResetAiAction.h
diff --git a/src/Core/Ai/Generic/Actions/ResetInstancesAction.cpp b/src/Bot/BaseAi/Actions/ResetInstancesAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ResetInstancesAction.cpp
rename to src/Bot/BaseAi/Actions/ResetInstancesAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/ResetInstancesAction.h b/src/Bot/BaseAi/Actions/ResetInstancesAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ResetInstancesAction.h
rename to src/Bot/BaseAi/Actions/ResetInstancesAction.h
diff --git a/src/Core/Ai/Generic/Actions/RevealGatheringItemAction.cpp b/src/Bot/BaseAi/Actions/RevealGatheringItemAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RevealGatheringItemAction.cpp
rename to src/Bot/BaseAi/Actions/RevealGatheringItemAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/RevealGatheringItemAction.h b/src/Bot/BaseAi/Actions/RevealGatheringItemAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RevealGatheringItemAction.h
rename to src/Bot/BaseAi/Actions/RevealGatheringItemAction.h
diff --git a/src/Core/Ai/Generic/Actions/ReviveFromCorpseAction.cpp b/src/Bot/BaseAi/Actions/ReviveFromCorpseAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ReviveFromCorpseAction.cpp
rename to src/Bot/BaseAi/Actions/ReviveFromCorpseAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/ReviveFromCorpseAction.h b/src/Bot/BaseAi/Actions/ReviveFromCorpseAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ReviveFromCorpseAction.h
rename to src/Bot/BaseAi/Actions/ReviveFromCorpseAction.h
diff --git a/src/Core/Ai/Generic/Actions/RewardAction.cpp b/src/Bot/BaseAi/Actions/RewardAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RewardAction.cpp
rename to src/Bot/BaseAi/Actions/RewardAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/RewardAction.h b/src/Bot/BaseAi/Actions/RewardAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RewardAction.h
rename to src/Bot/BaseAi/Actions/RewardAction.h
diff --git a/src/Core/Ai/Generic/Actions/RpgAction.cpp b/src/Bot/BaseAi/Actions/RpgAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RpgAction.cpp
rename to src/Bot/BaseAi/Actions/RpgAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/RpgAction.h b/src/Bot/BaseAi/Actions/RpgAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RpgAction.h
rename to src/Bot/BaseAi/Actions/RpgAction.h
diff --git a/src/Core/Ai/Generic/Actions/RpgSubActions.cpp b/src/Bot/BaseAi/Actions/RpgSubActions.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RpgSubActions.cpp
rename to src/Bot/BaseAi/Actions/RpgSubActions.cpp
diff --git a/src/Core/Ai/Generic/Actions/RpgSubActions.h b/src/Bot/BaseAi/Actions/RpgSubActions.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RpgSubActions.h
rename to src/Bot/BaseAi/Actions/RpgSubActions.h
diff --git a/src/Core/Ai/Generic/Actions/RpgValues.h b/src/Bot/BaseAi/Actions/RpgValues.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RpgValues.h
rename to src/Bot/BaseAi/Actions/RpgValues.h
diff --git a/src/Core/Ai/Generic/Actions/RtiAction.cpp b/src/Bot/BaseAi/Actions/RtiAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RtiAction.cpp
rename to src/Bot/BaseAi/Actions/RtiAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/RtiAction.h b/src/Bot/BaseAi/Actions/RtiAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RtiAction.h
rename to src/Bot/BaseAi/Actions/RtiAction.h
diff --git a/src/Core/Ai/Generic/Actions/RtscAction.cpp b/src/Bot/BaseAi/Actions/RtscAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RtscAction.cpp
rename to src/Bot/BaseAi/Actions/RtscAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/RtscAction.h b/src/Bot/BaseAi/Actions/RtscAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/RtscAction.h
rename to src/Bot/BaseAi/Actions/RtscAction.h
diff --git a/src/Core/Ai/Generic/Actions/SaveManaAction.cpp b/src/Bot/BaseAi/Actions/SaveManaAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/SaveManaAction.cpp
rename to src/Bot/BaseAi/Actions/SaveManaAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/SaveManaAction.h b/src/Bot/BaseAi/Actions/SaveManaAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/SaveManaAction.h
rename to src/Bot/BaseAi/Actions/SaveManaAction.h
diff --git a/src/Core/Ai/Generic/Actions/SayAction.cpp b/src/Bot/BaseAi/Actions/SayAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/SayAction.cpp
rename to src/Bot/BaseAi/Actions/SayAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/SayAction.h b/src/Bot/BaseAi/Actions/SayAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/SayAction.h
rename to src/Bot/BaseAi/Actions/SayAction.h
diff --git a/src/Core/Ai/Generic/Actions/SecurityCheckAction.cpp b/src/Bot/BaseAi/Actions/SecurityCheckAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/SecurityCheckAction.cpp
rename to src/Bot/BaseAi/Actions/SecurityCheckAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/SecurityCheckAction.h b/src/Bot/BaseAi/Actions/SecurityCheckAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/SecurityCheckAction.h
rename to src/Bot/BaseAi/Actions/SecurityCheckAction.h
diff --git a/src/Core/Ai/Generic/Actions/SeeSpellAction.cpp b/src/Bot/BaseAi/Actions/SeeSpellAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/SeeSpellAction.cpp
rename to src/Bot/BaseAi/Actions/SeeSpellAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/SeeSpellAction.h b/src/Bot/BaseAi/Actions/SeeSpellAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/SeeSpellAction.h
rename to src/Bot/BaseAi/Actions/SeeSpellAction.h
diff --git a/src/Core/Ai/Generic/Actions/SellAction.cpp b/src/Bot/BaseAi/Actions/SellAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/SellAction.cpp
rename to src/Bot/BaseAi/Actions/SellAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/SellAction.h b/src/Bot/BaseAi/Actions/SellAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/SellAction.h
rename to src/Bot/BaseAi/Actions/SellAction.h
diff --git a/src/Core/Ai/Generic/Actions/SendMailAction.cpp b/src/Bot/BaseAi/Actions/SendMailAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/SendMailAction.cpp
rename to src/Bot/BaseAi/Actions/SendMailAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/SendMailAction.h b/src/Bot/BaseAi/Actions/SendMailAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/SendMailAction.h
rename to src/Bot/BaseAi/Actions/SendMailAction.h
diff --git a/src/Core/Ai/Generic/Actions/SetCraftAction.cpp b/src/Bot/BaseAi/Actions/SetCraftAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/SetCraftAction.cpp
rename to src/Bot/BaseAi/Actions/SetCraftAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/SetCraftAction.h b/src/Bot/BaseAi/Actions/SetCraftAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/SetCraftAction.h
rename to src/Bot/BaseAi/Actions/SetCraftAction.h
diff --git a/src/Core/Ai/Generic/Actions/SetHomeAction.cpp b/src/Bot/BaseAi/Actions/SetHomeAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/SetHomeAction.cpp
rename to src/Bot/BaseAi/Actions/SetHomeAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/SetHomeAction.h b/src/Bot/BaseAi/Actions/SetHomeAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/SetHomeAction.h
rename to src/Bot/BaseAi/Actions/SetHomeAction.h
diff --git a/src/Core/Ai/Generic/Actions/ShareQuestAction.cpp b/src/Bot/BaseAi/Actions/ShareQuestAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ShareQuestAction.cpp
rename to src/Bot/BaseAi/Actions/ShareQuestAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/ShareQuestAction.h b/src/Bot/BaseAi/Actions/ShareQuestAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/ShareQuestAction.h
rename to src/Bot/BaseAi/Actions/ShareQuestAction.h
diff --git a/src/Core/Ai/Generic/Actions/SkipSpellsListAction.cpp b/src/Bot/BaseAi/Actions/SkipSpellsListAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/SkipSpellsListAction.cpp
rename to src/Bot/BaseAi/Actions/SkipSpellsListAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/SkipSpellsListAction.h b/src/Bot/BaseAi/Actions/SkipSpellsListAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/SkipSpellsListAction.h
rename to src/Bot/BaseAi/Actions/SkipSpellsListAction.h
diff --git a/src/Core/Ai/Generic/Actions/StatsAction.cpp b/src/Bot/BaseAi/Actions/StatsAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/StatsAction.cpp
rename to src/Bot/BaseAi/Actions/StatsAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/StatsAction.h b/src/Bot/BaseAi/Actions/StatsAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/StatsAction.h
rename to src/Bot/BaseAi/Actions/StatsAction.h
diff --git a/src/Core/Ai/Generic/Actions/StayActions.cpp b/src/Bot/BaseAi/Actions/StayActions.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/StayActions.cpp
rename to src/Bot/BaseAi/Actions/StayActions.cpp
diff --git a/src/Core/Ai/Generic/Actions/StayActions.h b/src/Bot/BaseAi/Actions/StayActions.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/StayActions.h
rename to src/Bot/BaseAi/Actions/StayActions.h
diff --git a/src/Core/Ai/Generic/Actions/SuggestWhatToDoAction.cpp b/src/Bot/BaseAi/Actions/SuggestWhatToDoAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/SuggestWhatToDoAction.cpp
rename to src/Bot/BaseAi/Actions/SuggestWhatToDoAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/SuggestWhatToDoAction.h b/src/Bot/BaseAi/Actions/SuggestWhatToDoAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/SuggestWhatToDoAction.h
rename to src/Bot/BaseAi/Actions/SuggestWhatToDoAction.h
diff --git a/src/Core/Ai/Generic/Actions/TalkToQuestGiverAction.cpp b/src/Bot/BaseAi/Actions/TalkToQuestGiverAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TalkToQuestGiverAction.cpp
rename to src/Bot/BaseAi/Actions/TalkToQuestGiverAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/TalkToQuestGiverAction.h b/src/Bot/BaseAi/Actions/TalkToQuestGiverAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TalkToQuestGiverAction.h
rename to src/Bot/BaseAi/Actions/TalkToQuestGiverAction.h
diff --git a/src/Core/Ai/Generic/Actions/TameAction.cpp b/src/Bot/BaseAi/Actions/TameAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TameAction.cpp
rename to src/Bot/BaseAi/Actions/TameAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/TameAction.h b/src/Bot/BaseAi/Actions/TameAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TameAction.h
rename to src/Bot/BaseAi/Actions/TameAction.h
diff --git a/src/Core/Ai/Generic/Actions/TaxiAction.cpp b/src/Bot/BaseAi/Actions/TaxiAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TaxiAction.cpp
rename to src/Bot/BaseAi/Actions/TaxiAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/TaxiAction.h b/src/Bot/BaseAi/Actions/TaxiAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TaxiAction.h
rename to src/Bot/BaseAi/Actions/TaxiAction.h
diff --git a/src/Core/Ai/Generic/Actions/TeleportAction.cpp b/src/Bot/BaseAi/Actions/TeleportAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TeleportAction.cpp
rename to src/Bot/BaseAi/Actions/TeleportAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/TeleportAction.h b/src/Bot/BaseAi/Actions/TeleportAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TeleportAction.h
rename to src/Bot/BaseAi/Actions/TeleportAction.h
diff --git a/src/Core/Ai/Generic/Actions/TellCastFailedAction.cpp b/src/Bot/BaseAi/Actions/TellCastFailedAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TellCastFailedAction.cpp
rename to src/Bot/BaseAi/Actions/TellCastFailedAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/TellCastFailedAction.h b/src/Bot/BaseAi/Actions/TellCastFailedAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TellCastFailedAction.h
rename to src/Bot/BaseAi/Actions/TellCastFailedAction.h
diff --git a/src/Core/Ai/Generic/Actions/TellGlyphsAction.cpp b/src/Bot/BaseAi/Actions/TellGlyphsAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TellGlyphsAction.cpp
rename to src/Bot/BaseAi/Actions/TellGlyphsAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/TellGlyphsAction.h b/src/Bot/BaseAi/Actions/TellGlyphsAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TellGlyphsAction.h
rename to src/Bot/BaseAi/Actions/TellGlyphsAction.h
diff --git a/src/Core/Ai/Generic/Actions/TellItemCountAction.cpp b/src/Bot/BaseAi/Actions/TellItemCountAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TellItemCountAction.cpp
rename to src/Bot/BaseAi/Actions/TellItemCountAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/TellItemCountAction.h b/src/Bot/BaseAi/Actions/TellItemCountAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TellItemCountAction.h
rename to src/Bot/BaseAi/Actions/TellItemCountAction.h
diff --git a/src/Core/Ai/Generic/Actions/TellLosAction.cpp b/src/Bot/BaseAi/Actions/TellLosAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TellLosAction.cpp
rename to src/Bot/BaseAi/Actions/TellLosAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/TellLosAction.h b/src/Bot/BaseAi/Actions/TellLosAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TellLosAction.h
rename to src/Bot/BaseAi/Actions/TellLosAction.h
diff --git a/src/Core/Ai/Generic/Actions/TellMasterAction.cpp b/src/Bot/BaseAi/Actions/TellMasterAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TellMasterAction.cpp
rename to src/Bot/BaseAi/Actions/TellMasterAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/TellMasterAction.h b/src/Bot/BaseAi/Actions/TellMasterAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TellMasterAction.h
rename to src/Bot/BaseAi/Actions/TellMasterAction.h
diff --git a/src/Core/Ai/Generic/Actions/TellReputationAction.cpp b/src/Bot/BaseAi/Actions/TellReputationAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TellReputationAction.cpp
rename to src/Bot/BaseAi/Actions/TellReputationAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/TellReputationAction.h b/src/Bot/BaseAi/Actions/TellReputationAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TellReputationAction.h
rename to src/Bot/BaseAi/Actions/TellReputationAction.h
diff --git a/src/Core/Ai/Generic/Actions/TellTargetAction.cpp b/src/Bot/BaseAi/Actions/TellTargetAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TellTargetAction.cpp
rename to src/Bot/BaseAi/Actions/TellTargetAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/TellTargetAction.h b/src/Bot/BaseAi/Actions/TellTargetAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TellTargetAction.h
rename to src/Bot/BaseAi/Actions/TellTargetAction.h
diff --git a/src/Core/Ai/Generic/Actions/TradeAction.cpp b/src/Bot/BaseAi/Actions/TradeAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TradeAction.cpp
rename to src/Bot/BaseAi/Actions/TradeAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/TradeAction.h b/src/Bot/BaseAi/Actions/TradeAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TradeAction.h
rename to src/Bot/BaseAi/Actions/TradeAction.h
diff --git a/src/Core/Ai/Generic/Actions/TradeStatusAction.cpp b/src/Bot/BaseAi/Actions/TradeStatusAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TradeStatusAction.cpp
rename to src/Bot/BaseAi/Actions/TradeStatusAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/TradeStatusAction.h b/src/Bot/BaseAi/Actions/TradeStatusAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TradeStatusAction.h
rename to src/Bot/BaseAi/Actions/TradeStatusAction.h
diff --git a/src/Core/Ai/Generic/Actions/TradeStatusExtendedAction.cpp b/src/Bot/BaseAi/Actions/TradeStatusExtendedAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TradeStatusExtendedAction.cpp
rename to src/Bot/BaseAi/Actions/TradeStatusExtendedAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/TradeStatusExtendedAction.h b/src/Bot/BaseAi/Actions/TradeStatusExtendedAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TradeStatusExtendedAction.h
rename to src/Bot/BaseAi/Actions/TradeStatusExtendedAction.h
diff --git a/src/Core/Ai/Generic/Actions/TradeValues.cpp b/src/Bot/BaseAi/Actions/TradeValues.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TradeValues.cpp
rename to src/Bot/BaseAi/Actions/TradeValues.cpp
diff --git a/src/Core/Ai/Generic/Actions/TradeValues.h b/src/Bot/BaseAi/Actions/TradeValues.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TradeValues.h
rename to src/Bot/BaseAi/Actions/TradeValues.h
diff --git a/src/Core/Ai/Generic/Actions/TrainerAction.cpp b/src/Bot/BaseAi/Actions/TrainerAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TrainerAction.cpp
rename to src/Bot/BaseAi/Actions/TrainerAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/TrainerAction.h b/src/Bot/BaseAi/Actions/TrainerAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TrainerAction.h
rename to src/Bot/BaseAi/Actions/TrainerAction.h
diff --git a/src/Core/Ai/Generic/Actions/TravelAction.cpp b/src/Bot/BaseAi/Actions/TravelAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TravelAction.cpp
rename to src/Bot/BaseAi/Actions/TravelAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/TravelAction.h b/src/Bot/BaseAi/Actions/TravelAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/TravelAction.h
rename to src/Bot/BaseAi/Actions/TravelAction.h
diff --git a/src/Core/Ai/Generic/Actions/UnequipAction.cpp b/src/Bot/BaseAi/Actions/UnequipAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/UnequipAction.cpp
rename to src/Bot/BaseAi/Actions/UnequipAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/UnequipAction.h b/src/Bot/BaseAi/Actions/UnequipAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/UnequipAction.h
rename to src/Bot/BaseAi/Actions/UnequipAction.h
diff --git a/src/Core/Ai/Generic/Actions/UnlockItemAction.cpp b/src/Bot/BaseAi/Actions/UnlockItemAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/UnlockItemAction.cpp
rename to src/Bot/BaseAi/Actions/UnlockItemAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/UnlockItemAction.h b/src/Bot/BaseAi/Actions/UnlockItemAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/UnlockItemAction.h
rename to src/Bot/BaseAi/Actions/UnlockItemAction.h
diff --git a/src/Core/Ai/Generic/Actions/UnlockTradedItemAction.cpp b/src/Bot/BaseAi/Actions/UnlockTradedItemAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/UnlockTradedItemAction.cpp
rename to src/Bot/BaseAi/Actions/UnlockTradedItemAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/UnlockTradedItemAction.h b/src/Bot/BaseAi/Actions/UnlockTradedItemAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/UnlockTradedItemAction.h
rename to src/Bot/BaseAi/Actions/UnlockTradedItemAction.h
diff --git a/src/Core/Ai/Generic/Actions/UseItemAction.cpp b/src/Bot/BaseAi/Actions/UseItemAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/UseItemAction.cpp
rename to src/Bot/BaseAi/Actions/UseItemAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/UseItemAction.h b/src/Bot/BaseAi/Actions/UseItemAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/UseItemAction.h
rename to src/Bot/BaseAi/Actions/UseItemAction.h
diff --git a/src/Core/Ai/Generic/Actions/UseMeetingStoneAction.cpp b/src/Bot/BaseAi/Actions/UseMeetingStoneAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/UseMeetingStoneAction.cpp
rename to src/Bot/BaseAi/Actions/UseMeetingStoneAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/UseMeetingStoneAction.h b/src/Bot/BaseAi/Actions/UseMeetingStoneAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/UseMeetingStoneAction.h
rename to src/Bot/BaseAi/Actions/UseMeetingStoneAction.h
diff --git a/src/Core/Ai/Generic/Actions/VehicleActions.cpp b/src/Bot/BaseAi/Actions/VehicleActions.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/VehicleActions.cpp
rename to src/Bot/BaseAi/Actions/VehicleActions.cpp
diff --git a/src/Core/Ai/Generic/Actions/VehicleActions.h b/src/Bot/BaseAi/Actions/VehicleActions.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/VehicleActions.h
rename to src/Bot/BaseAi/Actions/VehicleActions.h
diff --git a/src/Core/Ai/Generic/Actions/WhoAction.cpp b/src/Bot/BaseAi/Actions/WhoAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/WhoAction.cpp
rename to src/Bot/BaseAi/Actions/WhoAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/WhoAction.h b/src/Bot/BaseAi/Actions/WhoAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/WhoAction.h
rename to src/Bot/BaseAi/Actions/WhoAction.h
diff --git a/src/Core/Ai/Generic/Actions/WipeAction.cpp b/src/Bot/BaseAi/Actions/WipeAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/WipeAction.cpp
rename to src/Bot/BaseAi/Actions/WipeAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/WipeAction.h b/src/Bot/BaseAi/Actions/WipeAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/WipeAction.h
rename to src/Bot/BaseAi/Actions/WipeAction.h
diff --git a/src/Core/Ai/Generic/Actions/WorldBuffAction.cpp b/src/Bot/BaseAi/Actions/WorldBuffAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/WorldBuffAction.cpp
rename to src/Bot/BaseAi/Actions/WorldBuffAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/WorldBuffAction.h b/src/Bot/BaseAi/Actions/WorldBuffAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/WorldBuffAction.h
rename to src/Bot/BaseAi/Actions/WorldBuffAction.h
diff --git a/src/Core/Ai/Generic/Actions/WtsAction.cpp b/src/Bot/BaseAi/Actions/WtsAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/WtsAction.cpp
rename to src/Bot/BaseAi/Actions/WtsAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/WtsAction.h b/src/Bot/BaseAi/Actions/WtsAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/WtsAction.h
rename to src/Bot/BaseAi/Actions/WtsAction.h
diff --git a/src/Core/Ai/Generic/Actions/XpGainAction.cpp b/src/Bot/BaseAi/Actions/XpGainAction.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Actions/XpGainAction.cpp
rename to src/Bot/BaseAi/Actions/XpGainAction.cpp
diff --git a/src/Core/Ai/Generic/Actions/XpGainAction.h b/src/Bot/BaseAi/Actions/XpGainAction.h
similarity index 100%
rename from src/Core/Ai/Generic/Actions/XpGainAction.h
rename to src/Bot/BaseAi/Actions/XpGainAction.h
diff --git a/src/Core/Ai/Generic/ChatActionContext.h b/src/Bot/BaseAi/ChatActionContext.h
similarity index 100%
rename from src/Core/Ai/Generic/ChatActionContext.h
rename to src/Bot/BaseAi/ChatActionContext.h
diff --git a/src/Core/Ai/Generic/ChatTriggerContext.h b/src/Bot/BaseAi/ChatTriggerContext.h
similarity index 100%
rename from src/Core/Ai/Generic/ChatTriggerContext.h
rename to src/Bot/BaseAi/ChatTriggerContext.h
diff --git a/src/Core/Ai/Generic/SharedValueContext.h b/src/Bot/BaseAi/SharedValueContext.h
similarity index 100%
rename from src/Core/Ai/Generic/SharedValueContext.h
rename to src/Bot/BaseAi/SharedValueContext.h
diff --git a/src/Core/Ai/Generic/Trigger/BossAuraTriggers.cpp b/src/Bot/BaseAi/Trigger/BossAuraTriggers.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/BossAuraTriggers.cpp
rename to src/Bot/BaseAi/Trigger/BossAuraTriggers.cpp
diff --git a/src/Core/Ai/Generic/Trigger/BossAuraTriggers.h b/src/Bot/BaseAi/Trigger/BossAuraTriggers.h
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/BossAuraTriggers.h
rename to src/Bot/BaseAi/Trigger/BossAuraTriggers.h
diff --git a/src/Core/Ai/Generic/Trigger/ChatCommandTrigger.cpp b/src/Bot/BaseAi/Trigger/ChatCommandTrigger.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/ChatCommandTrigger.cpp
rename to src/Bot/BaseAi/Trigger/ChatCommandTrigger.cpp
diff --git a/src/Core/Ai/Generic/Trigger/ChatCommandTrigger.h b/src/Bot/BaseAi/Trigger/ChatCommandTrigger.h
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/ChatCommandTrigger.h
rename to src/Bot/BaseAi/Trigger/ChatCommandTrigger.h
diff --git a/src/Core/Ai/Generic/Trigger/CureTriggers.cpp b/src/Bot/BaseAi/Trigger/CureTriggers.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/CureTriggers.cpp
rename to src/Bot/BaseAi/Trigger/CureTriggers.cpp
diff --git a/src/Core/Ai/Generic/Trigger/CureTriggers.h b/src/Bot/BaseAi/Trigger/CureTriggers.h
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/CureTriggers.h
rename to src/Bot/BaseAi/Trigger/CureTriggers.h
diff --git a/src/Core/Ai/Generic/Trigger/FishingTriggers.cpp b/src/Bot/BaseAi/Trigger/FishingTriggers.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/FishingTriggers.cpp
rename to src/Bot/BaseAi/Trigger/FishingTriggers.cpp
diff --git a/src/Core/Ai/Generic/Trigger/FishingTriggers.h b/src/Bot/BaseAi/Trigger/FishingTriggers.h
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/FishingTriggers.h
rename to src/Bot/BaseAi/Trigger/FishingTriggers.h
diff --git a/src/Core/Ai/Generic/Trigger/GenericTriggers.cpp b/src/Bot/BaseAi/Trigger/GenericTriggers.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/GenericTriggers.cpp
rename to src/Bot/BaseAi/Trigger/GenericTriggers.cpp
diff --git a/src/Core/Ai/Generic/Trigger/GenericTriggers.h b/src/Bot/BaseAi/Trigger/GenericTriggers.h
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/GenericTriggers.h
rename to src/Bot/BaseAi/Trigger/GenericTriggers.h
diff --git a/src/Core/Ai/Generic/Trigger/GuildTriggers.cpp b/src/Bot/BaseAi/Trigger/GuildTriggers.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/GuildTriggers.cpp
rename to src/Bot/BaseAi/Trigger/GuildTriggers.cpp
diff --git a/src/Core/Ai/Generic/Trigger/GuildTriggers.h b/src/Bot/BaseAi/Trigger/GuildTriggers.h
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/GuildTriggers.h
rename to src/Bot/BaseAi/Trigger/GuildTriggers.h
diff --git a/src/Core/Ai/Generic/Trigger/HealthTriggers.cpp b/src/Bot/BaseAi/Trigger/HealthTriggers.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/HealthTriggers.cpp
rename to src/Bot/BaseAi/Trigger/HealthTriggers.cpp
diff --git a/src/Core/Ai/Generic/Trigger/HealthTriggers.h b/src/Bot/BaseAi/Trigger/HealthTriggers.h
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/HealthTriggers.h
rename to src/Bot/BaseAi/Trigger/HealthTriggers.h
diff --git a/src/Core/Ai/Generic/Trigger/LfgTriggers.cpp b/src/Bot/BaseAi/Trigger/LfgTriggers.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/LfgTriggers.cpp
rename to src/Bot/BaseAi/Trigger/LfgTriggers.cpp
diff --git a/src/Core/Ai/Generic/Trigger/LfgTriggers.h b/src/Bot/BaseAi/Trigger/LfgTriggers.h
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/LfgTriggers.h
rename to src/Bot/BaseAi/Trigger/LfgTriggers.h
diff --git a/src/Core/Ai/Generic/Trigger/LootTriggers.cpp b/src/Bot/BaseAi/Trigger/LootTriggers.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/LootTriggers.cpp
rename to src/Bot/BaseAi/Trigger/LootTriggers.cpp
diff --git a/src/Core/Ai/Generic/Trigger/LootTriggers.h b/src/Bot/BaseAi/Trigger/LootTriggers.h
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/LootTriggers.h
rename to src/Bot/BaseAi/Trigger/LootTriggers.h
diff --git a/src/Core/Ai/Generic/Trigger/PvpTriggers.cpp b/src/Bot/BaseAi/Trigger/PvpTriggers.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/PvpTriggers.cpp
rename to src/Bot/BaseAi/Trigger/PvpTriggers.cpp
diff --git a/src/Core/Ai/Generic/Trigger/PvpTriggers.h b/src/Bot/BaseAi/Trigger/PvpTriggers.h
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/PvpTriggers.h
rename to src/Bot/BaseAi/Trigger/PvpTriggers.h
diff --git a/src/Core/Ai/Generic/Trigger/RangeTriggers.cpp b/src/Bot/BaseAi/Trigger/RangeTriggers.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/RangeTriggers.cpp
rename to src/Bot/BaseAi/Trigger/RangeTriggers.cpp
diff --git a/src/Core/Ai/Generic/Trigger/RangeTriggers.h b/src/Bot/BaseAi/Trigger/RangeTriggers.h
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/RangeTriggers.h
rename to src/Bot/BaseAi/Trigger/RangeTriggers.h
diff --git a/src/Core/Ai/Generic/Trigger/RpgTriggers.cpp b/src/Bot/BaseAi/Trigger/RpgTriggers.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/RpgTriggers.cpp
rename to src/Bot/BaseAi/Trigger/RpgTriggers.cpp
diff --git a/src/Core/Ai/Generic/Trigger/RpgTriggers.h b/src/Bot/BaseAi/Trigger/RpgTriggers.h
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/RpgTriggers.h
rename to src/Bot/BaseAi/Trigger/RpgTriggers.h
diff --git a/src/Core/Ai/Generic/Trigger/RtiTriggers.cpp b/src/Bot/BaseAi/Trigger/RtiTriggers.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/RtiTriggers.cpp
rename to src/Bot/BaseAi/Trigger/RtiTriggers.cpp
diff --git a/src/Core/Ai/Generic/Trigger/RtiTriggers.h b/src/Bot/BaseAi/Trigger/RtiTriggers.h
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/RtiTriggers.h
rename to src/Bot/BaseAi/Trigger/RtiTriggers.h
diff --git a/src/Core/Ai/Generic/Trigger/StuckTriggers.cpp b/src/Bot/BaseAi/Trigger/StuckTriggers.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/StuckTriggers.cpp
rename to src/Bot/BaseAi/Trigger/StuckTriggers.cpp
diff --git a/src/Core/Ai/Generic/Trigger/StuckTriggers.h b/src/Bot/BaseAi/Trigger/StuckTriggers.h
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/StuckTriggers.h
rename to src/Bot/BaseAi/Trigger/StuckTriggers.h
diff --git a/src/Core/Ai/Generic/Trigger/TravelTriggers.cpp b/src/Bot/BaseAi/Trigger/TravelTriggers.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/TravelTriggers.cpp
rename to src/Bot/BaseAi/Trigger/TravelTriggers.cpp
diff --git a/src/Core/Ai/Generic/Trigger/TravelTriggers.h b/src/Bot/BaseAi/Trigger/TravelTriggers.h
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/TravelTriggers.h
rename to src/Bot/BaseAi/Trigger/TravelTriggers.h
diff --git a/src/Core/Ai/Generic/Trigger/WithinAreaTrigger.cpp b/src/Bot/BaseAi/Trigger/WithinAreaTrigger.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/WithinAreaTrigger.cpp
rename to src/Bot/BaseAi/Trigger/WithinAreaTrigger.cpp
diff --git a/src/Core/Ai/Generic/Trigger/WithinAreaTrigger.h b/src/Bot/BaseAi/Trigger/WithinAreaTrigger.h
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/WithinAreaTrigger.h
rename to src/Bot/BaseAi/Trigger/WithinAreaTrigger.h
diff --git a/src/Core/Ai/Generic/Trigger/WorldPacketTrigger.cpp b/src/Bot/BaseAi/Trigger/WorldPacketTrigger.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/WorldPacketTrigger.cpp
rename to src/Bot/BaseAi/Trigger/WorldPacketTrigger.cpp
diff --git a/src/Core/Ai/Generic/Trigger/WorldPacketTrigger.h b/src/Bot/BaseAi/Trigger/WorldPacketTrigger.h
similarity index 100%
rename from src/Core/Ai/Generic/Trigger/WorldPacketTrigger.h
rename to src/Bot/BaseAi/Trigger/WorldPacketTrigger.h
diff --git a/src/Core/Ai/Generic/TriggerContext.h b/src/Bot/BaseAi/TriggerContext.h
similarity index 100%
rename from src/Core/Ai/Generic/TriggerContext.h
rename to src/Bot/BaseAi/TriggerContext.h
diff --git a/src/Core/Ai/Generic/Value/ActiveSpellValue.cpp b/src/Bot/BaseAi/Value/ActiveSpellValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/ActiveSpellValue.cpp
rename to src/Bot/BaseAi/Value/ActiveSpellValue.cpp
diff --git a/src/Core/Ai/Generic/Value/ActiveSpellValue.h b/src/Bot/BaseAi/Value/ActiveSpellValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/ActiveSpellValue.h
rename to src/Bot/BaseAi/Value/ActiveSpellValue.h
diff --git a/src/Core/Ai/Generic/Value/AlwaysLootListValue.cpp b/src/Bot/BaseAi/Value/AlwaysLootListValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/AlwaysLootListValue.cpp
rename to src/Bot/BaseAi/Value/AlwaysLootListValue.cpp
diff --git a/src/Core/Ai/Generic/Value/AlwaysLootListValue.h b/src/Bot/BaseAi/Value/AlwaysLootListValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/AlwaysLootListValue.h
rename to src/Bot/BaseAi/Value/AlwaysLootListValue.h
diff --git a/src/Core/Ai/Generic/Value/AoeHealValues.cpp b/src/Bot/BaseAi/Value/AoeHealValues.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/AoeHealValues.cpp
rename to src/Bot/BaseAi/Value/AoeHealValues.cpp
diff --git a/src/Core/Ai/Generic/Value/AoeHealValues.h b/src/Bot/BaseAi/Value/AoeHealValues.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/AoeHealValues.h
rename to src/Bot/BaseAi/Value/AoeHealValues.h
diff --git a/src/Core/Ai/Generic/Value/AoeValues.cpp b/src/Bot/BaseAi/Value/AoeValues.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/AoeValues.cpp
rename to src/Bot/BaseAi/Value/AoeValues.cpp
diff --git a/src/Core/Ai/Generic/Value/AoeValues.h b/src/Bot/BaseAi/Value/AoeValues.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/AoeValues.h
rename to src/Bot/BaseAi/Value/AoeValues.h
diff --git a/src/Core/Ai/Generic/Value/Arrow.cpp b/src/Bot/BaseAi/Value/Arrow.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/Arrow.cpp
rename to src/Bot/BaseAi/Value/Arrow.cpp
diff --git a/src/Core/Ai/Generic/Value/Arrow.h b/src/Bot/BaseAi/Value/Arrow.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/Arrow.h
rename to src/Bot/BaseAi/Value/Arrow.h
diff --git a/src/Core/Ai/Generic/Value/AttackerCountValues.cpp b/src/Bot/BaseAi/Value/AttackerCountValues.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/AttackerCountValues.cpp
rename to src/Bot/BaseAi/Value/AttackerCountValues.cpp
diff --git a/src/Core/Ai/Generic/Value/AttackerCountValues.h b/src/Bot/BaseAi/Value/AttackerCountValues.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/AttackerCountValues.h
rename to src/Bot/BaseAi/Value/AttackerCountValues.h
diff --git a/src/Core/Ai/Generic/Value/AttackerWithoutAuraTargetValue.cpp b/src/Bot/BaseAi/Value/AttackerWithoutAuraTargetValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/AttackerWithoutAuraTargetValue.cpp
rename to src/Bot/BaseAi/Value/AttackerWithoutAuraTargetValue.cpp
diff --git a/src/Core/Ai/Generic/Value/AttackerWithoutAuraTargetValue.h b/src/Bot/BaseAi/Value/AttackerWithoutAuraTargetValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/AttackerWithoutAuraTargetValue.h
rename to src/Bot/BaseAi/Value/AttackerWithoutAuraTargetValue.h
diff --git a/src/Core/Ai/Generic/Value/AttackersValue.cpp b/src/Bot/BaseAi/Value/AttackersValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/AttackersValue.cpp
rename to src/Bot/BaseAi/Value/AttackersValue.cpp
diff --git a/src/Core/Ai/Generic/Value/AttackersValue.h b/src/Bot/BaseAi/Value/AttackersValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/AttackersValue.h
rename to src/Bot/BaseAi/Value/AttackersValue.h
diff --git a/src/Core/Ai/Generic/Value/AvailableLootValue.cpp b/src/Bot/BaseAi/Value/AvailableLootValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/AvailableLootValue.cpp
rename to src/Bot/BaseAi/Value/AvailableLootValue.cpp
diff --git a/src/Core/Ai/Generic/Value/AvailableLootValue.h b/src/Bot/BaseAi/Value/AvailableLootValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/AvailableLootValue.h
rename to src/Bot/BaseAi/Value/AvailableLootValue.h
diff --git a/src/Core/Ai/Generic/Value/BudgetValues.cpp b/src/Bot/BaseAi/Value/BudgetValues.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/BudgetValues.cpp
rename to src/Bot/BaseAi/Value/BudgetValues.cpp
diff --git a/src/Core/Ai/Generic/Value/BudgetValues.h b/src/Bot/BaseAi/Value/BudgetValues.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/BudgetValues.h
rename to src/Bot/BaseAi/Value/BudgetValues.h
diff --git a/src/Core/Ai/Generic/Value/CcTargetValue.cpp b/src/Bot/BaseAi/Value/CcTargetValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/CcTargetValue.cpp
rename to src/Bot/BaseAi/Value/CcTargetValue.cpp
diff --git a/src/Core/Ai/Generic/Value/CcTargetValue.h b/src/Bot/BaseAi/Value/CcTargetValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/CcTargetValue.h
rename to src/Bot/BaseAi/Value/CcTargetValue.h
diff --git a/src/Core/Ai/Generic/Value/ChatValue.h b/src/Bot/BaseAi/Value/ChatValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/ChatValue.h
rename to src/Bot/BaseAi/Value/ChatValue.h
diff --git a/src/Core/Ai/Generic/Value/CollisionValue.cpp b/src/Bot/BaseAi/Value/CollisionValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/CollisionValue.cpp
rename to src/Bot/BaseAi/Value/CollisionValue.cpp
diff --git a/src/Core/Ai/Generic/Value/CollisionValue.h b/src/Bot/BaseAi/Value/CollisionValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/CollisionValue.h
rename to src/Bot/BaseAi/Value/CollisionValue.h
diff --git a/src/Core/Ai/Generic/Value/CraftValue.h b/src/Bot/BaseAi/Value/CraftValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/CraftValue.h
rename to src/Bot/BaseAi/Value/CraftValue.h
diff --git a/src/Core/Ai/Generic/Value/CurrentCcTargetValue.cpp b/src/Bot/BaseAi/Value/CurrentCcTargetValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/CurrentCcTargetValue.cpp
rename to src/Bot/BaseAi/Value/CurrentCcTargetValue.cpp
diff --git a/src/Core/Ai/Generic/Value/CurrentCcTargetValue.h b/src/Bot/BaseAi/Value/CurrentCcTargetValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/CurrentCcTargetValue.h
rename to src/Bot/BaseAi/Value/CurrentCcTargetValue.h
diff --git a/src/Core/Ai/Generic/Value/CurrentTargetValue.cpp b/src/Bot/BaseAi/Value/CurrentTargetValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/CurrentTargetValue.cpp
rename to src/Bot/BaseAi/Value/CurrentTargetValue.cpp
diff --git a/src/Core/Ai/Generic/Value/CurrentTargetValue.h b/src/Bot/BaseAi/Value/CurrentTargetValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/CurrentTargetValue.h
rename to src/Bot/BaseAi/Value/CurrentTargetValue.h
diff --git a/src/Core/Ai/Generic/Value/DistanceValue.cpp b/src/Bot/BaseAi/Value/DistanceValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/DistanceValue.cpp
rename to src/Bot/BaseAi/Value/DistanceValue.cpp
diff --git a/src/Core/Ai/Generic/Value/DistanceValue.h b/src/Bot/BaseAi/Value/DistanceValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/DistanceValue.h
rename to src/Bot/BaseAi/Value/DistanceValue.h
diff --git a/src/Core/Ai/Generic/Value/DpsTargetValue.cpp b/src/Bot/BaseAi/Value/DpsTargetValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/DpsTargetValue.cpp
rename to src/Bot/BaseAi/Value/DpsTargetValue.cpp
diff --git a/src/Core/Ai/Generic/Value/DpsTargetValue.h b/src/Bot/BaseAi/Value/DpsTargetValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/DpsTargetValue.h
rename to src/Bot/BaseAi/Value/DpsTargetValue.h
diff --git a/src/Core/Ai/Generic/Value/DuelTargetValue.cpp b/src/Bot/BaseAi/Value/DuelTargetValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/DuelTargetValue.cpp
rename to src/Bot/BaseAi/Value/DuelTargetValue.cpp
diff --git a/src/Core/Ai/Generic/Value/DuelTargetValue.h b/src/Bot/BaseAi/Value/DuelTargetValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/DuelTargetValue.h
rename to src/Bot/BaseAi/Value/DuelTargetValue.h
diff --git a/src/Core/Ai/Generic/Value/EnemyHealerTargetValue.cpp b/src/Bot/BaseAi/Value/EnemyHealerTargetValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/EnemyHealerTargetValue.cpp
rename to src/Bot/BaseAi/Value/EnemyHealerTargetValue.cpp
diff --git a/src/Core/Ai/Generic/Value/EnemyHealerTargetValue.h b/src/Bot/BaseAi/Value/EnemyHealerTargetValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/EnemyHealerTargetValue.h
rename to src/Bot/BaseAi/Value/EnemyHealerTargetValue.h
diff --git a/src/Core/Ai/Generic/Value/EnemyPlayerValue.cpp b/src/Bot/BaseAi/Value/EnemyPlayerValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/EnemyPlayerValue.cpp
rename to src/Bot/BaseAi/Value/EnemyPlayerValue.cpp
diff --git a/src/Core/Ai/Generic/Value/EnemyPlayerValue.h b/src/Bot/BaseAi/Value/EnemyPlayerValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/EnemyPlayerValue.h
rename to src/Bot/BaseAi/Value/EnemyPlayerValue.h
diff --git a/src/Core/Ai/Generic/Value/EstimatedLifetimeValue.cpp b/src/Bot/BaseAi/Value/EstimatedLifetimeValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/EstimatedLifetimeValue.cpp
rename to src/Bot/BaseAi/Value/EstimatedLifetimeValue.cpp
diff --git a/src/Core/Ai/Generic/Value/EstimatedLifetimeValue.h b/src/Bot/BaseAi/Value/EstimatedLifetimeValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/EstimatedLifetimeValue.h
rename to src/Bot/BaseAi/Value/EstimatedLifetimeValue.h
diff --git a/src/Core/Ai/Generic/Value/FishValues.cpp b/src/Bot/BaseAi/Value/FishValues.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/FishValues.cpp
rename to src/Bot/BaseAi/Value/FishValues.cpp
diff --git a/src/Core/Ai/Generic/Value/FishValues.h b/src/Bot/BaseAi/Value/FishValues.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/FishValues.h
rename to src/Bot/BaseAi/Value/FishValues.h
diff --git a/src/Core/Ai/Generic/Value/Formations.cpp b/src/Bot/BaseAi/Value/Formations.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/Formations.cpp
rename to src/Bot/BaseAi/Value/Formations.cpp
diff --git a/src/Core/Ai/Generic/Value/Formations.h b/src/Bot/BaseAi/Value/Formations.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/Formations.h
rename to src/Bot/BaseAi/Value/Formations.h
diff --git a/src/Core/Ai/Generic/Value/GrindTargetValue.cpp b/src/Bot/BaseAi/Value/GrindTargetValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/GrindTargetValue.cpp
rename to src/Bot/BaseAi/Value/GrindTargetValue.cpp
diff --git a/src/Core/Ai/Generic/Value/GrindTargetValue.h b/src/Bot/BaseAi/Value/GrindTargetValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/GrindTargetValue.h
rename to src/Bot/BaseAi/Value/GrindTargetValue.h
diff --git a/src/Core/Ai/Generic/Value/GroupLeaderValue.cpp b/src/Bot/BaseAi/Value/GroupLeaderValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/GroupLeaderValue.cpp
rename to src/Bot/BaseAi/Value/GroupLeaderValue.cpp
diff --git a/src/Core/Ai/Generic/Value/GroupLeaderValue.h b/src/Bot/BaseAi/Value/GroupLeaderValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/GroupLeaderValue.h
rename to src/Bot/BaseAi/Value/GroupLeaderValue.h
diff --git a/src/Core/Ai/Generic/Value/GroupValues.cpp b/src/Bot/BaseAi/Value/GroupValues.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/GroupValues.cpp
rename to src/Bot/BaseAi/Value/GroupValues.cpp
diff --git a/src/Core/Ai/Generic/Value/GroupValues.h b/src/Bot/BaseAi/Value/GroupValues.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/GroupValues.h
rename to src/Bot/BaseAi/Value/GroupValues.h
diff --git a/src/Core/Ai/Generic/Value/GuildValues.cpp b/src/Bot/BaseAi/Value/GuildValues.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/GuildValues.cpp
rename to src/Bot/BaseAi/Value/GuildValues.cpp
diff --git a/src/Core/Ai/Generic/Value/GuildValues.h b/src/Bot/BaseAi/Value/GuildValues.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/GuildValues.h
rename to src/Bot/BaseAi/Value/GuildValues.h
diff --git a/src/Core/Ai/Generic/Value/HasAvailableLootValue.cpp b/src/Bot/BaseAi/Value/HasAvailableLootValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/HasAvailableLootValue.cpp
rename to src/Bot/BaseAi/Value/HasAvailableLootValue.cpp
diff --git a/src/Core/Ai/Generic/Value/HasAvailableLootValue.h b/src/Bot/BaseAi/Value/HasAvailableLootValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/HasAvailableLootValue.h
rename to src/Bot/BaseAi/Value/HasAvailableLootValue.h
diff --git a/src/Core/Ai/Generic/Value/HasTotemValue.cpp b/src/Bot/BaseAi/Value/HasTotemValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/HasTotemValue.cpp
rename to src/Bot/BaseAi/Value/HasTotemValue.cpp
diff --git a/src/Core/Ai/Generic/Value/HasTotemValue.h b/src/Bot/BaseAi/Value/HasTotemValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/HasTotemValue.h
rename to src/Bot/BaseAi/Value/HasTotemValue.h
diff --git a/src/Core/Ai/Generic/Value/InvalidTargetValue.cpp b/src/Bot/BaseAi/Value/InvalidTargetValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/InvalidTargetValue.cpp
rename to src/Bot/BaseAi/Value/InvalidTargetValue.cpp
diff --git a/src/Core/Ai/Generic/Value/InvalidTargetValue.h b/src/Bot/BaseAi/Value/InvalidTargetValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/InvalidTargetValue.h
rename to src/Bot/BaseAi/Value/InvalidTargetValue.h
diff --git a/src/Core/Ai/Generic/Value/IsBehindValue.cpp b/src/Bot/BaseAi/Value/IsBehindValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/IsBehindValue.cpp
rename to src/Bot/BaseAi/Value/IsBehindValue.cpp
diff --git a/src/Core/Ai/Generic/Value/IsBehindValue.h b/src/Bot/BaseAi/Value/IsBehindValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/IsBehindValue.h
rename to src/Bot/BaseAi/Value/IsBehindValue.h
diff --git a/src/Core/Ai/Generic/Value/IsFacingValue.cpp b/src/Bot/BaseAi/Value/IsFacingValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/IsFacingValue.cpp
rename to src/Bot/BaseAi/Value/IsFacingValue.cpp
diff --git a/src/Core/Ai/Generic/Value/IsFacingValue.h b/src/Bot/BaseAi/Value/IsFacingValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/IsFacingValue.h
rename to src/Bot/BaseAi/Value/IsFacingValue.h
diff --git a/src/Core/Ai/Generic/Value/IsMovingValue.cpp b/src/Bot/BaseAi/Value/IsMovingValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/IsMovingValue.cpp
rename to src/Bot/BaseAi/Value/IsMovingValue.cpp
diff --git a/src/Core/Ai/Generic/Value/IsMovingValue.h b/src/Bot/BaseAi/Value/IsMovingValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/IsMovingValue.h
rename to src/Bot/BaseAi/Value/IsMovingValue.h
diff --git a/src/Core/Ai/Generic/Value/ItemCountValue.cpp b/src/Bot/BaseAi/Value/ItemCountValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/ItemCountValue.cpp
rename to src/Bot/BaseAi/Value/ItemCountValue.cpp
diff --git a/src/Core/Ai/Generic/Value/ItemCountValue.h b/src/Bot/BaseAi/Value/ItemCountValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/ItemCountValue.h
rename to src/Bot/BaseAi/Value/ItemCountValue.h
diff --git a/src/Core/Ai/Generic/Value/ItemForSpellValue.cpp b/src/Bot/BaseAi/Value/ItemForSpellValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/ItemForSpellValue.cpp
rename to src/Bot/BaseAi/Value/ItemForSpellValue.cpp
diff --git a/src/Core/Ai/Generic/Value/ItemForSpellValue.h b/src/Bot/BaseAi/Value/ItemForSpellValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/ItemForSpellValue.h
rename to src/Bot/BaseAi/Value/ItemForSpellValue.h
diff --git a/src/Core/Ai/Generic/Value/ItemUsageValue.cpp b/src/Bot/BaseAi/Value/ItemUsageValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/ItemUsageValue.cpp
rename to src/Bot/BaseAi/Value/ItemUsageValue.cpp
diff --git a/src/Core/Ai/Generic/Value/ItemUsageValue.h b/src/Bot/BaseAi/Value/ItemUsageValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/ItemUsageValue.h
rename to src/Bot/BaseAi/Value/ItemUsageValue.h
diff --git a/src/Core/Ai/Generic/Value/LastMovementValue.cpp b/src/Bot/BaseAi/Value/LastMovementValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/LastMovementValue.cpp
rename to src/Bot/BaseAi/Value/LastMovementValue.cpp
diff --git a/src/Core/Ai/Generic/Value/LastMovementValue.h b/src/Bot/BaseAi/Value/LastMovementValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/LastMovementValue.h
rename to src/Bot/BaseAi/Value/LastMovementValue.h
diff --git a/src/Core/Ai/Generic/Value/LastSaidValue.h b/src/Bot/BaseAi/Value/LastSaidValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/LastSaidValue.h
rename to src/Bot/BaseAi/Value/LastSaidValue.h
diff --git a/src/Core/Ai/Generic/Value/LastSpellCastTimeValue.h b/src/Bot/BaseAi/Value/LastSpellCastTimeValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/LastSpellCastTimeValue.h
rename to src/Bot/BaseAi/Value/LastSpellCastTimeValue.h
diff --git a/src/Core/Ai/Generic/Value/LastSpellCastValue.cpp b/src/Bot/BaseAi/Value/LastSpellCastValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/LastSpellCastValue.cpp
rename to src/Bot/BaseAi/Value/LastSpellCastValue.cpp
diff --git a/src/Core/Ai/Generic/Value/LastSpellCastValue.h b/src/Bot/BaseAi/Value/LastSpellCastValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/LastSpellCastValue.h
rename to src/Bot/BaseAi/Value/LastSpellCastValue.h
diff --git a/src/Core/Ai/Generic/Value/LeastHpTargetValue.cpp b/src/Bot/BaseAi/Value/LeastHpTargetValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/LeastHpTargetValue.cpp
rename to src/Bot/BaseAi/Value/LeastHpTargetValue.cpp
diff --git a/src/Core/Ai/Generic/Value/LeastHpTargetValue.h b/src/Bot/BaseAi/Value/LeastHpTargetValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/LeastHpTargetValue.h
rename to src/Bot/BaseAi/Value/LeastHpTargetValue.h
diff --git a/src/Core/Ai/Generic/Value/LfgValues.h b/src/Bot/BaseAi/Value/LfgValues.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/LfgValues.h
rename to src/Bot/BaseAi/Value/LfgValues.h
diff --git a/src/Core/Ai/Generic/Value/LineTargetValue.cpp b/src/Bot/BaseAi/Value/LineTargetValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/LineTargetValue.cpp
rename to src/Bot/BaseAi/Value/LineTargetValue.cpp
diff --git a/src/Core/Ai/Generic/Value/LineTargetValue.h b/src/Bot/BaseAi/Value/LineTargetValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/LineTargetValue.h
rename to src/Bot/BaseAi/Value/LineTargetValue.h
diff --git a/src/Core/Ai/Generic/Value/LogLevelValue.h b/src/Bot/BaseAi/Value/LogLevelValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/LogLevelValue.h
rename to src/Bot/BaseAi/Value/LogLevelValue.h
diff --git a/src/Core/Ai/Generic/Value/LootStrategyValue.cpp b/src/Bot/BaseAi/Value/LootStrategyValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/LootStrategyValue.cpp
rename to src/Bot/BaseAi/Value/LootStrategyValue.cpp
diff --git a/src/Core/Ai/Generic/Value/LootStrategyValue.h b/src/Bot/BaseAi/Value/LootStrategyValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/LootStrategyValue.h
rename to src/Bot/BaseAi/Value/LootStrategyValue.h
diff --git a/src/Core/Ai/Generic/Value/LootValues.cpp b/src/Bot/BaseAi/Value/LootValues.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/LootValues.cpp
rename to src/Bot/BaseAi/Value/LootValues.cpp
diff --git a/src/Core/Ai/Generic/Value/LootValues.h b/src/Bot/BaseAi/Value/LootValues.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/LootValues.h
rename to src/Bot/BaseAi/Value/LootValues.h
diff --git a/src/Core/Ai/Generic/Value/MaintenanceValues.cpp b/src/Bot/BaseAi/Value/MaintenanceValues.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/MaintenanceValues.cpp
rename to src/Bot/BaseAi/Value/MaintenanceValues.cpp
diff --git a/src/Core/Ai/Generic/Value/MaintenanceValues.h b/src/Bot/BaseAi/Value/MaintenanceValues.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/MaintenanceValues.h
rename to src/Bot/BaseAi/Value/MaintenanceValues.h
diff --git a/src/Core/Ai/Generic/Value/ManaSaveLevelValue.h b/src/Bot/BaseAi/Value/ManaSaveLevelValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/ManaSaveLevelValue.h
rename to src/Bot/BaseAi/Value/ManaSaveLevelValue.h
diff --git a/src/Core/Ai/Generic/Value/NearestAdsValue.cpp b/src/Bot/BaseAi/Value/NearestAdsValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/NearestAdsValue.cpp
rename to src/Bot/BaseAi/Value/NearestAdsValue.cpp
diff --git a/src/Core/Ai/Generic/Value/NearestAdsValue.h b/src/Bot/BaseAi/Value/NearestAdsValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/NearestAdsValue.h
rename to src/Bot/BaseAi/Value/NearestAdsValue.h
diff --git a/src/Core/Ai/Generic/Value/NearestCorpsesValue.cpp b/src/Bot/BaseAi/Value/NearestCorpsesValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/NearestCorpsesValue.cpp
rename to src/Bot/BaseAi/Value/NearestCorpsesValue.cpp
diff --git a/src/Core/Ai/Generic/Value/NearestCorpsesValue.h b/src/Bot/BaseAi/Value/NearestCorpsesValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/NearestCorpsesValue.h
rename to src/Bot/BaseAi/Value/NearestCorpsesValue.h
diff --git a/src/Core/Ai/Generic/Value/NearestFriendlyPlayersValue.cpp b/src/Bot/BaseAi/Value/NearestFriendlyPlayersValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/NearestFriendlyPlayersValue.cpp
rename to src/Bot/BaseAi/Value/NearestFriendlyPlayersValue.cpp
diff --git a/src/Core/Ai/Generic/Value/NearestFriendlyPlayersValue.h b/src/Bot/BaseAi/Value/NearestFriendlyPlayersValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/NearestFriendlyPlayersValue.h
rename to src/Bot/BaseAi/Value/NearestFriendlyPlayersValue.h
diff --git a/src/Core/Ai/Generic/Value/NearestGameObjects.cpp b/src/Bot/BaseAi/Value/NearestGameObjects.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/NearestGameObjects.cpp
rename to src/Bot/BaseAi/Value/NearestGameObjects.cpp
diff --git a/src/Core/Ai/Generic/Value/NearestGameObjects.h b/src/Bot/BaseAi/Value/NearestGameObjects.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/NearestGameObjects.h
rename to src/Bot/BaseAi/Value/NearestGameObjects.h
diff --git a/src/Core/Ai/Generic/Value/NearestNonBotPlayersValue.cpp b/src/Bot/BaseAi/Value/NearestNonBotPlayersValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/NearestNonBotPlayersValue.cpp
rename to src/Bot/BaseAi/Value/NearestNonBotPlayersValue.cpp
diff --git a/src/Core/Ai/Generic/Value/NearestNonBotPlayersValue.h b/src/Bot/BaseAi/Value/NearestNonBotPlayersValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/NearestNonBotPlayersValue.h
rename to src/Bot/BaseAi/Value/NearestNonBotPlayersValue.h
diff --git a/src/Core/Ai/Generic/Value/NearestNpcsValue.cpp b/src/Bot/BaseAi/Value/NearestNpcsValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/NearestNpcsValue.cpp
rename to src/Bot/BaseAi/Value/NearestNpcsValue.cpp
diff --git a/src/Core/Ai/Generic/Value/NearestNpcsValue.h b/src/Bot/BaseAi/Value/NearestNpcsValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/NearestNpcsValue.h
rename to src/Bot/BaseAi/Value/NearestNpcsValue.h
diff --git a/src/Core/Ai/Generic/Value/NearestUnitsValue.cpp b/src/Bot/BaseAi/Value/NearestUnitsValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/NearestUnitsValue.cpp
rename to src/Bot/BaseAi/Value/NearestUnitsValue.cpp
diff --git a/src/Core/Ai/Generic/Value/NearestUnitsValue.h b/src/Bot/BaseAi/Value/NearestUnitsValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/NearestUnitsValue.h
rename to src/Bot/BaseAi/Value/NearestUnitsValue.h
diff --git a/src/Core/Ai/Generic/Value/NewPlayerNearbyValue.cpp b/src/Bot/BaseAi/Value/NewPlayerNearbyValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/NewPlayerNearbyValue.cpp
rename to src/Bot/BaseAi/Value/NewPlayerNearbyValue.cpp
diff --git a/src/Core/Ai/Generic/Value/NewPlayerNearbyValue.h b/src/Bot/BaseAi/Value/NewPlayerNearbyValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/NewPlayerNearbyValue.h
rename to src/Bot/BaseAi/Value/NewPlayerNearbyValue.h
diff --git a/src/Core/Ai/Generic/Value/OutfitListValue.cpp b/src/Bot/BaseAi/Value/OutfitListValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/OutfitListValue.cpp
rename to src/Bot/BaseAi/Value/OutfitListValue.cpp
diff --git a/src/Core/Ai/Generic/Value/OutfitListValue.h b/src/Bot/BaseAi/Value/OutfitListValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/OutfitListValue.h
rename to src/Bot/BaseAi/Value/OutfitListValue.h
diff --git a/src/Core/Ai/Generic/Value/PartyMemberToDispel.cpp b/src/Bot/BaseAi/Value/PartyMemberToDispel.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/PartyMemberToDispel.cpp
rename to src/Bot/BaseAi/Value/PartyMemberToDispel.cpp
diff --git a/src/Core/Ai/Generic/Value/PartyMemberToDispel.h b/src/Bot/BaseAi/Value/PartyMemberToDispel.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/PartyMemberToDispel.h
rename to src/Bot/BaseAi/Value/PartyMemberToDispel.h
diff --git a/src/Core/Ai/Generic/Value/PartyMemberToHeal.cpp b/src/Bot/BaseAi/Value/PartyMemberToHeal.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/PartyMemberToHeal.cpp
rename to src/Bot/BaseAi/Value/PartyMemberToHeal.cpp
diff --git a/src/Core/Ai/Generic/Value/PartyMemberToHeal.h b/src/Bot/BaseAi/Value/PartyMemberToHeal.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/PartyMemberToHeal.h
rename to src/Bot/BaseAi/Value/PartyMemberToHeal.h
diff --git a/src/Core/Ai/Generic/Value/PartyMemberToResurrect.cpp b/src/Bot/BaseAi/Value/PartyMemberToResurrect.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/PartyMemberToResurrect.cpp
rename to src/Bot/BaseAi/Value/PartyMemberToResurrect.cpp
diff --git a/src/Core/Ai/Generic/Value/PartyMemberToResurrect.h b/src/Bot/BaseAi/Value/PartyMemberToResurrect.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/PartyMemberToResurrect.h
rename to src/Bot/BaseAi/Value/PartyMemberToResurrect.h
diff --git a/src/Core/Ai/Generic/Value/PartyMemberValue.cpp b/src/Bot/BaseAi/Value/PartyMemberValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/PartyMemberValue.cpp
rename to src/Bot/BaseAi/Value/PartyMemberValue.cpp
diff --git a/src/Core/Ai/Generic/Value/PartyMemberValue.h b/src/Bot/BaseAi/Value/PartyMemberValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/PartyMemberValue.h
rename to src/Bot/BaseAi/Value/PartyMemberValue.h
diff --git a/src/Core/Ai/Generic/Value/PartyMemberWithoutAuraValue.cpp b/src/Bot/BaseAi/Value/PartyMemberWithoutAuraValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/PartyMemberWithoutAuraValue.cpp
rename to src/Bot/BaseAi/Value/PartyMemberWithoutAuraValue.cpp
diff --git a/src/Core/Ai/Generic/Value/PartyMemberWithoutAuraValue.h b/src/Bot/BaseAi/Value/PartyMemberWithoutAuraValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/PartyMemberWithoutAuraValue.h
rename to src/Bot/BaseAi/Value/PartyMemberWithoutAuraValue.h
diff --git a/src/Core/Ai/Generic/Value/PartyMemberWithoutItemValue.cpp b/src/Bot/BaseAi/Value/PartyMemberWithoutItemValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/PartyMemberWithoutItemValue.cpp
rename to src/Bot/BaseAi/Value/PartyMemberWithoutItemValue.cpp
diff --git a/src/Core/Ai/Generic/Value/PartyMemberWithoutItemValue.h b/src/Bot/BaseAi/Value/PartyMemberWithoutItemValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/PartyMemberWithoutItemValue.h
rename to src/Bot/BaseAi/Value/PartyMemberWithoutItemValue.h
diff --git a/src/Core/Ai/Generic/Value/PetTargetValue.cpp b/src/Bot/BaseAi/Value/PetTargetValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/PetTargetValue.cpp
rename to src/Bot/BaseAi/Value/PetTargetValue.cpp
diff --git a/src/Core/Ai/Generic/Value/PetTargetValue.h b/src/Bot/BaseAi/Value/PetTargetValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/PetTargetValue.h
rename to src/Bot/BaseAi/Value/PetTargetValue.h
diff --git a/src/Core/Ai/Generic/Value/PositionValue.cpp b/src/Bot/BaseAi/Value/PositionValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/PositionValue.cpp
rename to src/Bot/BaseAi/Value/PositionValue.cpp
diff --git a/src/Core/Ai/Generic/Value/PositionValue.h b/src/Bot/BaseAi/Value/PositionValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/PositionValue.h
rename to src/Bot/BaseAi/Value/PositionValue.h
diff --git a/src/Core/Ai/Generic/Value/PossibleRpgTargetsValue.cpp b/src/Bot/BaseAi/Value/PossibleRpgTargetsValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/PossibleRpgTargetsValue.cpp
rename to src/Bot/BaseAi/Value/PossibleRpgTargetsValue.cpp
diff --git a/src/Core/Ai/Generic/Value/PossibleRpgTargetsValue.h b/src/Bot/BaseAi/Value/PossibleRpgTargetsValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/PossibleRpgTargetsValue.h
rename to src/Bot/BaseAi/Value/PossibleRpgTargetsValue.h
diff --git a/src/Core/Ai/Generic/Value/PossibleTargetsValue.cpp b/src/Bot/BaseAi/Value/PossibleTargetsValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/PossibleTargetsValue.cpp
rename to src/Bot/BaseAi/Value/PossibleTargetsValue.cpp
diff --git a/src/Core/Ai/Generic/Value/PossibleTargetsValue.h b/src/Bot/BaseAi/Value/PossibleTargetsValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/PossibleTargetsValue.h
rename to src/Bot/BaseAi/Value/PossibleTargetsValue.h
diff --git a/src/Core/Ai/Generic/Value/PvpValues.cpp b/src/Bot/BaseAi/Value/PvpValues.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/PvpValues.cpp
rename to src/Bot/BaseAi/Value/PvpValues.cpp
diff --git a/src/Core/Ai/Generic/Value/PvpValues.h b/src/Bot/BaseAi/Value/PvpValues.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/PvpValues.h
rename to src/Bot/BaseAi/Value/PvpValues.h
diff --git a/src/Core/Ai/Generic/Value/QuestValues.cpp b/src/Bot/BaseAi/Value/QuestValues.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/QuestValues.cpp
rename to src/Bot/BaseAi/Value/QuestValues.cpp
diff --git a/src/Core/Ai/Generic/Value/QuestValues.h b/src/Bot/BaseAi/Value/QuestValues.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/QuestValues.h
rename to src/Bot/BaseAi/Value/QuestValues.h
diff --git a/src/Core/Ai/Generic/Value/RTSCValues.cpp b/src/Bot/BaseAi/Value/RTSCValues.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/RTSCValues.cpp
rename to src/Bot/BaseAi/Value/RTSCValues.cpp
diff --git a/src/Core/Ai/Generic/Value/RTSCValues.h b/src/Bot/BaseAi/Value/RTSCValues.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/RTSCValues.h
rename to src/Bot/BaseAi/Value/RTSCValues.h
diff --git a/src/Core/Ai/Generic/Value/RandomBotUpdateValue.h b/src/Bot/BaseAi/Value/RandomBotUpdateValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/RandomBotUpdateValue.h
rename to src/Bot/BaseAi/Value/RandomBotUpdateValue.h
diff --git a/src/Core/Ai/Generic/Value/RangeValues.cpp b/src/Bot/BaseAi/Value/RangeValues.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/RangeValues.cpp
rename to src/Bot/BaseAi/Value/RangeValues.cpp
diff --git a/src/Core/Ai/Generic/Value/RangeValues.h b/src/Bot/BaseAi/Value/RangeValues.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/RangeValues.h
rename to src/Bot/BaseAi/Value/RangeValues.h
diff --git a/src/Core/Ai/Generic/Value/RtiTargetValue.cpp b/src/Bot/BaseAi/Value/RtiTargetValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/RtiTargetValue.cpp
rename to src/Bot/BaseAi/Value/RtiTargetValue.cpp
diff --git a/src/Core/Ai/Generic/Value/RtiTargetValue.h b/src/Bot/BaseAi/Value/RtiTargetValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/RtiTargetValue.h
rename to src/Bot/BaseAi/Value/RtiTargetValue.h
diff --git a/src/Core/Ai/Generic/Value/RtiValue.cpp b/src/Bot/BaseAi/Value/RtiValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/RtiValue.cpp
rename to src/Bot/BaseAi/Value/RtiValue.cpp
diff --git a/src/Core/Ai/Generic/Value/RtiValue.h b/src/Bot/BaseAi/Value/RtiValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/RtiValue.h
rename to src/Bot/BaseAi/Value/RtiValue.h
diff --git a/src/Core/Ai/Generic/Value/SelfTargetValue.cpp b/src/Bot/BaseAi/Value/SelfTargetValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/SelfTargetValue.cpp
rename to src/Bot/BaseAi/Value/SelfTargetValue.cpp
diff --git a/src/Core/Ai/Generic/Value/SelfTargetValue.h b/src/Bot/BaseAi/Value/SelfTargetValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/SelfTargetValue.h
rename to src/Bot/BaseAi/Value/SelfTargetValue.h
diff --git a/src/Core/Ai/Generic/Value/SkipSpellsListValue.cpp b/src/Bot/BaseAi/Value/SkipSpellsListValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/SkipSpellsListValue.cpp
rename to src/Bot/BaseAi/Value/SkipSpellsListValue.cpp
diff --git a/src/Core/Ai/Generic/Value/SkipSpellsListValue.h b/src/Bot/BaseAi/Value/SkipSpellsListValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/SkipSpellsListValue.h
rename to src/Bot/BaseAi/Value/SkipSpellsListValue.h
diff --git a/src/Core/Ai/Generic/Value/SnareTargetValue.cpp b/src/Bot/BaseAi/Value/SnareTargetValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/SnareTargetValue.cpp
rename to src/Bot/BaseAi/Value/SnareTargetValue.cpp
diff --git a/src/Core/Ai/Generic/Value/SnareTargetValue.h b/src/Bot/BaseAi/Value/SnareTargetValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/SnareTargetValue.h
rename to src/Bot/BaseAi/Value/SnareTargetValue.h
diff --git a/src/Core/Ai/Generic/Value/SpellCastUsefulValue.cpp b/src/Bot/BaseAi/Value/SpellCastUsefulValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/SpellCastUsefulValue.cpp
rename to src/Bot/BaseAi/Value/SpellCastUsefulValue.cpp
diff --git a/src/Core/Ai/Generic/Value/SpellCastUsefulValue.h b/src/Bot/BaseAi/Value/SpellCastUsefulValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/SpellCastUsefulValue.h
rename to src/Bot/BaseAi/Value/SpellCastUsefulValue.h
diff --git a/src/Core/Ai/Generic/Value/SpellIdValue.cpp b/src/Bot/BaseAi/Value/SpellIdValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/SpellIdValue.cpp
rename to src/Bot/BaseAi/Value/SpellIdValue.cpp
diff --git a/src/Core/Ai/Generic/Value/SpellIdValue.h b/src/Bot/BaseAi/Value/SpellIdValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/SpellIdValue.h
rename to src/Bot/BaseAi/Value/SpellIdValue.h
diff --git a/src/Core/Ai/Generic/Value/Stances.cpp b/src/Bot/BaseAi/Value/Stances.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/Stances.cpp
rename to src/Bot/BaseAi/Value/Stances.cpp
diff --git a/src/Core/Ai/Generic/Value/Stances.h b/src/Bot/BaseAi/Value/Stances.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/Stances.h
rename to src/Bot/BaseAi/Value/Stances.h
diff --git a/src/Core/Ai/Generic/Value/StatsValues.cpp b/src/Bot/BaseAi/Value/StatsValues.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/StatsValues.cpp
rename to src/Bot/BaseAi/Value/StatsValues.cpp
diff --git a/src/Core/Ai/Generic/Value/StatsValues.h b/src/Bot/BaseAi/Value/StatsValues.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/StatsValues.h
rename to src/Bot/BaseAi/Value/StatsValues.h
diff --git a/src/Core/Ai/Generic/Value/TankTargetValue.cpp b/src/Bot/BaseAi/Value/TankTargetValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/TankTargetValue.cpp
rename to src/Bot/BaseAi/Value/TankTargetValue.cpp
diff --git a/src/Core/Ai/Generic/Value/TankTargetValue.h b/src/Bot/BaseAi/Value/TankTargetValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/TankTargetValue.h
rename to src/Bot/BaseAi/Value/TankTargetValue.h
diff --git a/src/Core/Ai/Generic/Value/TargetValue.cpp b/src/Bot/BaseAi/Value/TargetValue.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/TargetValue.cpp
rename to src/Bot/BaseAi/Value/TargetValue.cpp
diff --git a/src/Core/Ai/Generic/Value/TargetValue.h b/src/Bot/BaseAi/Value/TargetValue.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/TargetValue.h
rename to src/Bot/BaseAi/Value/TargetValue.h
diff --git a/src/Core/Ai/Generic/Value/ThreatValues.cpp b/src/Bot/BaseAi/Value/ThreatValues.cpp
similarity index 100%
rename from src/Core/Ai/Generic/Value/ThreatValues.cpp
rename to src/Bot/BaseAi/Value/ThreatValues.cpp
diff --git a/src/Core/Ai/Generic/Value/ThreatValues.h b/src/Bot/BaseAi/Value/ThreatValues.h
similarity index 100%
rename from src/Core/Ai/Generic/Value/ThreatValues.h
rename to src/Bot/BaseAi/Value/ThreatValues.h
diff --git a/src/Core/Ai/Generic/ValueContext.h b/src/Bot/BaseAi/ValueContext.h
similarity index 100%
rename from src/Core/Ai/Generic/ValueContext.h
rename to src/Bot/BaseAi/ValueContext.h
diff --git a/src/Core/Ai/Generic/WorldPacketActionContext.h b/src/Bot/BaseAi/WorldPacketActionContext.h
similarity index 100%
rename from src/Core/Ai/Generic/WorldPacketActionContext.h
rename to src/Bot/BaseAi/WorldPacketActionContext.h
diff --git a/src/Core/Ai/Generic/WorldPacketTriggerContext.h b/src/Bot/BaseAi/WorldPacketTriggerContext.h
similarity index 100%
rename from src/Core/Ai/Generic/WorldPacketTriggerContext.h
rename to src/Bot/BaseAi/WorldPacketTriggerContext.h
diff --git a/src/Core/Ai/Engine/Action/Action.cpp b/src/Bot/Engine/Action/Action.cpp
similarity index 100%
rename from src/Core/Ai/Engine/Action/Action.cpp
rename to src/Bot/Engine/Action/Action.cpp
diff --git a/src/Core/Ai/Engine/Action/Action.h b/src/Bot/Engine/Action/Action.h
similarity index 100%
rename from src/Core/Ai/Engine/Action/Action.h
rename to src/Bot/Engine/Action/Action.h
diff --git a/src/Core/Ai/Engine/AiObject.cpp b/src/Bot/Engine/AiObject.cpp
similarity index 100%
rename from src/Core/Ai/Engine/AiObject.cpp
rename to src/Bot/Engine/AiObject.cpp
diff --git a/src/Core/Ai/Engine/AiObject.h b/src/Bot/Engine/AiObject.h
similarity index 100%
rename from src/Core/Ai/Engine/AiObject.h
rename to src/Bot/Engine/AiObject.h
diff --git a/src/Core/Ai/Engine/AiObjectContext.cpp b/src/Bot/Engine/AiObjectContext.cpp
similarity index 85%
rename from src/Core/Ai/Engine/AiObjectContext.cpp
rename to src/Bot/Engine/AiObjectContext.cpp
index 8ce9b60b..b40add34 100644
--- a/src/Core/Ai/Engine/AiObjectContext.cpp
+++ b/src/Bot/Engine/AiObjectContext.cpp
@@ -27,32 +27,32 @@
 #include "WarriorAiObjectContext.h"
 #include "WorldPacketActionContext.h"
 #include "WorldPacketTriggerContext.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"
+#include "Scenario/DungeonAi/DungeonStrategyContext.h"
+#include "Scenario/DungeonAi/Wotlk/WotlkDungeonActionContext.h"
+#include "Scenario/DungeonAi/Wotlk/WotlkDungeonTriggerContext.h"
+#include "Scenario/RaidAi/RaidStrategyContext.h"
+#include "Scenario/RaidAi/Aq20/RaidAq20ActionContext.h"
+#include "Scenario/RaidAi/Aq20/RaidAq20TriggerContext.h"
+#include "Scenario/RaidAi/MoltenCore/RaidMcActionContext.h"
+#include "Scenario/RaidAi/MoltenCore/RaidMcTriggerContext.h"
+#include "Scenario/RaidAi/BlackwingLair/RaidBwlActionContext.h"
+#include "Scenario/RaidAi/BlackwingLair/RaidBwlTriggerContext.h"
+#include "Scenario/RaidAi/Karazhan/RaidKarazhanActionContext.h"
+#include "Scenario/RaidAi/Karazhan/RaidKarazhanTriggerContext.h"
+#include "Scenario/RaidAi/Magtheridon/RaidMagtheridonActionContext.h"
+#include "Scenario/RaidAi/Magtheridon/RaidMagtheridonTriggerContext.h"
+#include "Scenario/RaidAi/GruulsLair/RaidGruulsLairActionContext.h"
+#include "Scenario/RaidAi/GruulsLair/RaidGruulsLairTriggerContext.h"
+#include "Scenario/RaidAi/EyeOfEternity/RaidEoEActionContext.h"
+#include "Scenario/RaidAi/EyeOfEternity/RaidEoETriggerContext.h"
+#include "Scenario/RaidAi/VaultOfArchavon/RaidVoAActionContext.h"
+#include "Scenario/RaidAi/VaultOfArchavon/RaidVoATriggerContext.h"
+#include "Scenario/RaidAi/ObsidianSanctum/RaidOsActionContext.h"
+#include "Scenario/RaidAi/ObsidianSanctum/RaidOsTriggerContext.h"
+#include "Scenario/RaidAi/Onyxia/RaidOnyxiaActionContext.h"
+#include "Scenario/RaidAi/Onyxia/RaidOnyxiaTriggerContext.h"
+#include "Scenario/RaidAi/Icecrown/RaidIccActionContext.h"
+#include "Scenario/RaidAi/Icecrown/RaidIccTriggerContext.h"
 
 SharedNamedObjectContextList<Strategy> AiObjectContext::sharedStrategyContexts;
 SharedNamedObjectContextList<Action> AiObjectContext::sharedActionContexts;
diff --git a/src/Core/Ai/Engine/AiObjectContext.h b/src/Bot/Engine/AiObjectContext.h
similarity index 100%
rename from src/Core/Ai/Engine/AiObjectContext.h
rename to src/Bot/Engine/AiObjectContext.h
diff --git a/src/Core/Ai/Engine/Engine.cpp b/src/Bot/Engine/Engine.cpp
similarity index 100%
rename from src/Core/Ai/Engine/Engine.cpp
rename to src/Bot/Engine/Engine.cpp
diff --git a/src/Core/Ai/Engine/Engine.h b/src/Bot/Engine/Engine.h
similarity index 100%
rename from src/Core/Ai/Engine/Engine.h
rename to src/Bot/Engine/Engine.h
diff --git a/src/Core/Ai/Engine/ExternalEventHelper.cpp b/src/Bot/Engine/ExternalEventHelper.cpp
similarity index 100%
rename from src/Core/Ai/Engine/ExternalEventHelper.cpp
rename to src/Bot/Engine/ExternalEventHelper.cpp
diff --git a/src/Core/Ai/Engine/ExternalEventHelper.h b/src/Bot/Engine/ExternalEventHelper.h
similarity index 100%
rename from src/Core/Ai/Engine/ExternalEventHelper.h
rename to src/Bot/Engine/ExternalEventHelper.h
diff --git a/src/Core/Ai/Engine/Multiplier.h b/src/Bot/Engine/Multiplier.h
similarity index 100%
rename from src/Core/Ai/Engine/Multiplier.h
rename to src/Bot/Engine/Multiplier.h
diff --git a/src/Core/Ai/Engine/NamedObjectContext.cpp b/src/Bot/Engine/NamedObjectContext.cpp
similarity index 100%
rename from src/Core/Ai/Engine/NamedObjectContext.cpp
rename to src/Bot/Engine/NamedObjectContext.cpp
diff --git a/src/Core/Ai/Engine/NamedObjectContext.h b/src/Bot/Engine/NamedObjectContext.h
similarity index 100%
rename from src/Core/Ai/Engine/NamedObjectContext.h
rename to src/Bot/Engine/NamedObjectContext.h
diff --git a/src/Core/Ai/Engine/PassiveMultiplier.cpp b/src/Bot/Engine/PassiveMultiplier.cpp
similarity index 100%
rename from src/Core/Ai/Engine/PassiveMultiplier.cpp
rename to src/Bot/Engine/PassiveMultiplier.cpp
diff --git a/src/Core/Ai/Engine/PassiveMultiplier.h b/src/Bot/Engine/PassiveMultiplier.h
similarity index 100%
rename from src/Core/Ai/Engine/PassiveMultiplier.h
rename to src/Bot/Engine/PassiveMultiplier.h
diff --git a/src/Core/Ai/Engine/PlayerbotAIAware.h b/src/Bot/Engine/PlayerbotAIAware.h
similarity index 100%
rename from src/Core/Ai/Engine/PlayerbotAIAware.h
rename to src/Bot/Engine/PlayerbotAIAware.h
diff --git a/src/Core/Ai/Engine/PlayerbotAIBase.cpp b/src/Bot/Engine/PlayerbotAIBase.cpp
similarity index 100%
rename from src/Core/Ai/Engine/PlayerbotAIBase.cpp
rename to src/Bot/Engine/PlayerbotAIBase.cpp
diff --git a/src/Core/Ai/Engine/PlayerbotAIBase.h b/src/Bot/Engine/PlayerbotAIBase.h
similarity index 100%
rename from src/Core/Ai/Engine/PlayerbotAIBase.h
rename to src/Bot/Engine/PlayerbotAIBase.h
diff --git a/src/Core/Ai/Engine/Strategy/CustomStrategy.cpp b/src/Bot/Engine/Strategy/CustomStrategy.cpp
similarity index 100%
rename from src/Core/Ai/Engine/Strategy/CustomStrategy.cpp
rename to src/Bot/Engine/Strategy/CustomStrategy.cpp
diff --git a/src/Core/Ai/Engine/Strategy/CustomStrategy.h b/src/Bot/Engine/Strategy/CustomStrategy.h
similarity index 100%
rename from src/Core/Ai/Engine/Strategy/CustomStrategy.h
rename to src/Bot/Engine/Strategy/CustomStrategy.h
diff --git a/src/Core/Ai/Engine/Strategy/Strategy.cpp b/src/Bot/Engine/Strategy/Strategy.cpp
similarity index 100%
rename from src/Core/Ai/Engine/Strategy/Strategy.cpp
rename to src/Bot/Engine/Strategy/Strategy.cpp
diff --git a/src/Core/Ai/Engine/Strategy/Strategy.h b/src/Bot/Engine/Strategy/Strategy.h
similarity index 100%
rename from src/Core/Ai/Engine/Strategy/Strategy.h
rename to src/Bot/Engine/Strategy/Strategy.h
diff --git a/src/Core/Ai/Engine/Trigger/Trigger.cpp b/src/Bot/Engine/Trigger/Trigger.cpp
similarity index 100%
rename from src/Core/Ai/Engine/Trigger/Trigger.cpp
rename to src/Bot/Engine/Trigger/Trigger.cpp
diff --git a/src/Core/Ai/Engine/Trigger/Trigger.h b/src/Bot/Engine/Trigger/Trigger.h
similarity index 100%
rename from src/Core/Ai/Engine/Trigger/Trigger.h
rename to src/Bot/Engine/Trigger/Trigger.h
diff --git a/src/Core/Ai/Engine/Value/Value.cpp b/src/Bot/Engine/Value/Value.cpp
similarity index 100%
rename from src/Core/Ai/Engine/Value/Value.cpp
rename to src/Bot/Engine/Value/Value.cpp
diff --git a/src/Core/Ai/Engine/Value/Value.h b/src/Bot/Engine/Value/Value.h
similarity index 100%
rename from src/Core/Ai/Engine/Value/Value.h
rename to src/Bot/Engine/Value/Value.h
diff --git a/src/Core/Ai/Engine/WorldPacket/Event.cpp b/src/Bot/Engine/WorldPacket/Event.cpp
similarity index 100%
rename from src/Core/Ai/Engine/WorldPacket/Event.cpp
rename to src/Bot/Engine/WorldPacket/Event.cpp
diff --git a/src/Core/Ai/Engine/WorldPacket/Event.h b/src/Bot/Engine/WorldPacket/Event.h
similarity index 100%
rename from src/Core/Ai/Engine/WorldPacket/Event.h
rename to src/Bot/Engine/WorldPacket/Event.h
diff --git a/src/Core/Listener/ChatFilter.cpp b/src/Bot/Handler/Command/ChatFilter.cpp
similarity index 100%
rename from src/Core/Listener/ChatFilter.cpp
rename to src/Bot/Handler/Command/ChatFilter.cpp
diff --git a/src/Core/Listener/ChatFilter.h b/src/Bot/Handler/Command/ChatFilter.h
similarity index 100%
rename from src/Core/Listener/ChatFilter.h
rename to src/Bot/Handler/Command/ChatFilter.h
diff --git a/src/Core/Listener/ChatHelper.cpp b/src/Bot/Handler/Command/ChatHelper.cpp
similarity index 100%
rename from src/Core/Listener/ChatHelper.cpp
rename to src/Bot/Handler/Command/ChatHelper.cpp
diff --git a/src/Core/Listener/ChatHelper.h b/src/Bot/Handler/Command/ChatHelper.h
similarity index 100%
rename from src/Core/Listener/ChatHelper.h
rename to src/Bot/Handler/Command/ChatHelper.h
diff --git a/src/Core/Manager/Worldbot/PlayerbotCommandServer.cpp b/src/Bot/Handler/Command/PlayerbotCommandServer.cpp
similarity index 100%
rename from src/Core/Manager/Worldbot/PlayerbotCommandServer.cpp
rename to src/Bot/Handler/Command/PlayerbotCommandServer.cpp
diff --git a/src/Core/Manager/Worldbot/PlayerbotCommandServer.h b/src/Bot/Handler/Command/PlayerbotCommandServer.h
similarity index 100%
rename from src/Core/Manager/Worldbot/PlayerbotCommandServer.h
rename to src/Bot/Handler/Command/PlayerbotCommandServer.h
diff --git a/src/Core/Ai/AiFactory.cpp b/src/Bot/Handler/Factory/AiFactory.cpp
similarity index 100%
rename from src/Core/Ai/AiFactory.cpp
rename to src/Bot/Handler/Factory/AiFactory.cpp
diff --git a/src/Core/Ai/AiFactory.h b/src/Bot/Handler/Factory/AiFactory.h
similarity index 100%
rename from src/Core/Ai/AiFactory.h
rename to src/Bot/Handler/Factory/AiFactory.h
diff --git a/src/Core/Manager/Playerbot/Factory/PlayerbotFactory.cpp b/src/Bot/Handler/Factory/PlayerbotFactory.cpp
similarity index 100%
rename from src/Core/Manager/Playerbot/Factory/PlayerbotFactory.cpp
rename to src/Bot/Handler/Factory/PlayerbotFactory.cpp
diff --git a/src/Core/Manager/Playerbot/Factory/PlayerbotFactory.h b/src/Bot/Handler/Factory/PlayerbotFactory.h
similarity index 100%
rename from src/Core/Manager/Playerbot/Factory/PlayerbotFactory.h
rename to src/Bot/Handler/Factory/PlayerbotFactory.h
diff --git a/src/Core/Manager/Worldbot/Factory/RandomPlayerbotFactory.cpp b/src/Bot/Handler/Factory/RandomPlayerbotFactory.cpp
similarity index 100%
rename from src/Core/Manager/Worldbot/Factory/RandomPlayerbotFactory.cpp
rename to src/Bot/Handler/Factory/RandomPlayerbotFactory.cpp
diff --git a/src/Core/Manager/Worldbot/Factory/RandomPlayerbotFactory.h b/src/Bot/Handler/Factory/RandomPlayerbotFactory.h
similarity index 100%
rename from src/Core/Manager/Worldbot/Factory/RandomPlayerbotFactory.h
rename to src/Bot/Handler/Factory/RandomPlayerbotFactory.h
diff --git a/src/Core/Ai/PlayerbotAI.cpp b/src/Bot/Handler/PlayerbotAI.cpp
similarity index 100%
rename from src/Core/Ai/PlayerbotAI.cpp
rename to src/Bot/Handler/PlayerbotAI.cpp
diff --git a/src/Core/Ai/PlayerbotAI.h b/src/Bot/Handler/PlayerbotAI.h
similarity index 100%
rename from src/Core/Ai/PlayerbotAI.h
rename to src/Bot/Handler/PlayerbotAI.h
diff --git a/src/Core/Manager/Playerbot/PlayerbotMgr.cpp b/src/Bot/Handler/PlayerbotMgr.cpp
similarity index 100%
rename from src/Core/Manager/Playerbot/PlayerbotMgr.cpp
rename to src/Bot/Handler/PlayerbotMgr.cpp
diff --git a/src/Core/Manager/Playerbot/PlayerbotMgr.h b/src/Bot/Handler/PlayerbotMgr.h
similarity index 100%
rename from src/Core/Manager/Playerbot/PlayerbotMgr.h
rename to src/Bot/Handler/PlayerbotMgr.h
diff --git a/src/Core/Manager/Worldbot/RandomPlayerbotMgr.cpp b/src/Bot/Handler/RandomPlayerbotMgr.cpp
similarity index 100%
rename from src/Core/Manager/Worldbot/RandomPlayerbotMgr.cpp
rename to src/Bot/Handler/RandomPlayerbotMgr.cpp
diff --git a/src/Core/Manager/Worldbot/RandomPlayerbotMgr.h b/src/Bot/Handler/RandomPlayerbotMgr.h
similarity index 100%
rename from src/Core/Manager/Worldbot/RandomPlayerbotMgr.h
rename to src/Bot/Handler/RandomPlayerbotMgr.h
diff --git a/src/Repository/PlayerbotDungeonRepository.cpp b/src/Database/PlayerbotDungeonRepository.cpp
similarity index 100%
rename from src/Repository/PlayerbotDungeonRepository.cpp
rename to src/Database/PlayerbotDungeonRepository.cpp
diff --git a/src/Repository/PlayerbotDungeonRepository.h b/src/Database/PlayerbotDungeonRepository.h
similarity index 100%
rename from src/Repository/PlayerbotDungeonRepository.h
rename to src/Database/PlayerbotDungeonRepository.h
diff --git a/src/Repository/PlayerbotRepository.cpp b/src/Database/PlayerbotRepository.cpp
similarity index 100%
rename from src/Repository/PlayerbotRepository.cpp
rename to src/Database/PlayerbotRepository.cpp
diff --git a/src/Repository/PlayerbotRepository.h b/src/Database/PlayerbotRepository.h
similarity index 100%
rename from src/Repository/PlayerbotRepository.h
rename to src/Database/PlayerbotRepository.h
diff --git a/src/Repository/PlayerbotSpellRepository.cpp b/src/Database/PlayerbotSpellRepository.cpp
similarity index 100%
rename from src/Repository/PlayerbotSpellRepository.cpp
rename to src/Database/PlayerbotSpellRepository.cpp
diff --git a/src/Repository/PlayerbotSpellRepository.h b/src/Database/PlayerbotSpellRepository.h
similarity index 100%
rename from src/Repository/PlayerbotSpellRepository.h
rename to src/Database/PlayerbotSpellRepository.h
diff --git a/src/Extend/ClassAi/DeathKnight/Action/DKActions.cpp b/src/Scenario/ClassAi/DeathKnight/Action/DKActions.cpp
similarity index 100%
rename from src/Extend/ClassAi/DeathKnight/Action/DKActions.cpp
rename to src/Scenario/ClassAi/DeathKnight/Action/DKActions.cpp
diff --git a/src/Extend/ClassAi/DeathKnight/Action/DKActions.h b/src/Scenario/ClassAi/DeathKnight/Action/DKActions.h
similarity index 100%
rename from src/Extend/ClassAi/DeathKnight/Action/DKActions.h
rename to src/Scenario/ClassAi/DeathKnight/Action/DKActions.h
diff --git a/src/Extend/ClassAi/DeathKnight/DKAiObjectContext.cpp b/src/Scenario/ClassAi/DeathKnight/DKAiObjectContext.cpp
similarity index 100%
rename from src/Extend/ClassAi/DeathKnight/DKAiObjectContext.cpp
rename to src/Scenario/ClassAi/DeathKnight/DKAiObjectContext.cpp
diff --git a/src/Extend/ClassAi/DeathKnight/DKAiObjectContext.h b/src/Scenario/ClassAi/DeathKnight/DKAiObjectContext.h
similarity index 100%
rename from src/Extend/ClassAi/DeathKnight/DKAiObjectContext.h
rename to src/Scenario/ClassAi/DeathKnight/DKAiObjectContext.h
diff --git a/src/Extend/ClassAi/DeathKnight/Strategy/BloodDKStrategy.cpp b/src/Scenario/ClassAi/DeathKnight/Strategy/BloodDKStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/DeathKnight/Strategy/BloodDKStrategy.cpp
rename to src/Scenario/ClassAi/DeathKnight/Strategy/BloodDKStrategy.cpp
diff --git a/src/Extend/ClassAi/DeathKnight/Strategy/BloodDKStrategy.h b/src/Scenario/ClassAi/DeathKnight/Strategy/BloodDKStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/DeathKnight/Strategy/BloodDKStrategy.h
rename to src/Scenario/ClassAi/DeathKnight/Strategy/BloodDKStrategy.h
diff --git a/src/Extend/ClassAi/DeathKnight/Strategy/FrostDKStrategy.cpp b/src/Scenario/ClassAi/DeathKnight/Strategy/FrostDKStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/DeathKnight/Strategy/FrostDKStrategy.cpp
rename to src/Scenario/ClassAi/DeathKnight/Strategy/FrostDKStrategy.cpp
diff --git a/src/Extend/ClassAi/DeathKnight/Strategy/FrostDKStrategy.h b/src/Scenario/ClassAi/DeathKnight/Strategy/FrostDKStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/DeathKnight/Strategy/FrostDKStrategy.h
rename to src/Scenario/ClassAi/DeathKnight/Strategy/FrostDKStrategy.h
diff --git a/src/Extend/ClassAi/DeathKnight/Strategy/GenericDKNonCombatStrategy.cpp b/src/Scenario/ClassAi/DeathKnight/Strategy/GenericDKNonCombatStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/DeathKnight/Strategy/GenericDKNonCombatStrategy.cpp
rename to src/Scenario/ClassAi/DeathKnight/Strategy/GenericDKNonCombatStrategy.cpp
diff --git a/src/Extend/ClassAi/DeathKnight/Strategy/GenericDKNonCombatStrategy.h b/src/Scenario/ClassAi/DeathKnight/Strategy/GenericDKNonCombatStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/DeathKnight/Strategy/GenericDKNonCombatStrategy.h
rename to src/Scenario/ClassAi/DeathKnight/Strategy/GenericDKNonCombatStrategy.h
diff --git a/src/Extend/ClassAi/DeathKnight/Strategy/GenericDKStrategy.cpp b/src/Scenario/ClassAi/DeathKnight/Strategy/GenericDKStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/DeathKnight/Strategy/GenericDKStrategy.cpp
rename to src/Scenario/ClassAi/DeathKnight/Strategy/GenericDKStrategy.cpp
diff --git a/src/Extend/ClassAi/DeathKnight/Strategy/GenericDKStrategy.h b/src/Scenario/ClassAi/DeathKnight/Strategy/GenericDKStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/DeathKnight/Strategy/GenericDKStrategy.h
rename to src/Scenario/ClassAi/DeathKnight/Strategy/GenericDKStrategy.h
diff --git a/src/Extend/ClassAi/DeathKnight/Strategy/UnholyDKStrategy.cpp b/src/Scenario/ClassAi/DeathKnight/Strategy/UnholyDKStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/DeathKnight/Strategy/UnholyDKStrategy.cpp
rename to src/Scenario/ClassAi/DeathKnight/Strategy/UnholyDKStrategy.cpp
diff --git a/src/Extend/ClassAi/DeathKnight/Strategy/UnholyDKStrategy.h b/src/Scenario/ClassAi/DeathKnight/Strategy/UnholyDKStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/DeathKnight/Strategy/UnholyDKStrategy.h
rename to src/Scenario/ClassAi/DeathKnight/Strategy/UnholyDKStrategy.h
diff --git a/src/Extend/ClassAi/DeathKnight/Trigger/DKTriggers.cpp b/src/Scenario/ClassAi/DeathKnight/Trigger/DKTriggers.cpp
similarity index 100%
rename from src/Extend/ClassAi/DeathKnight/Trigger/DKTriggers.cpp
rename to src/Scenario/ClassAi/DeathKnight/Trigger/DKTriggers.cpp
diff --git a/src/Extend/ClassAi/DeathKnight/Trigger/DKTriggers.h b/src/Scenario/ClassAi/DeathKnight/Trigger/DKTriggers.h
similarity index 100%
rename from src/Extend/ClassAi/DeathKnight/Trigger/DKTriggers.h
rename to src/Scenario/ClassAi/DeathKnight/Trigger/DKTriggers.h
diff --git a/src/Extend/ClassAi/Druid/Action/DruidActions.cpp b/src/Scenario/ClassAi/Druid/Action/DruidActions.cpp
similarity index 100%
rename from src/Extend/ClassAi/Druid/Action/DruidActions.cpp
rename to src/Scenario/ClassAi/Druid/Action/DruidActions.cpp
diff --git a/src/Extend/ClassAi/Druid/Action/DruidActions.h b/src/Scenario/ClassAi/Druid/Action/DruidActions.h
similarity index 100%
rename from src/Extend/ClassAi/Druid/Action/DruidActions.h
rename to src/Scenario/ClassAi/Druid/Action/DruidActions.h
diff --git a/src/Extend/ClassAi/Druid/Action/DruidBearActions.cpp b/src/Scenario/ClassAi/Druid/Action/DruidBearActions.cpp
similarity index 100%
rename from src/Extend/ClassAi/Druid/Action/DruidBearActions.cpp
rename to src/Scenario/ClassAi/Druid/Action/DruidBearActions.cpp
diff --git a/src/Extend/ClassAi/Druid/Action/DruidBearActions.h b/src/Scenario/ClassAi/Druid/Action/DruidBearActions.h
similarity index 100%
rename from src/Extend/ClassAi/Druid/Action/DruidBearActions.h
rename to src/Scenario/ClassAi/Druid/Action/DruidBearActions.h
diff --git a/src/Extend/ClassAi/Druid/Action/DruidCatActions.cpp b/src/Scenario/ClassAi/Druid/Action/DruidCatActions.cpp
similarity index 100%
rename from src/Extend/ClassAi/Druid/Action/DruidCatActions.cpp
rename to src/Scenario/ClassAi/Druid/Action/DruidCatActions.cpp
diff --git a/src/Extend/ClassAi/Druid/Action/DruidCatActions.h b/src/Scenario/ClassAi/Druid/Action/DruidCatActions.h
similarity index 100%
rename from src/Extend/ClassAi/Druid/Action/DruidCatActions.h
rename to src/Scenario/ClassAi/Druid/Action/DruidCatActions.h
diff --git a/src/Extend/ClassAi/Druid/Action/DruidShapeshiftActions.cpp b/src/Scenario/ClassAi/Druid/Action/DruidShapeshiftActions.cpp
similarity index 100%
rename from src/Extend/ClassAi/Druid/Action/DruidShapeshiftActions.cpp
rename to src/Scenario/ClassAi/Druid/Action/DruidShapeshiftActions.cpp
diff --git a/src/Extend/ClassAi/Druid/Action/DruidShapeshiftActions.h b/src/Scenario/ClassAi/Druid/Action/DruidShapeshiftActions.h
similarity index 100%
rename from src/Extend/ClassAi/Druid/Action/DruidShapeshiftActions.h
rename to src/Scenario/ClassAi/Druid/Action/DruidShapeshiftActions.h
diff --git a/src/Extend/ClassAi/Druid/DruidAiObjectContext.cpp b/src/Scenario/ClassAi/Druid/DruidAiObjectContext.cpp
similarity index 100%
rename from src/Extend/ClassAi/Druid/DruidAiObjectContext.cpp
rename to src/Scenario/ClassAi/Druid/DruidAiObjectContext.cpp
diff --git a/src/Extend/ClassAi/Druid/DruidAiObjectContext.h b/src/Scenario/ClassAi/Druid/DruidAiObjectContext.h
similarity index 100%
rename from src/Extend/ClassAi/Druid/DruidAiObjectContext.h
rename to src/Scenario/ClassAi/Druid/DruidAiObjectContext.h
diff --git a/src/Extend/ClassAi/Druid/Strategy/BearTankDruidStrategy.cpp b/src/Scenario/ClassAi/Druid/Strategy/BearTankDruidStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Druid/Strategy/BearTankDruidStrategy.cpp
rename to src/Scenario/ClassAi/Druid/Strategy/BearTankDruidStrategy.cpp
diff --git a/src/Extend/ClassAi/Druid/Strategy/BearTankDruidStrategy.h b/src/Scenario/ClassAi/Druid/Strategy/BearTankDruidStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Druid/Strategy/BearTankDruidStrategy.h
rename to src/Scenario/ClassAi/Druid/Strategy/BearTankDruidStrategy.h
diff --git a/src/Extend/ClassAi/Druid/Strategy/CasterDruidStrategy.cpp b/src/Scenario/ClassAi/Druid/Strategy/CasterDruidStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Druid/Strategy/CasterDruidStrategy.cpp
rename to src/Scenario/ClassAi/Druid/Strategy/CasterDruidStrategy.cpp
diff --git a/src/Extend/ClassAi/Druid/Strategy/CasterDruidStrategy.h b/src/Scenario/ClassAi/Druid/Strategy/CasterDruidStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Druid/Strategy/CasterDruidStrategy.h
rename to src/Scenario/ClassAi/Druid/Strategy/CasterDruidStrategy.h
diff --git a/src/Extend/ClassAi/Druid/Strategy/CatDpsDruidStrategy.cpp b/src/Scenario/ClassAi/Druid/Strategy/CatDpsDruidStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Druid/Strategy/CatDpsDruidStrategy.cpp
rename to src/Scenario/ClassAi/Druid/Strategy/CatDpsDruidStrategy.cpp
diff --git a/src/Extend/ClassAi/Druid/Strategy/CatDpsDruidStrategy.h b/src/Scenario/ClassAi/Druid/Strategy/CatDpsDruidStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Druid/Strategy/CatDpsDruidStrategy.h
rename to src/Scenario/ClassAi/Druid/Strategy/CatDpsDruidStrategy.h
diff --git a/src/Extend/ClassAi/Druid/Strategy/FeralDruidStrategy.cpp b/src/Scenario/ClassAi/Druid/Strategy/FeralDruidStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Druid/Strategy/FeralDruidStrategy.cpp
rename to src/Scenario/ClassAi/Druid/Strategy/FeralDruidStrategy.cpp
diff --git a/src/Extend/ClassAi/Druid/Strategy/FeralDruidStrategy.h b/src/Scenario/ClassAi/Druid/Strategy/FeralDruidStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Druid/Strategy/FeralDruidStrategy.h
rename to src/Scenario/ClassAi/Druid/Strategy/FeralDruidStrategy.h
diff --git a/src/Extend/ClassAi/Druid/Strategy/GenericDruidNonCombatStrategy.cpp b/src/Scenario/ClassAi/Druid/Strategy/GenericDruidNonCombatStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Druid/Strategy/GenericDruidNonCombatStrategy.cpp
rename to src/Scenario/ClassAi/Druid/Strategy/GenericDruidNonCombatStrategy.cpp
diff --git a/src/Extend/ClassAi/Druid/Strategy/GenericDruidNonCombatStrategy.h b/src/Scenario/ClassAi/Druid/Strategy/GenericDruidNonCombatStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Druid/Strategy/GenericDruidNonCombatStrategy.h
rename to src/Scenario/ClassAi/Druid/Strategy/GenericDruidNonCombatStrategy.h
diff --git a/src/Extend/ClassAi/Druid/Strategy/GenericDruidStrategy.cpp b/src/Scenario/ClassAi/Druid/Strategy/GenericDruidStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Druid/Strategy/GenericDruidStrategy.cpp
rename to src/Scenario/ClassAi/Druid/Strategy/GenericDruidStrategy.cpp
diff --git a/src/Extend/ClassAi/Druid/Strategy/GenericDruidStrategy.h b/src/Scenario/ClassAi/Druid/Strategy/GenericDruidStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Druid/Strategy/GenericDruidStrategy.h
rename to src/Scenario/ClassAi/Druid/Strategy/GenericDruidStrategy.h
diff --git a/src/Extend/ClassAi/Druid/Strategy/HealDruidStrategy.cpp b/src/Scenario/ClassAi/Druid/Strategy/HealDruidStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Druid/Strategy/HealDruidStrategy.cpp
rename to src/Scenario/ClassAi/Druid/Strategy/HealDruidStrategy.cpp
diff --git a/src/Extend/ClassAi/Druid/Strategy/HealDruidStrategy.h b/src/Scenario/ClassAi/Druid/Strategy/HealDruidStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Druid/Strategy/HealDruidStrategy.h
rename to src/Scenario/ClassAi/Druid/Strategy/HealDruidStrategy.h
diff --git a/src/Extend/ClassAi/Druid/Strategy/MeleeDruidStrategy.cpp b/src/Scenario/ClassAi/Druid/Strategy/MeleeDruidStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Druid/Strategy/MeleeDruidStrategy.cpp
rename to src/Scenario/ClassAi/Druid/Strategy/MeleeDruidStrategy.cpp
diff --git a/src/Extend/ClassAi/Druid/Strategy/MeleeDruidStrategy.h b/src/Scenario/ClassAi/Druid/Strategy/MeleeDruidStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Druid/Strategy/MeleeDruidStrategy.h
rename to src/Scenario/ClassAi/Druid/Strategy/MeleeDruidStrategy.h
diff --git a/src/Extend/ClassAi/Druid/Strategy/OffhealDruidCatStrategy.cpp b/src/Scenario/ClassAi/Druid/Strategy/OffhealDruidCatStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Druid/Strategy/OffhealDruidCatStrategy.cpp
rename to src/Scenario/ClassAi/Druid/Strategy/OffhealDruidCatStrategy.cpp
diff --git a/src/Extend/ClassAi/Druid/Strategy/OffhealDruidCatStrategy.h b/src/Scenario/ClassAi/Druid/Strategy/OffhealDruidCatStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Druid/Strategy/OffhealDruidCatStrategy.h
rename to src/Scenario/ClassAi/Druid/Strategy/OffhealDruidCatStrategy.h
diff --git a/src/Extend/ClassAi/Druid/Trigger/DruidTriggers.cpp b/src/Scenario/ClassAi/Druid/Trigger/DruidTriggers.cpp
similarity index 100%
rename from src/Extend/ClassAi/Druid/Trigger/DruidTriggers.cpp
rename to src/Scenario/ClassAi/Druid/Trigger/DruidTriggers.cpp
diff --git a/src/Extend/ClassAi/Druid/Trigger/DruidTriggers.h b/src/Scenario/ClassAi/Druid/Trigger/DruidTriggers.h
similarity index 100%
rename from src/Extend/ClassAi/Druid/Trigger/DruidTriggers.h
rename to src/Scenario/ClassAi/Druid/Trigger/DruidTriggers.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/AttackEnemyPlayersStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/AttackEnemyPlayersStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/AttackEnemyPlayersStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/AttackEnemyPlayersStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/AttackEnemyPlayersStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/AttackEnemyPlayersStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/AttackEnemyPlayersStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/AttackEnemyPlayersStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/BattlegroundStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/BattlegroundStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/BattlegroundStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/BattlegroundStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/BattlegroundStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/BattlegroundStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/BattlegroundStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/BattlegroundStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/CastTimeStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/CastTimeStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/CastTimeStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/CastTimeStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/CastTimeStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/CastTimeStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/CastTimeStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/CastTimeStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/ChatCommandHandlerStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/ChatCommandHandlerStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/ChatCommandHandlerStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/ChatCommandHandlerStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/ChatCommandHandlerStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/ChatCommandHandlerStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/ChatCommandHandlerStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/ChatCommandHandlerStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/CombatStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/CombatStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/CombatStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/CombatStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/CombatStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/CombatStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/CombatStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/CombatStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/ConserveManaStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/ConserveManaStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/ConserveManaStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/ConserveManaStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/ConserveManaStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/ConserveManaStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/ConserveManaStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/ConserveManaStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/DeadStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/DeadStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/DeadStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/DeadStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/DeadStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/DeadStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/DeadStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/DeadStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/DebugStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/DebugStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/DebugStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/DebugStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/DebugStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/DebugStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/DebugStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/DebugStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/DpsAssistStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/DpsAssistStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/DpsAssistStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/DpsAssistStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/DpsAssistStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/DpsAssistStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/DpsAssistStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/DpsAssistStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/DuelStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/DuelStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/DuelStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/DuelStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/DuelStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/DuelStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/DuelStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/DuelStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/EmoteStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/EmoteStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/EmoteStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/EmoteStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/EmoteStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/EmoteStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/EmoteStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/EmoteStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/FleeStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/FleeStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/FleeStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/FleeStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/FleeStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/FleeStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/FleeStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/FleeStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/FollowMasterStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/FollowMasterStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/FollowMasterStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/FollowMasterStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/FollowMasterStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/FollowMasterStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/FollowMasterStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/FollowMasterStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/GrindingStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/GrindingStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/GrindingStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/GrindingStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/GrindingStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/GrindingStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/GrindingStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/GrindingStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/GroupStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/GroupStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/GroupStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/GroupStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/GroupStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/GroupStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/GroupStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/GroupStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/GuardStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/GuardStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/GuardStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/GuardStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/GuardStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/GuardStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/GuardStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/GuardStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/GuildStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/GuildStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/GuildStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/GuildStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/GuildStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/GuildStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/GuildStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/GuildStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/KiteStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/KiteStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/KiteStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/KiteStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/KiteStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/KiteStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/KiteStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/KiteStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/LfgStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/LfgStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/LfgStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/LfgStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/LfgStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/LfgStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/LfgStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/LfgStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/LootNonCombatStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/LootNonCombatStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/LootNonCombatStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/LootNonCombatStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/LootNonCombatStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/LootNonCombatStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/LootNonCombatStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/LootNonCombatStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/MaintenanceStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/MaintenanceStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/MaintenanceStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/MaintenanceStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/MaintenanceStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/MaintenanceStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/MaintenanceStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/MaintenanceStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/MarkRtiStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/MarkRtiStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/MarkRtiStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/MarkRtiStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/MarkRtiStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/MarkRtiStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/MarkRtiStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/MarkRtiStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/MeleeCombatStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/MeleeCombatStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/MeleeCombatStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/MeleeCombatStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/MeleeCombatStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/MeleeCombatStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/MeleeCombatStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/MeleeCombatStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/MoveFromGroupStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/MoveFromGroupStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/MoveFromGroupStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/MoveFromGroupStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/MoveFromGroupStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/MoveFromGroupStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/MoveFromGroupStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/MoveFromGroupStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/NonCombatStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/NonCombatStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/NonCombatStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/NonCombatStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/NonCombatStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/NonCombatStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/NonCombatStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/NonCombatStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/PassTroughStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/PassTroughStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/PassTroughStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/PassTroughStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/PassTroughStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/PassTroughStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/PassTroughStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/PassTroughStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/PassiveStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/PassiveStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/PassiveStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/PassiveStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/PassiveStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/PassiveStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/PassiveStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/PassiveStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/PullStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/PullStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/PullStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/PullStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/PullStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/PullStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/PullStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/PullStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/QuestStrategies.cpp b/src/Scenario/ClassAi/Generic/Strategy/QuestStrategies.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/QuestStrategies.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/QuestStrategies.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/QuestStrategies.h b/src/Scenario/ClassAi/Generic/Strategy/QuestStrategies.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/QuestStrategies.h
rename to src/Scenario/ClassAi/Generic/Strategy/QuestStrategies.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/RTSCStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/RTSCStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/RTSCStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/RTSCStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/RTSCStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/RTSCStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/RTSCStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/RTSCStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/RacialsStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/RacialsStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/RacialsStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/RacialsStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/RacialsStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/RacialsStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/RacialsStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/RacialsStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/RangedCombatStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/RangedCombatStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/RangedCombatStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/RangedCombatStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/RangedCombatStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/RangedCombatStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/RangedCombatStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/RangedCombatStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/ReturnStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/ReturnStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/ReturnStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/ReturnStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/ReturnStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/ReturnStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/ReturnStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/ReturnStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/RpgStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/RpgStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/RpgStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/RpgStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/RpgStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/RpgStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/RpgStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/RpgStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/RunawayStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/RunawayStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/RunawayStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/RunawayStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/RunawayStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/RunawayStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/RunawayStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/RunawayStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/SayStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/SayStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/SayStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/SayStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/SayStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/SayStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/SayStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/SayStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/StayStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/StayStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/StayStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/StayStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/StayStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/StayStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/StayStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/StayStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/TankAssistStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/TankAssistStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/TankAssistStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/TankAssistStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/TankAssistStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/TankAssistStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/TankAssistStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/TankAssistStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/TellTargetStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/TellTargetStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/TellTargetStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/TellTargetStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/TellTargetStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/TellTargetStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/TellTargetStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/TellTargetStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/ThreatStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/ThreatStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/ThreatStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/ThreatStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/ThreatStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/ThreatStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/ThreatStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/ThreatStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/TravelStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/TravelStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/TravelStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/TravelStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/TravelStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/TravelStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/TravelStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/TravelStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/UseFoodStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/UseFoodStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/UseFoodStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/UseFoodStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/UseFoodStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/UseFoodStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/UseFoodStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/UseFoodStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/UsePotionsStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/UsePotionsStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/UsePotionsStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/UsePotionsStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/UsePotionsStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/UsePotionsStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/UsePotionsStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/UsePotionsStrategy.h
diff --git a/src/Extend/ClassAi/Generic/Strategy/WorldPacketHandlerStrategy.cpp b/src/Scenario/ClassAi/Generic/Strategy/WorldPacketHandlerStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/WorldPacketHandlerStrategy.cpp
rename to src/Scenario/ClassAi/Generic/Strategy/WorldPacketHandlerStrategy.cpp
diff --git a/src/Extend/ClassAi/Generic/Strategy/WorldPacketHandlerStrategy.h b/src/Scenario/ClassAi/Generic/Strategy/WorldPacketHandlerStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/Strategy/WorldPacketHandlerStrategy.h
rename to src/Scenario/ClassAi/Generic/Strategy/WorldPacketHandlerStrategy.h
diff --git a/src/Extend/ClassAi/Generic/StrategyContext.h b/src/Scenario/ClassAi/Generic/StrategyContext.h
similarity index 100%
rename from src/Extend/ClassAi/Generic/StrategyContext.h
rename to src/Scenario/ClassAi/Generic/StrategyContext.h
diff --git a/src/Extend/ClassAi/Hunter/Action/HunterActions.cpp b/src/Scenario/ClassAi/Hunter/Action/HunterActions.cpp
similarity index 100%
rename from src/Extend/ClassAi/Hunter/Action/HunterActions.cpp
rename to src/Scenario/ClassAi/Hunter/Action/HunterActions.cpp
diff --git a/src/Extend/ClassAi/Hunter/Action/HunterActions.h b/src/Scenario/ClassAi/Hunter/Action/HunterActions.h
similarity index 100%
rename from src/Extend/ClassAi/Hunter/Action/HunterActions.h
rename to src/Scenario/ClassAi/Hunter/Action/HunterActions.h
diff --git a/src/Extend/ClassAi/Hunter/HunterAiObjectContext.cpp b/src/Scenario/ClassAi/Hunter/HunterAiObjectContext.cpp
similarity index 100%
rename from src/Extend/ClassAi/Hunter/HunterAiObjectContext.cpp
rename to src/Scenario/ClassAi/Hunter/HunterAiObjectContext.cpp
diff --git a/src/Extend/ClassAi/Hunter/HunterAiObjectContext.h b/src/Scenario/ClassAi/Hunter/HunterAiObjectContext.h
similarity index 100%
rename from src/Extend/ClassAi/Hunter/HunterAiObjectContext.h
rename to src/Scenario/ClassAi/Hunter/HunterAiObjectContext.h
diff --git a/src/Extend/ClassAi/Hunter/Strategy/BeastMasteryHunterStrategy.cpp b/src/Scenario/ClassAi/Hunter/Strategy/BeastMasteryHunterStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Hunter/Strategy/BeastMasteryHunterStrategy.cpp
rename to src/Scenario/ClassAi/Hunter/Strategy/BeastMasteryHunterStrategy.cpp
diff --git a/src/Extend/ClassAi/Hunter/Strategy/BeastMasteryHunterStrategy.h b/src/Scenario/ClassAi/Hunter/Strategy/BeastMasteryHunterStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Hunter/Strategy/BeastMasteryHunterStrategy.h
rename to src/Scenario/ClassAi/Hunter/Strategy/BeastMasteryHunterStrategy.h
diff --git a/src/Extend/ClassAi/Hunter/Strategy/GenericHunterNonCombatStrategy.cpp b/src/Scenario/ClassAi/Hunter/Strategy/GenericHunterNonCombatStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Hunter/Strategy/GenericHunterNonCombatStrategy.cpp
rename to src/Scenario/ClassAi/Hunter/Strategy/GenericHunterNonCombatStrategy.cpp
diff --git a/src/Extend/ClassAi/Hunter/Strategy/GenericHunterNonCombatStrategy.h b/src/Scenario/ClassAi/Hunter/Strategy/GenericHunterNonCombatStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Hunter/Strategy/GenericHunterNonCombatStrategy.h
rename to src/Scenario/ClassAi/Hunter/Strategy/GenericHunterNonCombatStrategy.h
diff --git a/src/Extend/ClassAi/Hunter/Strategy/GenericHunterStrategy.cpp b/src/Scenario/ClassAi/Hunter/Strategy/GenericHunterStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Hunter/Strategy/GenericHunterStrategy.cpp
rename to src/Scenario/ClassAi/Hunter/Strategy/GenericHunterStrategy.cpp
diff --git a/src/Extend/ClassAi/Hunter/Strategy/GenericHunterStrategy.h b/src/Scenario/ClassAi/Hunter/Strategy/GenericHunterStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Hunter/Strategy/GenericHunterStrategy.h
rename to src/Scenario/ClassAi/Hunter/Strategy/GenericHunterStrategy.h
diff --git a/src/Extend/ClassAi/Hunter/Strategy/HunterBuffStrategies.cpp b/src/Scenario/ClassAi/Hunter/Strategy/HunterBuffStrategies.cpp
similarity index 100%
rename from src/Extend/ClassAi/Hunter/Strategy/HunterBuffStrategies.cpp
rename to src/Scenario/ClassAi/Hunter/Strategy/HunterBuffStrategies.cpp
diff --git a/src/Extend/ClassAi/Hunter/Strategy/HunterBuffStrategies.h b/src/Scenario/ClassAi/Hunter/Strategy/HunterBuffStrategies.h
similarity index 100%
rename from src/Extend/ClassAi/Hunter/Strategy/HunterBuffStrategies.h
rename to src/Scenario/ClassAi/Hunter/Strategy/HunterBuffStrategies.h
diff --git a/src/Extend/ClassAi/Hunter/Strategy/MarksmanshipHunterStrategy.cpp b/src/Scenario/ClassAi/Hunter/Strategy/MarksmanshipHunterStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Hunter/Strategy/MarksmanshipHunterStrategy.cpp
rename to src/Scenario/ClassAi/Hunter/Strategy/MarksmanshipHunterStrategy.cpp
diff --git a/src/Extend/ClassAi/Hunter/Strategy/MarksmanshipHunterStrategy.h b/src/Scenario/ClassAi/Hunter/Strategy/MarksmanshipHunterStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Hunter/Strategy/MarksmanshipHunterStrategy.h
rename to src/Scenario/ClassAi/Hunter/Strategy/MarksmanshipHunterStrategy.h
diff --git a/src/Extend/ClassAi/Hunter/Strategy/SurvivalHunterStrategy.cpp b/src/Scenario/ClassAi/Hunter/Strategy/SurvivalHunterStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Hunter/Strategy/SurvivalHunterStrategy.cpp
rename to src/Scenario/ClassAi/Hunter/Strategy/SurvivalHunterStrategy.cpp
diff --git a/src/Extend/ClassAi/Hunter/Strategy/SurvivalHunterStrategy.h b/src/Scenario/ClassAi/Hunter/Strategy/SurvivalHunterStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Hunter/Strategy/SurvivalHunterStrategy.h
rename to src/Scenario/ClassAi/Hunter/Strategy/SurvivalHunterStrategy.h
diff --git a/src/Extend/ClassAi/Hunter/Trigger/HunterTriggers.cpp b/src/Scenario/ClassAi/Hunter/Trigger/HunterTriggers.cpp
similarity index 100%
rename from src/Extend/ClassAi/Hunter/Trigger/HunterTriggers.cpp
rename to src/Scenario/ClassAi/Hunter/Trigger/HunterTriggers.cpp
diff --git a/src/Extend/ClassAi/Hunter/Trigger/HunterTriggers.h b/src/Scenario/ClassAi/Hunter/Trigger/HunterTriggers.h
similarity index 100%
rename from src/Extend/ClassAi/Hunter/Trigger/HunterTriggers.h
rename to src/Scenario/ClassAi/Hunter/Trigger/HunterTriggers.h
diff --git a/src/Extend/ClassAi/Mage/Action/MageActions.cpp b/src/Scenario/ClassAi/Mage/Action/MageActions.cpp
similarity index 100%
rename from src/Extend/ClassAi/Mage/Action/MageActions.cpp
rename to src/Scenario/ClassAi/Mage/Action/MageActions.cpp
diff --git a/src/Extend/ClassAi/Mage/Action/MageActions.h b/src/Scenario/ClassAi/Mage/Action/MageActions.h
similarity index 100%
rename from src/Extend/ClassAi/Mage/Action/MageActions.h
rename to src/Scenario/ClassAi/Mage/Action/MageActions.h
diff --git a/src/Extend/ClassAi/Mage/MageAiObjectContext.cpp b/src/Scenario/ClassAi/Mage/MageAiObjectContext.cpp
similarity index 100%
rename from src/Extend/ClassAi/Mage/MageAiObjectContext.cpp
rename to src/Scenario/ClassAi/Mage/MageAiObjectContext.cpp
diff --git a/src/Extend/ClassAi/Mage/MageAiObjectContext.h b/src/Scenario/ClassAi/Mage/MageAiObjectContext.h
similarity index 100%
rename from src/Extend/ClassAi/Mage/MageAiObjectContext.h
rename to src/Scenario/ClassAi/Mage/MageAiObjectContext.h
diff --git a/src/Extend/ClassAi/Mage/Strategy/ArcaneMageStrategy.cpp b/src/Scenario/ClassAi/Mage/Strategy/ArcaneMageStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Mage/Strategy/ArcaneMageStrategy.cpp
rename to src/Scenario/ClassAi/Mage/Strategy/ArcaneMageStrategy.cpp
diff --git a/src/Extend/ClassAi/Mage/Strategy/ArcaneMageStrategy.h b/src/Scenario/ClassAi/Mage/Strategy/ArcaneMageStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Mage/Strategy/ArcaneMageStrategy.h
rename to src/Scenario/ClassAi/Mage/Strategy/ArcaneMageStrategy.h
diff --git a/src/Extend/ClassAi/Mage/Strategy/FireMageStrategy.cpp b/src/Scenario/ClassAi/Mage/Strategy/FireMageStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Mage/Strategy/FireMageStrategy.cpp
rename to src/Scenario/ClassAi/Mage/Strategy/FireMageStrategy.cpp
diff --git a/src/Extend/ClassAi/Mage/Strategy/FireMageStrategy.h b/src/Scenario/ClassAi/Mage/Strategy/FireMageStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Mage/Strategy/FireMageStrategy.h
rename to src/Scenario/ClassAi/Mage/Strategy/FireMageStrategy.h
diff --git a/src/Extend/ClassAi/Mage/Strategy/FrostFireMageStrategy.cpp b/src/Scenario/ClassAi/Mage/Strategy/FrostFireMageStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Mage/Strategy/FrostFireMageStrategy.cpp
rename to src/Scenario/ClassAi/Mage/Strategy/FrostFireMageStrategy.cpp
diff --git a/src/Extend/ClassAi/Mage/Strategy/FrostFireMageStrategy.h b/src/Scenario/ClassAi/Mage/Strategy/FrostFireMageStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Mage/Strategy/FrostFireMageStrategy.h
rename to src/Scenario/ClassAi/Mage/Strategy/FrostFireMageStrategy.h
diff --git a/src/Extend/ClassAi/Mage/Strategy/FrostMageStrategy.cpp b/src/Scenario/ClassAi/Mage/Strategy/FrostMageStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Mage/Strategy/FrostMageStrategy.cpp
rename to src/Scenario/ClassAi/Mage/Strategy/FrostMageStrategy.cpp
diff --git a/src/Extend/ClassAi/Mage/Strategy/FrostMageStrategy.h b/src/Scenario/ClassAi/Mage/Strategy/FrostMageStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Mage/Strategy/FrostMageStrategy.h
rename to src/Scenario/ClassAi/Mage/Strategy/FrostMageStrategy.h
diff --git a/src/Extend/ClassAi/Mage/Strategy/GenericMageNonCombatStrategy.cpp b/src/Scenario/ClassAi/Mage/Strategy/GenericMageNonCombatStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Mage/Strategy/GenericMageNonCombatStrategy.cpp
rename to src/Scenario/ClassAi/Mage/Strategy/GenericMageNonCombatStrategy.cpp
diff --git a/src/Extend/ClassAi/Mage/Strategy/GenericMageNonCombatStrategy.h b/src/Scenario/ClassAi/Mage/Strategy/GenericMageNonCombatStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Mage/Strategy/GenericMageNonCombatStrategy.h
rename to src/Scenario/ClassAi/Mage/Strategy/GenericMageNonCombatStrategy.h
diff --git a/src/Extend/ClassAi/Mage/Strategy/GenericMageStrategy.cpp b/src/Scenario/ClassAi/Mage/Strategy/GenericMageStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Mage/Strategy/GenericMageStrategy.cpp
rename to src/Scenario/ClassAi/Mage/Strategy/GenericMageStrategy.cpp
diff --git a/src/Extend/ClassAi/Mage/Strategy/GenericMageStrategy.h b/src/Scenario/ClassAi/Mage/Strategy/GenericMageStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Mage/Strategy/GenericMageStrategy.h
rename to src/Scenario/ClassAi/Mage/Strategy/GenericMageStrategy.h
diff --git a/src/Extend/ClassAi/Mage/Trigger/MageTriggers.cpp b/src/Scenario/ClassAi/Mage/Trigger/MageTriggers.cpp
similarity index 100%
rename from src/Extend/ClassAi/Mage/Trigger/MageTriggers.cpp
rename to src/Scenario/ClassAi/Mage/Trigger/MageTriggers.cpp
diff --git a/src/Extend/ClassAi/Mage/Trigger/MageTriggers.h b/src/Scenario/ClassAi/Mage/Trigger/MageTriggers.h
similarity index 100%
rename from src/Extend/ClassAi/Mage/Trigger/MageTriggers.h
rename to src/Scenario/ClassAi/Mage/Trigger/MageTriggers.h
diff --git a/src/Extend/ClassAi/Paladin/Action/PaladinActions.cpp b/src/Scenario/ClassAi/Paladin/Action/PaladinActions.cpp
similarity index 100%
rename from src/Extend/ClassAi/Paladin/Action/PaladinActions.cpp
rename to src/Scenario/ClassAi/Paladin/Action/PaladinActions.cpp
diff --git a/src/Extend/ClassAi/Paladin/Action/PaladinActions.h b/src/Scenario/ClassAi/Paladin/Action/PaladinActions.h
similarity index 100%
rename from src/Extend/ClassAi/Paladin/Action/PaladinActions.h
rename to src/Scenario/ClassAi/Paladin/Action/PaladinActions.h
diff --git a/src/Extend/ClassAi/Paladin/PaladinAiObjectContext.cpp b/src/Scenario/ClassAi/Paladin/PaladinAiObjectContext.cpp
similarity index 100%
rename from src/Extend/ClassAi/Paladin/PaladinAiObjectContext.cpp
rename to src/Scenario/ClassAi/Paladin/PaladinAiObjectContext.cpp
diff --git a/src/Extend/ClassAi/Paladin/PaladinAiObjectContext.h b/src/Scenario/ClassAi/Paladin/PaladinAiObjectContext.h
similarity index 100%
rename from src/Extend/ClassAi/Paladin/PaladinAiObjectContext.h
rename to src/Scenario/ClassAi/Paladin/PaladinAiObjectContext.h
diff --git a/src/Extend/ClassAi/Paladin/Strategy/DpsPaladinStrategy.cpp b/src/Scenario/ClassAi/Paladin/Strategy/DpsPaladinStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Paladin/Strategy/DpsPaladinStrategy.cpp
rename to src/Scenario/ClassAi/Paladin/Strategy/DpsPaladinStrategy.cpp
diff --git a/src/Extend/ClassAi/Paladin/Strategy/DpsPaladinStrategy.h b/src/Scenario/ClassAi/Paladin/Strategy/DpsPaladinStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Paladin/Strategy/DpsPaladinStrategy.h
rename to src/Scenario/ClassAi/Paladin/Strategy/DpsPaladinStrategy.h
diff --git a/src/Extend/ClassAi/Paladin/Strategy/GenericPaladinNonCombatStrategy.cpp b/src/Scenario/ClassAi/Paladin/Strategy/GenericPaladinNonCombatStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Paladin/Strategy/GenericPaladinNonCombatStrategy.cpp
rename to src/Scenario/ClassAi/Paladin/Strategy/GenericPaladinNonCombatStrategy.cpp
diff --git a/src/Extend/ClassAi/Paladin/Strategy/GenericPaladinNonCombatStrategy.h b/src/Scenario/ClassAi/Paladin/Strategy/GenericPaladinNonCombatStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Paladin/Strategy/GenericPaladinNonCombatStrategy.h
rename to src/Scenario/ClassAi/Paladin/Strategy/GenericPaladinNonCombatStrategy.h
diff --git a/src/Extend/ClassAi/Paladin/Strategy/GenericPaladinStrategy.cpp b/src/Scenario/ClassAi/Paladin/Strategy/GenericPaladinStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Paladin/Strategy/GenericPaladinStrategy.cpp
rename to src/Scenario/ClassAi/Paladin/Strategy/GenericPaladinStrategy.cpp
diff --git a/src/Extend/ClassAi/Paladin/Strategy/GenericPaladinStrategy.h b/src/Scenario/ClassAi/Paladin/Strategy/GenericPaladinStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Paladin/Strategy/GenericPaladinStrategy.h
rename to src/Scenario/ClassAi/Paladin/Strategy/GenericPaladinStrategy.h
diff --git a/src/Extend/ClassAi/Paladin/Strategy/GenericPaladinStrategyActionNodeFactory.h b/src/Scenario/ClassAi/Paladin/Strategy/GenericPaladinStrategyActionNodeFactory.h
similarity index 100%
rename from src/Extend/ClassAi/Paladin/Strategy/GenericPaladinStrategyActionNodeFactory.h
rename to src/Scenario/ClassAi/Paladin/Strategy/GenericPaladinStrategyActionNodeFactory.h
diff --git a/src/Extend/ClassAi/Paladin/Strategy/HealPaladinStrategy.cpp b/src/Scenario/ClassAi/Paladin/Strategy/HealPaladinStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Paladin/Strategy/HealPaladinStrategy.cpp
rename to src/Scenario/ClassAi/Paladin/Strategy/HealPaladinStrategy.cpp
diff --git a/src/Extend/ClassAi/Paladin/Strategy/HealPaladinStrategy.h b/src/Scenario/ClassAi/Paladin/Strategy/HealPaladinStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Paladin/Strategy/HealPaladinStrategy.h
rename to src/Scenario/ClassAi/Paladin/Strategy/HealPaladinStrategy.h
diff --git a/src/Extend/ClassAi/Paladin/Strategy/OffhealRetPaladinStrategy.cpp b/src/Scenario/ClassAi/Paladin/Strategy/OffhealRetPaladinStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Paladin/Strategy/OffhealRetPaladinStrategy.cpp
rename to src/Scenario/ClassAi/Paladin/Strategy/OffhealRetPaladinStrategy.cpp
diff --git a/src/Extend/ClassAi/Paladin/Strategy/OffhealRetPaladinStrategy.h b/src/Scenario/ClassAi/Paladin/Strategy/OffhealRetPaladinStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Paladin/Strategy/OffhealRetPaladinStrategy.h
rename to src/Scenario/ClassAi/Paladin/Strategy/OffhealRetPaladinStrategy.h
diff --git a/src/Extend/ClassAi/Paladin/Strategy/PaladinBuffStrategies.cpp b/src/Scenario/ClassAi/Paladin/Strategy/PaladinBuffStrategies.cpp
similarity index 100%
rename from src/Extend/ClassAi/Paladin/Strategy/PaladinBuffStrategies.cpp
rename to src/Scenario/ClassAi/Paladin/Strategy/PaladinBuffStrategies.cpp
diff --git a/src/Extend/ClassAi/Paladin/Strategy/PaladinBuffStrategies.h b/src/Scenario/ClassAi/Paladin/Strategy/PaladinBuffStrategies.h
similarity index 100%
rename from src/Extend/ClassAi/Paladin/Strategy/PaladinBuffStrategies.h
rename to src/Scenario/ClassAi/Paladin/Strategy/PaladinBuffStrategies.h
diff --git a/src/Extend/ClassAi/Paladin/Strategy/TankPaladinStrategy.cpp b/src/Scenario/ClassAi/Paladin/Strategy/TankPaladinStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Paladin/Strategy/TankPaladinStrategy.cpp
rename to src/Scenario/ClassAi/Paladin/Strategy/TankPaladinStrategy.cpp
diff --git a/src/Extend/ClassAi/Paladin/Strategy/TankPaladinStrategy.h b/src/Scenario/ClassAi/Paladin/Strategy/TankPaladinStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Paladin/Strategy/TankPaladinStrategy.h
rename to src/Scenario/ClassAi/Paladin/Strategy/TankPaladinStrategy.h
diff --git a/src/Extend/ClassAi/Paladin/Trigger/PaladinTriggers.cpp b/src/Scenario/ClassAi/Paladin/Trigger/PaladinTriggers.cpp
similarity index 100%
rename from src/Extend/ClassAi/Paladin/Trigger/PaladinTriggers.cpp
rename to src/Scenario/ClassAi/Paladin/Trigger/PaladinTriggers.cpp
diff --git a/src/Extend/ClassAi/Paladin/Trigger/PaladinTriggers.h b/src/Scenario/ClassAi/Paladin/Trigger/PaladinTriggers.h
similarity index 100%
rename from src/Extend/ClassAi/Paladin/Trigger/PaladinTriggers.h
rename to src/Scenario/ClassAi/Paladin/Trigger/PaladinTriggers.h
diff --git a/src/Extend/ClassAi/Priest/Action/PriestActions.cpp b/src/Scenario/ClassAi/Priest/Action/PriestActions.cpp
similarity index 100%
rename from src/Extend/ClassAi/Priest/Action/PriestActions.cpp
rename to src/Scenario/ClassAi/Priest/Action/PriestActions.cpp
diff --git a/src/Extend/ClassAi/Priest/Action/PriestActions.h b/src/Scenario/ClassAi/Priest/Action/PriestActions.h
similarity index 100%
rename from src/Extend/ClassAi/Priest/Action/PriestActions.h
rename to src/Scenario/ClassAi/Priest/Action/PriestActions.h
diff --git a/src/Extend/ClassAi/Priest/PriestAiObjectContext.cpp b/src/Scenario/ClassAi/Priest/PriestAiObjectContext.cpp
similarity index 100%
rename from src/Extend/ClassAi/Priest/PriestAiObjectContext.cpp
rename to src/Scenario/ClassAi/Priest/PriestAiObjectContext.cpp
diff --git a/src/Extend/ClassAi/Priest/PriestAiObjectContext.h b/src/Scenario/ClassAi/Priest/PriestAiObjectContext.h
similarity index 100%
rename from src/Extend/ClassAi/Priest/PriestAiObjectContext.h
rename to src/Scenario/ClassAi/Priest/PriestAiObjectContext.h
diff --git a/src/Extend/ClassAi/Priest/Strategy/GenericPriestStrategy.cpp b/src/Scenario/ClassAi/Priest/Strategy/GenericPriestStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Priest/Strategy/GenericPriestStrategy.cpp
rename to src/Scenario/ClassAi/Priest/Strategy/GenericPriestStrategy.cpp
diff --git a/src/Extend/ClassAi/Priest/Strategy/GenericPriestStrategy.h b/src/Scenario/ClassAi/Priest/Strategy/GenericPriestStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Priest/Strategy/GenericPriestStrategy.h
rename to src/Scenario/ClassAi/Priest/Strategy/GenericPriestStrategy.h
diff --git a/src/Extend/ClassAi/Priest/Strategy/GenericPriestStrategyActionNodeFactory.h b/src/Scenario/ClassAi/Priest/Strategy/GenericPriestStrategyActionNodeFactory.h
similarity index 100%
rename from src/Extend/ClassAi/Priest/Strategy/GenericPriestStrategyActionNodeFactory.h
rename to src/Scenario/ClassAi/Priest/Strategy/GenericPriestStrategyActionNodeFactory.h
diff --git a/src/Extend/ClassAi/Priest/Strategy/HealPriestStrategy.cpp b/src/Scenario/ClassAi/Priest/Strategy/HealPriestStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Priest/Strategy/HealPriestStrategy.cpp
rename to src/Scenario/ClassAi/Priest/Strategy/HealPriestStrategy.cpp
diff --git a/src/Extend/ClassAi/Priest/Strategy/HealPriestStrategy.h b/src/Scenario/ClassAi/Priest/Strategy/HealPriestStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Priest/Strategy/HealPriestStrategy.h
rename to src/Scenario/ClassAi/Priest/Strategy/HealPriestStrategy.h
diff --git a/src/Extend/ClassAi/Priest/Strategy/HolyPriestStrategy.cpp b/src/Scenario/ClassAi/Priest/Strategy/HolyPriestStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Priest/Strategy/HolyPriestStrategy.cpp
rename to src/Scenario/ClassAi/Priest/Strategy/HolyPriestStrategy.cpp
diff --git a/src/Extend/ClassAi/Priest/Strategy/HolyPriestStrategy.h b/src/Scenario/ClassAi/Priest/Strategy/HolyPriestStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Priest/Strategy/HolyPriestStrategy.h
rename to src/Scenario/ClassAi/Priest/Strategy/HolyPriestStrategy.h
diff --git a/src/Extend/ClassAi/Priest/Strategy/PriestNonCombatStrategy.cpp b/src/Scenario/ClassAi/Priest/Strategy/PriestNonCombatStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Priest/Strategy/PriestNonCombatStrategy.cpp
rename to src/Scenario/ClassAi/Priest/Strategy/PriestNonCombatStrategy.cpp
diff --git a/src/Extend/ClassAi/Priest/Strategy/PriestNonCombatStrategy.h b/src/Scenario/ClassAi/Priest/Strategy/PriestNonCombatStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Priest/Strategy/PriestNonCombatStrategy.h
rename to src/Scenario/ClassAi/Priest/Strategy/PriestNonCombatStrategy.h
diff --git a/src/Extend/ClassAi/Priest/Strategy/PriestNonCombatStrategyActionNodeFactory.h b/src/Scenario/ClassAi/Priest/Strategy/PriestNonCombatStrategyActionNodeFactory.h
similarity index 100%
rename from src/Extend/ClassAi/Priest/Strategy/PriestNonCombatStrategyActionNodeFactory.h
rename to src/Scenario/ClassAi/Priest/Strategy/PriestNonCombatStrategyActionNodeFactory.h
diff --git a/src/Extend/ClassAi/Priest/Strategy/ShadowPriestStrategy.cpp b/src/Scenario/ClassAi/Priest/Strategy/ShadowPriestStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Priest/Strategy/ShadowPriestStrategy.cpp
rename to src/Scenario/ClassAi/Priest/Strategy/ShadowPriestStrategy.cpp
diff --git a/src/Extend/ClassAi/Priest/Strategy/ShadowPriestStrategy.h b/src/Scenario/ClassAi/Priest/Strategy/ShadowPriestStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Priest/Strategy/ShadowPriestStrategy.h
rename to src/Scenario/ClassAi/Priest/Strategy/ShadowPriestStrategy.h
diff --git a/src/Extend/ClassAi/Priest/Strategy/ShadowPriestStrategyActionNodeFactory.h b/src/Scenario/ClassAi/Priest/Strategy/ShadowPriestStrategyActionNodeFactory.h
similarity index 100%
rename from src/Extend/ClassAi/Priest/Strategy/ShadowPriestStrategyActionNodeFactory.h
rename to src/Scenario/ClassAi/Priest/Strategy/ShadowPriestStrategyActionNodeFactory.h
diff --git a/src/Extend/ClassAi/Priest/Trigger/PriestTriggers.cpp b/src/Scenario/ClassAi/Priest/Trigger/PriestTriggers.cpp
similarity index 100%
rename from src/Extend/ClassAi/Priest/Trigger/PriestTriggers.cpp
rename to src/Scenario/ClassAi/Priest/Trigger/PriestTriggers.cpp
diff --git a/src/Extend/ClassAi/Priest/Trigger/PriestTriggers.h b/src/Scenario/ClassAi/Priest/Trigger/PriestTriggers.h
similarity index 100%
rename from src/Extend/ClassAi/Priest/Trigger/PriestTriggers.h
rename to src/Scenario/ClassAi/Priest/Trigger/PriestTriggers.h
diff --git a/src/Extend/ClassAi/Rogue/Action/RogueActions.cpp b/src/Scenario/ClassAi/Rogue/Action/RogueActions.cpp
similarity index 100%
rename from src/Extend/ClassAi/Rogue/Action/RogueActions.cpp
rename to src/Scenario/ClassAi/Rogue/Action/RogueActions.cpp
diff --git a/src/Extend/ClassAi/Rogue/Action/RogueActions.h b/src/Scenario/ClassAi/Rogue/Action/RogueActions.h
similarity index 100%
rename from src/Extend/ClassAi/Rogue/Action/RogueActions.h
rename to src/Scenario/ClassAi/Rogue/Action/RogueActions.h
diff --git a/src/Extend/ClassAi/Rogue/Action/RogueComboActions.cpp b/src/Scenario/ClassAi/Rogue/Action/RogueComboActions.cpp
similarity index 100%
rename from src/Extend/ClassAi/Rogue/Action/RogueComboActions.cpp
rename to src/Scenario/ClassAi/Rogue/Action/RogueComboActions.cpp
diff --git a/src/Extend/ClassAi/Rogue/Action/RogueComboActions.h b/src/Scenario/ClassAi/Rogue/Action/RogueComboActions.h
similarity index 100%
rename from src/Extend/ClassAi/Rogue/Action/RogueComboActions.h
rename to src/Scenario/ClassAi/Rogue/Action/RogueComboActions.h
diff --git a/src/Extend/ClassAi/Rogue/Action/RogueFinishingActions.h b/src/Scenario/ClassAi/Rogue/Action/RogueFinishingActions.h
similarity index 100%
rename from src/Extend/ClassAi/Rogue/Action/RogueFinishingActions.h
rename to src/Scenario/ClassAi/Rogue/Action/RogueFinishingActions.h
diff --git a/src/Extend/ClassAi/Rogue/Action/RogueOpeningActions.cpp b/src/Scenario/ClassAi/Rogue/Action/RogueOpeningActions.cpp
similarity index 100%
rename from src/Extend/ClassAi/Rogue/Action/RogueOpeningActions.cpp
rename to src/Scenario/ClassAi/Rogue/Action/RogueOpeningActions.cpp
diff --git a/src/Extend/ClassAi/Rogue/Action/RogueOpeningActions.h b/src/Scenario/ClassAi/Rogue/Action/RogueOpeningActions.h
similarity index 100%
rename from src/Extend/ClassAi/Rogue/Action/RogueOpeningActions.h
rename to src/Scenario/ClassAi/Rogue/Action/RogueOpeningActions.h
diff --git a/src/Extend/ClassAi/Rogue/RogueAiObjectContext.cpp b/src/Scenario/ClassAi/Rogue/RogueAiObjectContext.cpp
similarity index 100%
rename from src/Extend/ClassAi/Rogue/RogueAiObjectContext.cpp
rename to src/Scenario/ClassAi/Rogue/RogueAiObjectContext.cpp
diff --git a/src/Extend/ClassAi/Rogue/RogueAiObjectContext.h b/src/Scenario/ClassAi/Rogue/RogueAiObjectContext.h
similarity index 100%
rename from src/Extend/ClassAi/Rogue/RogueAiObjectContext.h
rename to src/Scenario/ClassAi/Rogue/RogueAiObjectContext.h
diff --git a/src/Extend/ClassAi/Rogue/Strategy/AssassinationRogueStrategy.cpp b/src/Scenario/ClassAi/Rogue/Strategy/AssassinationRogueStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Rogue/Strategy/AssassinationRogueStrategy.cpp
rename to src/Scenario/ClassAi/Rogue/Strategy/AssassinationRogueStrategy.cpp
diff --git a/src/Extend/ClassAi/Rogue/Strategy/AssassinationRogueStrategy.h b/src/Scenario/ClassAi/Rogue/Strategy/AssassinationRogueStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Rogue/Strategy/AssassinationRogueStrategy.h
rename to src/Scenario/ClassAi/Rogue/Strategy/AssassinationRogueStrategy.h
diff --git a/src/Extend/ClassAi/Rogue/Strategy/DpsRogueStrategy.cpp b/src/Scenario/ClassAi/Rogue/Strategy/DpsRogueStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Rogue/Strategy/DpsRogueStrategy.cpp
rename to src/Scenario/ClassAi/Rogue/Strategy/DpsRogueStrategy.cpp
diff --git a/src/Extend/ClassAi/Rogue/Strategy/DpsRogueStrategy.h b/src/Scenario/ClassAi/Rogue/Strategy/DpsRogueStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Rogue/Strategy/DpsRogueStrategy.h
rename to src/Scenario/ClassAi/Rogue/Strategy/DpsRogueStrategy.h
diff --git a/src/Extend/ClassAi/Rogue/Strategy/GenericRogueNonCombatStrategy.cpp b/src/Scenario/ClassAi/Rogue/Strategy/GenericRogueNonCombatStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Rogue/Strategy/GenericRogueNonCombatStrategy.cpp
rename to src/Scenario/ClassAi/Rogue/Strategy/GenericRogueNonCombatStrategy.cpp
diff --git a/src/Extend/ClassAi/Rogue/Strategy/GenericRogueNonCombatStrategy.h b/src/Scenario/ClassAi/Rogue/Strategy/GenericRogueNonCombatStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Rogue/Strategy/GenericRogueNonCombatStrategy.h
rename to src/Scenario/ClassAi/Rogue/Strategy/GenericRogueNonCombatStrategy.h
diff --git a/src/Extend/ClassAi/Rogue/Trigger/RogueTriggers.cpp b/src/Scenario/ClassAi/Rogue/Trigger/RogueTriggers.cpp
similarity index 100%
rename from src/Extend/ClassAi/Rogue/Trigger/RogueTriggers.cpp
rename to src/Scenario/ClassAi/Rogue/Trigger/RogueTriggers.cpp
diff --git a/src/Extend/ClassAi/Rogue/Trigger/RogueTriggers.h b/src/Scenario/ClassAi/Rogue/Trigger/RogueTriggers.h
similarity index 100%
rename from src/Extend/ClassAi/Rogue/Trigger/RogueTriggers.h
rename to src/Scenario/ClassAi/Rogue/Trigger/RogueTriggers.h
diff --git a/src/Extend/ClassAi/Shaman/Action/ShamanActions.cpp b/src/Scenario/ClassAi/Shaman/Action/ShamanActions.cpp
similarity index 100%
rename from src/Extend/ClassAi/Shaman/Action/ShamanActions.cpp
rename to src/Scenario/ClassAi/Shaman/Action/ShamanActions.cpp
diff --git a/src/Extend/ClassAi/Shaman/Action/ShamanActions.h b/src/Scenario/ClassAi/Shaman/Action/ShamanActions.h
similarity index 100%
rename from src/Extend/ClassAi/Shaman/Action/ShamanActions.h
rename to src/Scenario/ClassAi/Shaman/Action/ShamanActions.h
diff --git a/src/Extend/ClassAi/Shaman/ShamanAiObjectContext.cpp b/src/Scenario/ClassAi/Shaman/ShamanAiObjectContext.cpp
similarity index 100%
rename from src/Extend/ClassAi/Shaman/ShamanAiObjectContext.cpp
rename to src/Scenario/ClassAi/Shaman/ShamanAiObjectContext.cpp
diff --git a/src/Extend/ClassAi/Shaman/ShamanAiObjectContext.h b/src/Scenario/ClassAi/Shaman/ShamanAiObjectContext.h
similarity index 100%
rename from src/Extend/ClassAi/Shaman/ShamanAiObjectContext.h
rename to src/Scenario/ClassAi/Shaman/ShamanAiObjectContext.h
diff --git a/src/Extend/ClassAi/Shaman/Strategy/ElementalShamanStrategy.cpp b/src/Scenario/ClassAi/Shaman/Strategy/ElementalShamanStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Shaman/Strategy/ElementalShamanStrategy.cpp
rename to src/Scenario/ClassAi/Shaman/Strategy/ElementalShamanStrategy.cpp
diff --git a/src/Extend/ClassAi/Shaman/Strategy/ElementalShamanStrategy.h b/src/Scenario/ClassAi/Shaman/Strategy/ElementalShamanStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Shaman/Strategy/ElementalShamanStrategy.h
rename to src/Scenario/ClassAi/Shaman/Strategy/ElementalShamanStrategy.h
diff --git a/src/Extend/ClassAi/Shaman/Strategy/EnhancementShamanStrategy.cpp b/src/Scenario/ClassAi/Shaman/Strategy/EnhancementShamanStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Shaman/Strategy/EnhancementShamanStrategy.cpp
rename to src/Scenario/ClassAi/Shaman/Strategy/EnhancementShamanStrategy.cpp
diff --git a/src/Extend/ClassAi/Shaman/Strategy/EnhancementShamanStrategy.h b/src/Scenario/ClassAi/Shaman/Strategy/EnhancementShamanStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Shaman/Strategy/EnhancementShamanStrategy.h
rename to src/Scenario/ClassAi/Shaman/Strategy/EnhancementShamanStrategy.h
diff --git a/src/Extend/ClassAi/Shaman/Strategy/GenericShamanStrategy.cpp b/src/Scenario/ClassAi/Shaman/Strategy/GenericShamanStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Shaman/Strategy/GenericShamanStrategy.cpp
rename to src/Scenario/ClassAi/Shaman/Strategy/GenericShamanStrategy.cpp
diff --git a/src/Extend/ClassAi/Shaman/Strategy/GenericShamanStrategy.h b/src/Scenario/ClassAi/Shaman/Strategy/GenericShamanStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Shaman/Strategy/GenericShamanStrategy.h
rename to src/Scenario/ClassAi/Shaman/Strategy/GenericShamanStrategy.h
diff --git a/src/Extend/ClassAi/Shaman/Strategy/RestoShamanStrategy.cpp b/src/Scenario/ClassAi/Shaman/Strategy/RestoShamanStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Shaman/Strategy/RestoShamanStrategy.cpp
rename to src/Scenario/ClassAi/Shaman/Strategy/RestoShamanStrategy.cpp
diff --git a/src/Extend/ClassAi/Shaman/Strategy/RestoShamanStrategy.h b/src/Scenario/ClassAi/Shaman/Strategy/RestoShamanStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Shaman/Strategy/RestoShamanStrategy.h
rename to src/Scenario/ClassAi/Shaman/Strategy/RestoShamanStrategy.h
diff --git a/src/Extend/ClassAi/Shaman/Strategy/ShamanNonCombatStrategy.cpp b/src/Scenario/ClassAi/Shaman/Strategy/ShamanNonCombatStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Shaman/Strategy/ShamanNonCombatStrategy.cpp
rename to src/Scenario/ClassAi/Shaman/Strategy/ShamanNonCombatStrategy.cpp
diff --git a/src/Extend/ClassAi/Shaman/Strategy/ShamanNonCombatStrategy.h b/src/Scenario/ClassAi/Shaman/Strategy/ShamanNonCombatStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Shaman/Strategy/ShamanNonCombatStrategy.h
rename to src/Scenario/ClassAi/Shaman/Strategy/ShamanNonCombatStrategy.h
diff --git a/src/Extend/ClassAi/Shaman/Strategy/TotemsShamanStrategy.cpp b/src/Scenario/ClassAi/Shaman/Strategy/TotemsShamanStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Shaman/Strategy/TotemsShamanStrategy.cpp
rename to src/Scenario/ClassAi/Shaman/Strategy/TotemsShamanStrategy.cpp
diff --git a/src/Extend/ClassAi/Shaman/Strategy/TotemsShamanStrategy.h b/src/Scenario/ClassAi/Shaman/Strategy/TotemsShamanStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Shaman/Strategy/TotemsShamanStrategy.h
rename to src/Scenario/ClassAi/Shaman/Strategy/TotemsShamanStrategy.h
diff --git a/src/Extend/ClassAi/Shaman/Trigger/ShamanTriggers.cpp b/src/Scenario/ClassAi/Shaman/Trigger/ShamanTriggers.cpp
similarity index 100%
rename from src/Extend/ClassAi/Shaman/Trigger/ShamanTriggers.cpp
rename to src/Scenario/ClassAi/Shaman/Trigger/ShamanTriggers.cpp
diff --git a/src/Extend/ClassAi/Shaman/Trigger/ShamanTriggers.h b/src/Scenario/ClassAi/Shaman/Trigger/ShamanTriggers.h
similarity index 100%
rename from src/Extend/ClassAi/Shaman/Trigger/ShamanTriggers.h
rename to src/Scenario/ClassAi/Shaman/Trigger/ShamanTriggers.h
diff --git a/src/Extend/ClassAi/Warlock/Action/WarlockActions.cpp b/src/Scenario/ClassAi/Warlock/Action/WarlockActions.cpp
similarity index 100%
rename from src/Extend/ClassAi/Warlock/Action/WarlockActions.cpp
rename to src/Scenario/ClassAi/Warlock/Action/WarlockActions.cpp
diff --git a/src/Extend/ClassAi/Warlock/Action/WarlockActions.h b/src/Scenario/ClassAi/Warlock/Action/WarlockActions.h
similarity index 100%
rename from src/Extend/ClassAi/Warlock/Action/WarlockActions.h
rename to src/Scenario/ClassAi/Warlock/Action/WarlockActions.h
diff --git a/src/Extend/ClassAi/Warlock/Strategy/AfflictionWarlockStrategy.cpp b/src/Scenario/ClassAi/Warlock/Strategy/AfflictionWarlockStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Warlock/Strategy/AfflictionWarlockStrategy.cpp
rename to src/Scenario/ClassAi/Warlock/Strategy/AfflictionWarlockStrategy.cpp
diff --git a/src/Extend/ClassAi/Warlock/Strategy/AfflictionWarlockStrategy.h b/src/Scenario/ClassAi/Warlock/Strategy/AfflictionWarlockStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Warlock/Strategy/AfflictionWarlockStrategy.h
rename to src/Scenario/ClassAi/Warlock/Strategy/AfflictionWarlockStrategy.h
diff --git a/src/Extend/ClassAi/Warlock/Strategy/DemonologyWarlockStrategy.cpp b/src/Scenario/ClassAi/Warlock/Strategy/DemonologyWarlockStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Warlock/Strategy/DemonologyWarlockStrategy.cpp
rename to src/Scenario/ClassAi/Warlock/Strategy/DemonologyWarlockStrategy.cpp
diff --git a/src/Extend/ClassAi/Warlock/Strategy/DemonologyWarlockStrategy.h b/src/Scenario/ClassAi/Warlock/Strategy/DemonologyWarlockStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Warlock/Strategy/DemonologyWarlockStrategy.h
rename to src/Scenario/ClassAi/Warlock/Strategy/DemonologyWarlockStrategy.h
diff --git a/src/Extend/ClassAi/Warlock/Strategy/DestructionWarlockStrategy.cpp b/src/Scenario/ClassAi/Warlock/Strategy/DestructionWarlockStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Warlock/Strategy/DestructionWarlockStrategy.cpp
rename to src/Scenario/ClassAi/Warlock/Strategy/DestructionWarlockStrategy.cpp
diff --git a/src/Extend/ClassAi/Warlock/Strategy/DestructionWarlockStrategy.h b/src/Scenario/ClassAi/Warlock/Strategy/DestructionWarlockStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Warlock/Strategy/DestructionWarlockStrategy.h
rename to src/Scenario/ClassAi/Warlock/Strategy/DestructionWarlockStrategy.h
diff --git a/src/Extend/ClassAi/Warlock/Strategy/GenericWarlockNonCombatStrategy.cpp b/src/Scenario/ClassAi/Warlock/Strategy/GenericWarlockNonCombatStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Warlock/Strategy/GenericWarlockNonCombatStrategy.cpp
rename to src/Scenario/ClassAi/Warlock/Strategy/GenericWarlockNonCombatStrategy.cpp
diff --git a/src/Extend/ClassAi/Warlock/Strategy/GenericWarlockNonCombatStrategy.h b/src/Scenario/ClassAi/Warlock/Strategy/GenericWarlockNonCombatStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Warlock/Strategy/GenericWarlockNonCombatStrategy.h
rename to src/Scenario/ClassAi/Warlock/Strategy/GenericWarlockNonCombatStrategy.h
diff --git a/src/Extend/ClassAi/Warlock/Strategy/GenericWarlockStrategy.cpp b/src/Scenario/ClassAi/Warlock/Strategy/GenericWarlockStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Warlock/Strategy/GenericWarlockStrategy.cpp
rename to src/Scenario/ClassAi/Warlock/Strategy/GenericWarlockStrategy.cpp
diff --git a/src/Extend/ClassAi/Warlock/Strategy/GenericWarlockStrategy.h b/src/Scenario/ClassAi/Warlock/Strategy/GenericWarlockStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Warlock/Strategy/GenericWarlockStrategy.h
rename to src/Scenario/ClassAi/Warlock/Strategy/GenericWarlockStrategy.h
diff --git a/src/Extend/ClassAi/Warlock/Strategy/TankWarlockStrategy.cpp b/src/Scenario/ClassAi/Warlock/Strategy/TankWarlockStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Warlock/Strategy/TankWarlockStrategy.cpp
rename to src/Scenario/ClassAi/Warlock/Strategy/TankWarlockStrategy.cpp
diff --git a/src/Extend/ClassAi/Warlock/Strategy/TankWarlockStrategy.h b/src/Scenario/ClassAi/Warlock/Strategy/TankWarlockStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Warlock/Strategy/TankWarlockStrategy.h
rename to src/Scenario/ClassAi/Warlock/Strategy/TankWarlockStrategy.h
diff --git a/src/Extend/ClassAi/Warlock/Trigger/WarlockTriggers.cpp b/src/Scenario/ClassAi/Warlock/Trigger/WarlockTriggers.cpp
similarity index 100%
rename from src/Extend/ClassAi/Warlock/Trigger/WarlockTriggers.cpp
rename to src/Scenario/ClassAi/Warlock/Trigger/WarlockTriggers.cpp
diff --git a/src/Extend/ClassAi/Warlock/Trigger/WarlockTriggers.h b/src/Scenario/ClassAi/Warlock/Trigger/WarlockTriggers.h
similarity index 100%
rename from src/Extend/ClassAi/Warlock/Trigger/WarlockTriggers.h
rename to src/Scenario/ClassAi/Warlock/Trigger/WarlockTriggers.h
diff --git a/src/Extend/ClassAi/Warlock/WarlockAiObjectContext.cpp b/src/Scenario/ClassAi/Warlock/WarlockAiObjectContext.cpp
similarity index 100%
rename from src/Extend/ClassAi/Warlock/WarlockAiObjectContext.cpp
rename to src/Scenario/ClassAi/Warlock/WarlockAiObjectContext.cpp
diff --git a/src/Extend/ClassAi/Warlock/WarlockAiObjectContext.h b/src/Scenario/ClassAi/Warlock/WarlockAiObjectContext.h
similarity index 100%
rename from src/Extend/ClassAi/Warlock/WarlockAiObjectContext.h
rename to src/Scenario/ClassAi/Warlock/WarlockAiObjectContext.h
diff --git a/src/Extend/ClassAi/Warrior/Action/WarriorActions.cpp b/src/Scenario/ClassAi/Warrior/Action/WarriorActions.cpp
similarity index 100%
rename from src/Extend/ClassAi/Warrior/Action/WarriorActions.cpp
rename to src/Scenario/ClassAi/Warrior/Action/WarriorActions.cpp
diff --git a/src/Extend/ClassAi/Warrior/Action/WarriorActions.h b/src/Scenario/ClassAi/Warrior/Action/WarriorActions.h
similarity index 100%
rename from src/Extend/ClassAi/Warrior/Action/WarriorActions.h
rename to src/Scenario/ClassAi/Warrior/Action/WarriorActions.h
diff --git a/src/Extend/ClassAi/Warrior/Strategy/ArmsWarriorStrategy.cpp b/src/Scenario/ClassAi/Warrior/Strategy/ArmsWarriorStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Warrior/Strategy/ArmsWarriorStrategy.cpp
rename to src/Scenario/ClassAi/Warrior/Strategy/ArmsWarriorStrategy.cpp
diff --git a/src/Extend/ClassAi/Warrior/Strategy/ArmsWarriorStrategy.h b/src/Scenario/ClassAi/Warrior/Strategy/ArmsWarriorStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Warrior/Strategy/ArmsWarriorStrategy.h
rename to src/Scenario/ClassAi/Warrior/Strategy/ArmsWarriorStrategy.h
diff --git a/src/Extend/ClassAi/Warrior/Strategy/FuryWarriorStrategy.cpp b/src/Scenario/ClassAi/Warrior/Strategy/FuryWarriorStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Warrior/Strategy/FuryWarriorStrategy.cpp
rename to src/Scenario/ClassAi/Warrior/Strategy/FuryWarriorStrategy.cpp
diff --git a/src/Extend/ClassAi/Warrior/Strategy/FuryWarriorStrategy.h b/src/Scenario/ClassAi/Warrior/Strategy/FuryWarriorStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Warrior/Strategy/FuryWarriorStrategy.h
rename to src/Scenario/ClassAi/Warrior/Strategy/FuryWarriorStrategy.h
diff --git a/src/Extend/ClassAi/Warrior/Strategy/GenericWarriorNonCombatStrategy.cpp b/src/Scenario/ClassAi/Warrior/Strategy/GenericWarriorNonCombatStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Warrior/Strategy/GenericWarriorNonCombatStrategy.cpp
rename to src/Scenario/ClassAi/Warrior/Strategy/GenericWarriorNonCombatStrategy.cpp
diff --git a/src/Extend/ClassAi/Warrior/Strategy/GenericWarriorNonCombatStrategy.h b/src/Scenario/ClassAi/Warrior/Strategy/GenericWarriorNonCombatStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Warrior/Strategy/GenericWarriorNonCombatStrategy.h
rename to src/Scenario/ClassAi/Warrior/Strategy/GenericWarriorNonCombatStrategy.h
diff --git a/src/Extend/ClassAi/Warrior/Strategy/GenericWarriorStrategy.cpp b/src/Scenario/ClassAi/Warrior/Strategy/GenericWarriorStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Warrior/Strategy/GenericWarriorStrategy.cpp
rename to src/Scenario/ClassAi/Warrior/Strategy/GenericWarriorStrategy.cpp
diff --git a/src/Extend/ClassAi/Warrior/Strategy/GenericWarriorStrategy.h b/src/Scenario/ClassAi/Warrior/Strategy/GenericWarriorStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Warrior/Strategy/GenericWarriorStrategy.h
rename to src/Scenario/ClassAi/Warrior/Strategy/GenericWarriorStrategy.h
diff --git a/src/Extend/ClassAi/Warrior/Strategy/TankWarriorStrategy.cpp b/src/Scenario/ClassAi/Warrior/Strategy/TankWarriorStrategy.cpp
similarity index 100%
rename from src/Extend/ClassAi/Warrior/Strategy/TankWarriorStrategy.cpp
rename to src/Scenario/ClassAi/Warrior/Strategy/TankWarriorStrategy.cpp
diff --git a/src/Extend/ClassAi/Warrior/Strategy/TankWarriorStrategy.h b/src/Scenario/ClassAi/Warrior/Strategy/TankWarriorStrategy.h
similarity index 100%
rename from src/Extend/ClassAi/Warrior/Strategy/TankWarriorStrategy.h
rename to src/Scenario/ClassAi/Warrior/Strategy/TankWarriorStrategy.h
diff --git a/src/Extend/ClassAi/Warrior/Trigger/WarriorTriggers.cpp b/src/Scenario/ClassAi/Warrior/Trigger/WarriorTriggers.cpp
similarity index 100%
rename from src/Extend/ClassAi/Warrior/Trigger/WarriorTriggers.cpp
rename to src/Scenario/ClassAi/Warrior/Trigger/WarriorTriggers.cpp
diff --git a/src/Extend/ClassAi/Warrior/Trigger/WarriorTriggers.h b/src/Scenario/ClassAi/Warrior/Trigger/WarriorTriggers.h
similarity index 100%
rename from src/Extend/ClassAi/Warrior/Trigger/WarriorTriggers.h
rename to src/Scenario/ClassAi/Warrior/Trigger/WarriorTriggers.h
diff --git a/src/Extend/ClassAi/Warrior/WarriorAiObjectContext.cpp b/src/Scenario/ClassAi/Warrior/WarriorAiObjectContext.cpp
similarity index 100%
rename from src/Extend/ClassAi/Warrior/WarriorAiObjectContext.cpp
rename to src/Scenario/ClassAi/Warrior/WarriorAiObjectContext.cpp
diff --git a/src/Extend/ClassAi/Warrior/WarriorAiObjectContext.h b/src/Scenario/ClassAi/Warrior/WarriorAiObjectContext.h
similarity index 100%
rename from src/Extend/ClassAi/Warrior/WarriorAiObjectContext.h
rename to src/Scenario/ClassAi/Warrior/WarriorAiObjectContext.h
diff --git a/src/Extend/DungeonAi/DungeonStrategyContext.h b/src/Scenario/DungeonAi/DungeonStrategyContext.h
similarity index 100%
rename from src/Extend/DungeonAi/DungeonStrategyContext.h
rename to src/Scenario/DungeonAi/DungeonStrategyContext.h
diff --git a/src/Extend/DungeonAi/DungeonStrategyUtils.h b/src/Scenario/DungeonAi/DungeonStrategyUtils.h
similarity index 100%
rename from src/Extend/DungeonAi/DungeonStrategyUtils.h
rename to src/Scenario/DungeonAi/DungeonStrategyUtils.h
diff --git a/src/Extend/DungeonAi/Wotlk/AzjolNerub/Action/AzjolNerubActions.cpp b/src/Scenario/DungeonAi/Wotlk/AzjolNerub/Action/AzjolNerubActions.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/AzjolNerub/Action/AzjolNerubActions.cpp
rename to src/Scenario/DungeonAi/Wotlk/AzjolNerub/Action/AzjolNerubActions.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/AzjolNerub/Action/AzjolNerubActions.h b/src/Scenario/DungeonAi/Wotlk/AzjolNerub/Action/AzjolNerubActions.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/AzjolNerub/Action/AzjolNerubActions.h
rename to src/Scenario/DungeonAi/Wotlk/AzjolNerub/Action/AzjolNerubActions.h
diff --git a/src/Extend/DungeonAi/Wotlk/AzjolNerub/AzjolNerubActionContext.h b/src/Scenario/DungeonAi/Wotlk/AzjolNerub/AzjolNerubActionContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/AzjolNerub/AzjolNerubActionContext.h
rename to src/Scenario/DungeonAi/Wotlk/AzjolNerub/AzjolNerubActionContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/AzjolNerub/AzjolNerubTriggerContext.h b/src/Scenario/DungeonAi/Wotlk/AzjolNerub/AzjolNerubTriggerContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/AzjolNerub/AzjolNerubTriggerContext.h
rename to src/Scenario/DungeonAi/Wotlk/AzjolNerub/AzjolNerubTriggerContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/AzjolNerub/Multiplier/AzjolNerubMultipliers.cpp b/src/Scenario/DungeonAi/Wotlk/AzjolNerub/Multiplier/AzjolNerubMultipliers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/AzjolNerub/Multiplier/AzjolNerubMultipliers.cpp
rename to src/Scenario/DungeonAi/Wotlk/AzjolNerub/Multiplier/AzjolNerubMultipliers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/AzjolNerub/Multiplier/AzjolNerubMultipliers.h b/src/Scenario/DungeonAi/Wotlk/AzjolNerub/Multiplier/AzjolNerubMultipliers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/AzjolNerub/Multiplier/AzjolNerubMultipliers.h
rename to src/Scenario/DungeonAi/Wotlk/AzjolNerub/Multiplier/AzjolNerubMultipliers.h
diff --git a/src/Extend/DungeonAi/Wotlk/AzjolNerub/Strategy/AzjolNerubStrategy.cpp b/src/Scenario/DungeonAi/Wotlk/AzjolNerub/Strategy/AzjolNerubStrategy.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/AzjolNerub/Strategy/AzjolNerubStrategy.cpp
rename to src/Scenario/DungeonAi/Wotlk/AzjolNerub/Strategy/AzjolNerubStrategy.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/AzjolNerub/Strategy/AzjolNerubStrategy.h b/src/Scenario/DungeonAi/Wotlk/AzjolNerub/Strategy/AzjolNerubStrategy.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/AzjolNerub/Strategy/AzjolNerubStrategy.h
rename to src/Scenario/DungeonAi/Wotlk/AzjolNerub/Strategy/AzjolNerubStrategy.h
diff --git a/src/Extend/DungeonAi/Wotlk/AzjolNerub/Trigger/AzjolNerubTriggers.cpp b/src/Scenario/DungeonAi/Wotlk/AzjolNerub/Trigger/AzjolNerubTriggers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/AzjolNerub/Trigger/AzjolNerubTriggers.cpp
rename to src/Scenario/DungeonAi/Wotlk/AzjolNerub/Trigger/AzjolNerubTriggers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/AzjolNerub/Trigger/AzjolNerubTriggers.h b/src/Scenario/DungeonAi/Wotlk/AzjolNerub/Trigger/AzjolNerubTriggers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/AzjolNerub/Trigger/AzjolNerubTriggers.h
rename to src/Scenario/DungeonAi/Wotlk/AzjolNerub/Trigger/AzjolNerubTriggers.h
diff --git a/src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Action/CullingOfStratholmeActions.cpp b/src/Scenario/DungeonAi/Wotlk/CullingOfStratholme/Action/CullingOfStratholmeActions.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Action/CullingOfStratholmeActions.cpp
rename to src/Scenario/DungeonAi/Wotlk/CullingOfStratholme/Action/CullingOfStratholmeActions.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Action/CullingOfStratholmeActions.h b/src/Scenario/DungeonAi/Wotlk/CullingOfStratholme/Action/CullingOfStratholmeActions.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Action/CullingOfStratholmeActions.h
rename to src/Scenario/DungeonAi/Wotlk/CullingOfStratholme/Action/CullingOfStratholmeActions.h
diff --git a/src/Extend/DungeonAi/Wotlk/CullingOfStratholme/CullingOfStratholmeActionContext.h b/src/Scenario/DungeonAi/Wotlk/CullingOfStratholme/CullingOfStratholmeActionContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/CullingOfStratholme/CullingOfStratholmeActionContext.h
rename to src/Scenario/DungeonAi/Wotlk/CullingOfStratholme/CullingOfStratholmeActionContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/CullingOfStratholme/CullingOfStratholmeTriggerContext.h b/src/Scenario/DungeonAi/Wotlk/CullingOfStratholme/CullingOfStratholmeTriggerContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/CullingOfStratholme/CullingOfStratholmeTriggerContext.h
rename to src/Scenario/DungeonAi/Wotlk/CullingOfStratholme/CullingOfStratholmeTriggerContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Multiplier/CullingOfStratholmeMultipliers.cpp b/src/Scenario/DungeonAi/Wotlk/CullingOfStratholme/Multiplier/CullingOfStratholmeMultipliers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Multiplier/CullingOfStratholmeMultipliers.cpp
rename to src/Scenario/DungeonAi/Wotlk/CullingOfStratholme/Multiplier/CullingOfStratholmeMultipliers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Multiplier/CullingOfStratholmeMultipliers.h b/src/Scenario/DungeonAi/Wotlk/CullingOfStratholme/Multiplier/CullingOfStratholmeMultipliers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Multiplier/CullingOfStratholmeMultipliers.h
rename to src/Scenario/DungeonAi/Wotlk/CullingOfStratholme/Multiplier/CullingOfStratholmeMultipliers.h
diff --git a/src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.cpp b/src/Scenario/DungeonAi/Wotlk/CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.cpp
rename to src/Scenario/DungeonAi/Wotlk/CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.h b/src/Scenario/DungeonAi/Wotlk/CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.h
rename to src/Scenario/DungeonAi/Wotlk/CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.h
diff --git a/src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Trigger/CullingOfStratholmeTriggers.cpp b/src/Scenario/DungeonAi/Wotlk/CullingOfStratholme/Trigger/CullingOfStratholmeTriggers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Trigger/CullingOfStratholmeTriggers.cpp
rename to src/Scenario/DungeonAi/Wotlk/CullingOfStratholme/Trigger/CullingOfStratholmeTriggers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Trigger/CullingOfStratholmeTriggers.h b/src/Scenario/DungeonAi/Wotlk/CullingOfStratholme/Trigger/CullingOfStratholmeTriggers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/CullingOfStratholme/Trigger/CullingOfStratholmeTriggers.h
rename to src/Scenario/DungeonAi/Wotlk/CullingOfStratholme/Trigger/CullingOfStratholmeTriggers.h
diff --git a/src/Extend/DungeonAi/Wotlk/DraktharonKeep/Action/DrakTharonKeepActions.cpp b/src/Scenario/DungeonAi/Wotlk/DraktharonKeep/Action/DrakTharonKeepActions.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/DraktharonKeep/Action/DrakTharonKeepActions.cpp
rename to src/Scenario/DungeonAi/Wotlk/DraktharonKeep/Action/DrakTharonKeepActions.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/DraktharonKeep/Action/DrakTharonKeepActions.h b/src/Scenario/DungeonAi/Wotlk/DraktharonKeep/Action/DrakTharonKeepActions.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/DraktharonKeep/Action/DrakTharonKeepActions.h
rename to src/Scenario/DungeonAi/Wotlk/DraktharonKeep/Action/DrakTharonKeepActions.h
diff --git a/src/Extend/DungeonAi/Wotlk/DraktharonKeep/DrakTharonKeepActionContext.h b/src/Scenario/DungeonAi/Wotlk/DraktharonKeep/DrakTharonKeepActionContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/DraktharonKeep/DrakTharonKeepActionContext.h
rename to src/Scenario/DungeonAi/Wotlk/DraktharonKeep/DrakTharonKeepActionContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/DraktharonKeep/DrakTharonKeepTriggerContext.h b/src/Scenario/DungeonAi/Wotlk/DraktharonKeep/DrakTharonKeepTriggerContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/DraktharonKeep/DrakTharonKeepTriggerContext.h
rename to src/Scenario/DungeonAi/Wotlk/DraktharonKeep/DrakTharonKeepTriggerContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/DraktharonKeep/Multiplier/DrakTharonKeepMultipliers.cpp b/src/Scenario/DungeonAi/Wotlk/DraktharonKeep/Multiplier/DrakTharonKeepMultipliers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/DraktharonKeep/Multiplier/DrakTharonKeepMultipliers.cpp
rename to src/Scenario/DungeonAi/Wotlk/DraktharonKeep/Multiplier/DrakTharonKeepMultipliers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/DraktharonKeep/Multiplier/DrakTharonKeepMultipliers.h b/src/Scenario/DungeonAi/Wotlk/DraktharonKeep/Multiplier/DrakTharonKeepMultipliers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/DraktharonKeep/Multiplier/DrakTharonKeepMultipliers.h
rename to src/Scenario/DungeonAi/Wotlk/DraktharonKeep/Multiplier/DrakTharonKeepMultipliers.h
diff --git a/src/Extend/DungeonAi/Wotlk/DraktharonKeep/Strategy/DrakTharonKeepStrategy.cpp b/src/Scenario/DungeonAi/Wotlk/DraktharonKeep/Strategy/DrakTharonKeepStrategy.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/DraktharonKeep/Strategy/DrakTharonKeepStrategy.cpp
rename to src/Scenario/DungeonAi/Wotlk/DraktharonKeep/Strategy/DrakTharonKeepStrategy.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/DraktharonKeep/Strategy/DrakTharonKeepStrategy.h b/src/Scenario/DungeonAi/Wotlk/DraktharonKeep/Strategy/DrakTharonKeepStrategy.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/DraktharonKeep/Strategy/DrakTharonKeepStrategy.h
rename to src/Scenario/DungeonAi/Wotlk/DraktharonKeep/Strategy/DrakTharonKeepStrategy.h
diff --git a/src/Extend/DungeonAi/Wotlk/DraktharonKeep/Trigger/DrakTharonKeepTriggers.cpp b/src/Scenario/DungeonAi/Wotlk/DraktharonKeep/Trigger/DrakTharonKeepTriggers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/DraktharonKeep/Trigger/DrakTharonKeepTriggers.cpp
rename to src/Scenario/DungeonAi/Wotlk/DraktharonKeep/Trigger/DrakTharonKeepTriggers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/DraktharonKeep/Trigger/DrakTharonKeepTriggers.h b/src/Scenario/DungeonAi/Wotlk/DraktharonKeep/Trigger/DrakTharonKeepTriggers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/DraktharonKeep/Trigger/DrakTharonKeepTriggers.h
rename to src/Scenario/DungeonAi/Wotlk/DraktharonKeep/Trigger/DrakTharonKeepTriggers.h
diff --git a/src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Action/ForgeOfSoulsActions.cpp b/src/Scenario/DungeonAi/Wotlk/ForgeOfSouls/Action/ForgeOfSoulsActions.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Action/ForgeOfSoulsActions.cpp
rename to src/Scenario/DungeonAi/Wotlk/ForgeOfSouls/Action/ForgeOfSoulsActions.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Action/ForgeOfSoulsActions.h b/src/Scenario/DungeonAi/Wotlk/ForgeOfSouls/Action/ForgeOfSoulsActions.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Action/ForgeOfSoulsActions.h
rename to src/Scenario/DungeonAi/Wotlk/ForgeOfSouls/Action/ForgeOfSoulsActions.h
diff --git a/src/Extend/DungeonAi/Wotlk/ForgeOfSouls/ForgeOfSoulsActionContext.h b/src/Scenario/DungeonAi/Wotlk/ForgeOfSouls/ForgeOfSoulsActionContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/ForgeOfSouls/ForgeOfSoulsActionContext.h
rename to src/Scenario/DungeonAi/Wotlk/ForgeOfSouls/ForgeOfSoulsActionContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/ForgeOfSouls/ForgeOfSoulsTriggerContext.h b/src/Scenario/DungeonAi/Wotlk/ForgeOfSouls/ForgeOfSoulsTriggerContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/ForgeOfSouls/ForgeOfSoulsTriggerContext.h
rename to src/Scenario/DungeonAi/Wotlk/ForgeOfSouls/ForgeOfSoulsTriggerContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Multiplier/ForgeOfSoulsMultipliers.cpp b/src/Scenario/DungeonAi/Wotlk/ForgeOfSouls/Multiplier/ForgeOfSoulsMultipliers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Multiplier/ForgeOfSoulsMultipliers.cpp
rename to src/Scenario/DungeonAi/Wotlk/ForgeOfSouls/Multiplier/ForgeOfSoulsMultipliers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Multiplier/ForgeOfSoulsMultipliers.h b/src/Scenario/DungeonAi/Wotlk/ForgeOfSouls/Multiplier/ForgeOfSoulsMultipliers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Multiplier/ForgeOfSoulsMultipliers.h
rename to src/Scenario/DungeonAi/Wotlk/ForgeOfSouls/Multiplier/ForgeOfSoulsMultipliers.h
diff --git a/src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.cpp b/src/Scenario/DungeonAi/Wotlk/ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.cpp
rename to src/Scenario/DungeonAi/Wotlk/ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.h b/src/Scenario/DungeonAi/Wotlk/ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.h
rename to src/Scenario/DungeonAi/Wotlk/ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.h
diff --git a/src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Trigger/ForgeOfSoulsTriggers.cpp b/src/Scenario/DungeonAi/Wotlk/ForgeOfSouls/Trigger/ForgeOfSoulsTriggers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Trigger/ForgeOfSoulsTriggers.cpp
rename to src/Scenario/DungeonAi/Wotlk/ForgeOfSouls/Trigger/ForgeOfSoulsTriggers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Trigger/ForgeOfSoulsTriggers.h b/src/Scenario/DungeonAi/Wotlk/ForgeOfSouls/Trigger/ForgeOfSoulsTriggers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/ForgeOfSouls/Trigger/ForgeOfSoulsTriggers.h
rename to src/Scenario/DungeonAi/Wotlk/ForgeOfSouls/Trigger/ForgeOfSoulsTriggers.h
diff --git a/src/Extend/DungeonAi/Wotlk/Gundrak/Action/GundrakActions.cpp b/src/Scenario/DungeonAi/Wotlk/Gundrak/Action/GundrakActions.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Gundrak/Action/GundrakActions.cpp
rename to src/Scenario/DungeonAi/Wotlk/Gundrak/Action/GundrakActions.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/Gundrak/Action/GundrakActions.h b/src/Scenario/DungeonAi/Wotlk/Gundrak/Action/GundrakActions.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Gundrak/Action/GundrakActions.h
rename to src/Scenario/DungeonAi/Wotlk/Gundrak/Action/GundrakActions.h
diff --git a/src/Extend/DungeonAi/Wotlk/Gundrak/GundrakActionContext.h b/src/Scenario/DungeonAi/Wotlk/Gundrak/GundrakActionContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Gundrak/GundrakActionContext.h
rename to src/Scenario/DungeonAi/Wotlk/Gundrak/GundrakActionContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/Gundrak/GundrakTriggerContext.h b/src/Scenario/DungeonAi/Wotlk/Gundrak/GundrakTriggerContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Gundrak/GundrakTriggerContext.h
rename to src/Scenario/DungeonAi/Wotlk/Gundrak/GundrakTriggerContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/Gundrak/Multiplier/GundrakMultipliers.cpp b/src/Scenario/DungeonAi/Wotlk/Gundrak/Multiplier/GundrakMultipliers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Gundrak/Multiplier/GundrakMultipliers.cpp
rename to src/Scenario/DungeonAi/Wotlk/Gundrak/Multiplier/GundrakMultipliers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/Gundrak/Multiplier/GundrakMultipliers.h b/src/Scenario/DungeonAi/Wotlk/Gundrak/Multiplier/GundrakMultipliers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Gundrak/Multiplier/GundrakMultipliers.h
rename to src/Scenario/DungeonAi/Wotlk/Gundrak/Multiplier/GundrakMultipliers.h
diff --git a/src/Extend/DungeonAi/Wotlk/Gundrak/Strategy/GundrakStrategy.cpp b/src/Scenario/DungeonAi/Wotlk/Gundrak/Strategy/GundrakStrategy.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Gundrak/Strategy/GundrakStrategy.cpp
rename to src/Scenario/DungeonAi/Wotlk/Gundrak/Strategy/GundrakStrategy.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/Gundrak/Strategy/GundrakStrategy.h b/src/Scenario/DungeonAi/Wotlk/Gundrak/Strategy/GundrakStrategy.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Gundrak/Strategy/GundrakStrategy.h
rename to src/Scenario/DungeonAi/Wotlk/Gundrak/Strategy/GundrakStrategy.h
diff --git a/src/Extend/DungeonAi/Wotlk/Gundrak/Trigger/GundrakTriggers.cpp b/src/Scenario/DungeonAi/Wotlk/Gundrak/Trigger/GundrakTriggers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Gundrak/Trigger/GundrakTriggers.cpp
rename to src/Scenario/DungeonAi/Wotlk/Gundrak/Trigger/GundrakTriggers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/Gundrak/Trigger/GundrakTriggers.h b/src/Scenario/DungeonAi/Wotlk/Gundrak/Trigger/GundrakTriggers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Gundrak/Trigger/GundrakTriggers.h
rename to src/Scenario/DungeonAi/Wotlk/Gundrak/Trigger/GundrakTriggers.h
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfLightning/Action/HallsOfLightningActions.cpp b/src/Scenario/DungeonAi/Wotlk/HallsOfLightning/Action/HallsOfLightningActions.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfLightning/Action/HallsOfLightningActions.cpp
rename to src/Scenario/DungeonAi/Wotlk/HallsOfLightning/Action/HallsOfLightningActions.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfLightning/Action/HallsOfLightningActions.h b/src/Scenario/DungeonAi/Wotlk/HallsOfLightning/Action/HallsOfLightningActions.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfLightning/Action/HallsOfLightningActions.h
rename to src/Scenario/DungeonAi/Wotlk/HallsOfLightning/Action/HallsOfLightningActions.h
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfLightning/HallsOfLightningActionContext.h b/src/Scenario/DungeonAi/Wotlk/HallsOfLightning/HallsOfLightningActionContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfLightning/HallsOfLightningActionContext.h
rename to src/Scenario/DungeonAi/Wotlk/HallsOfLightning/HallsOfLightningActionContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfLightning/HallsOfLightningTriggerContext.h b/src/Scenario/DungeonAi/Wotlk/HallsOfLightning/HallsOfLightningTriggerContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfLightning/HallsOfLightningTriggerContext.h
rename to src/Scenario/DungeonAi/Wotlk/HallsOfLightning/HallsOfLightningTriggerContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfLightning/Multiplier/HallsOfLightningMultipliers.cpp b/src/Scenario/DungeonAi/Wotlk/HallsOfLightning/Multiplier/HallsOfLightningMultipliers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfLightning/Multiplier/HallsOfLightningMultipliers.cpp
rename to src/Scenario/DungeonAi/Wotlk/HallsOfLightning/Multiplier/HallsOfLightningMultipliers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfLightning/Multiplier/HallsOfLightningMultipliers.h b/src/Scenario/DungeonAi/Wotlk/HallsOfLightning/Multiplier/HallsOfLightningMultipliers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfLightning/Multiplier/HallsOfLightningMultipliers.h
rename to src/Scenario/DungeonAi/Wotlk/HallsOfLightning/Multiplier/HallsOfLightningMultipliers.h
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfLightning/Strategy/HallsOfLightningStrategy.cpp b/src/Scenario/DungeonAi/Wotlk/HallsOfLightning/Strategy/HallsOfLightningStrategy.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfLightning/Strategy/HallsOfLightningStrategy.cpp
rename to src/Scenario/DungeonAi/Wotlk/HallsOfLightning/Strategy/HallsOfLightningStrategy.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfLightning/Strategy/HallsOfLightningStrategy.h b/src/Scenario/DungeonAi/Wotlk/HallsOfLightning/Strategy/HallsOfLightningStrategy.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfLightning/Strategy/HallsOfLightningStrategy.h
rename to src/Scenario/DungeonAi/Wotlk/HallsOfLightning/Strategy/HallsOfLightningStrategy.h
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfLightning/Trigger/HallsOfLightningTriggers.cpp b/src/Scenario/DungeonAi/Wotlk/HallsOfLightning/Trigger/HallsOfLightningTriggers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfLightning/Trigger/HallsOfLightningTriggers.cpp
rename to src/Scenario/DungeonAi/Wotlk/HallsOfLightning/Trigger/HallsOfLightningTriggers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfLightning/Trigger/HallsOfLightningTriggers.h b/src/Scenario/DungeonAi/Wotlk/HallsOfLightning/Trigger/HallsOfLightningTriggers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfLightning/Trigger/HallsOfLightningTriggers.h
rename to src/Scenario/DungeonAi/Wotlk/HallsOfLightning/Trigger/HallsOfLightningTriggers.h
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfReflection/TODO b/src/Scenario/DungeonAi/Wotlk/HallsOfReflection/TODO
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfReflection/TODO
rename to src/Scenario/DungeonAi/Wotlk/HallsOfReflection/TODO
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfStone/Action/HallsOfStoneActions.cpp b/src/Scenario/DungeonAi/Wotlk/HallsOfStone/Action/HallsOfStoneActions.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfStone/Action/HallsOfStoneActions.cpp
rename to src/Scenario/DungeonAi/Wotlk/HallsOfStone/Action/HallsOfStoneActions.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfStone/Action/HallsOfStoneActions.h b/src/Scenario/DungeonAi/Wotlk/HallsOfStone/Action/HallsOfStoneActions.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfStone/Action/HallsOfStoneActions.h
rename to src/Scenario/DungeonAi/Wotlk/HallsOfStone/Action/HallsOfStoneActions.h
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfStone/HallsOfStoneActionContext.h b/src/Scenario/DungeonAi/Wotlk/HallsOfStone/HallsOfStoneActionContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfStone/HallsOfStoneActionContext.h
rename to src/Scenario/DungeonAi/Wotlk/HallsOfStone/HallsOfStoneActionContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfStone/HallsOfStoneTriggerContext.h b/src/Scenario/DungeonAi/Wotlk/HallsOfStone/HallsOfStoneTriggerContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfStone/HallsOfStoneTriggerContext.h
rename to src/Scenario/DungeonAi/Wotlk/HallsOfStone/HallsOfStoneTriggerContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfStone/Multiplier/HallsOfStoneMultipliers.cpp b/src/Scenario/DungeonAi/Wotlk/HallsOfStone/Multiplier/HallsOfStoneMultipliers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfStone/Multiplier/HallsOfStoneMultipliers.cpp
rename to src/Scenario/DungeonAi/Wotlk/HallsOfStone/Multiplier/HallsOfStoneMultipliers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfStone/Multiplier/HallsOfStoneMultipliers.h b/src/Scenario/DungeonAi/Wotlk/HallsOfStone/Multiplier/HallsOfStoneMultipliers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfStone/Multiplier/HallsOfStoneMultipliers.h
rename to src/Scenario/DungeonAi/Wotlk/HallsOfStone/Multiplier/HallsOfStoneMultipliers.h
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfStone/Strategy/HallsOfStoneStrategy.cpp b/src/Scenario/DungeonAi/Wotlk/HallsOfStone/Strategy/HallsOfStoneStrategy.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfStone/Strategy/HallsOfStoneStrategy.cpp
rename to src/Scenario/DungeonAi/Wotlk/HallsOfStone/Strategy/HallsOfStoneStrategy.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfStone/Strategy/HallsOfStoneStrategy.h b/src/Scenario/DungeonAi/Wotlk/HallsOfStone/Strategy/HallsOfStoneStrategy.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfStone/Strategy/HallsOfStoneStrategy.h
rename to src/Scenario/DungeonAi/Wotlk/HallsOfStone/Strategy/HallsOfStoneStrategy.h
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfStone/Trigger/HallsOfStoneTriggers.cpp b/src/Scenario/DungeonAi/Wotlk/HallsOfStone/Trigger/HallsOfStoneTriggers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfStone/Trigger/HallsOfStoneTriggers.cpp
rename to src/Scenario/DungeonAi/Wotlk/HallsOfStone/Trigger/HallsOfStoneTriggers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/HallsOfStone/Trigger/HallsOfStoneTriggers.h b/src/Scenario/DungeonAi/Wotlk/HallsOfStone/Trigger/HallsOfStoneTriggers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/HallsOfStone/Trigger/HallsOfStoneTriggers.h
rename to src/Scenario/DungeonAi/Wotlk/HallsOfStone/Trigger/HallsOfStoneTriggers.h
diff --git a/src/Extend/DungeonAi/Wotlk/Nexus/Action/NexusActions.cpp b/src/Scenario/DungeonAi/Wotlk/Nexus/Action/NexusActions.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Nexus/Action/NexusActions.cpp
rename to src/Scenario/DungeonAi/Wotlk/Nexus/Action/NexusActions.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/Nexus/Action/NexusActions.h b/src/Scenario/DungeonAi/Wotlk/Nexus/Action/NexusActions.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Nexus/Action/NexusActions.h
rename to src/Scenario/DungeonAi/Wotlk/Nexus/Action/NexusActions.h
diff --git a/src/Extend/DungeonAi/Wotlk/Nexus/Multiplier/NexusMultipliers.cpp b/src/Scenario/DungeonAi/Wotlk/Nexus/Multiplier/NexusMultipliers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Nexus/Multiplier/NexusMultipliers.cpp
rename to src/Scenario/DungeonAi/Wotlk/Nexus/Multiplier/NexusMultipliers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/Nexus/Multiplier/NexusMultipliers.h b/src/Scenario/DungeonAi/Wotlk/Nexus/Multiplier/NexusMultipliers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Nexus/Multiplier/NexusMultipliers.h
rename to src/Scenario/DungeonAi/Wotlk/Nexus/Multiplier/NexusMultipliers.h
diff --git a/src/Extend/DungeonAi/Wotlk/Nexus/NexusActionContext.h b/src/Scenario/DungeonAi/Wotlk/Nexus/NexusActionContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Nexus/NexusActionContext.h
rename to src/Scenario/DungeonAi/Wotlk/Nexus/NexusActionContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/Nexus/NexusTriggerContext.h b/src/Scenario/DungeonAi/Wotlk/Nexus/NexusTriggerContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Nexus/NexusTriggerContext.h
rename to src/Scenario/DungeonAi/Wotlk/Nexus/NexusTriggerContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/Nexus/Strategy/NexusStrategy.cpp b/src/Scenario/DungeonAi/Wotlk/Nexus/Strategy/NexusStrategy.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Nexus/Strategy/NexusStrategy.cpp
rename to src/Scenario/DungeonAi/Wotlk/Nexus/Strategy/NexusStrategy.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/Nexus/Strategy/NexusStrategy.h b/src/Scenario/DungeonAi/Wotlk/Nexus/Strategy/NexusStrategy.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Nexus/Strategy/NexusStrategy.h
rename to src/Scenario/DungeonAi/Wotlk/Nexus/Strategy/NexusStrategy.h
diff --git a/src/Extend/DungeonAi/Wotlk/Nexus/Trigger/NexusTriggers.cpp b/src/Scenario/DungeonAi/Wotlk/Nexus/Trigger/NexusTriggers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Nexus/Trigger/NexusTriggers.cpp
rename to src/Scenario/DungeonAi/Wotlk/Nexus/Trigger/NexusTriggers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/Nexus/Trigger/NexusTriggers.h b/src/Scenario/DungeonAi/Wotlk/Nexus/Trigger/NexusTriggers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Nexus/Trigger/NexusTriggers.h
rename to src/Scenario/DungeonAi/Wotlk/Nexus/Trigger/NexusTriggers.h
diff --git a/src/Extend/DungeonAi/Wotlk/Oculus/Action/OculusActions.cpp b/src/Scenario/DungeonAi/Wotlk/Oculus/Action/OculusActions.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Oculus/Action/OculusActions.cpp
rename to src/Scenario/DungeonAi/Wotlk/Oculus/Action/OculusActions.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/Oculus/Action/OculusActions.h b/src/Scenario/DungeonAi/Wotlk/Oculus/Action/OculusActions.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Oculus/Action/OculusActions.h
rename to src/Scenario/DungeonAi/Wotlk/Oculus/Action/OculusActions.h
diff --git a/src/Extend/DungeonAi/Wotlk/Oculus/Multiplier/OculusMultipliers.cpp b/src/Scenario/DungeonAi/Wotlk/Oculus/Multiplier/OculusMultipliers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Oculus/Multiplier/OculusMultipliers.cpp
rename to src/Scenario/DungeonAi/Wotlk/Oculus/Multiplier/OculusMultipliers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/Oculus/Multiplier/OculusMultipliers.h b/src/Scenario/DungeonAi/Wotlk/Oculus/Multiplier/OculusMultipliers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Oculus/Multiplier/OculusMultipliers.h
rename to src/Scenario/DungeonAi/Wotlk/Oculus/Multiplier/OculusMultipliers.h
diff --git a/src/Extend/DungeonAi/Wotlk/Oculus/OculusActionContext.h b/src/Scenario/DungeonAi/Wotlk/Oculus/OculusActionContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Oculus/OculusActionContext.h
rename to src/Scenario/DungeonAi/Wotlk/Oculus/OculusActionContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/Oculus/OculusTriggerContext.h b/src/Scenario/DungeonAi/Wotlk/Oculus/OculusTriggerContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Oculus/OculusTriggerContext.h
rename to src/Scenario/DungeonAi/Wotlk/Oculus/OculusTriggerContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/Oculus/Strategy/OculusStrategy.cpp b/src/Scenario/DungeonAi/Wotlk/Oculus/Strategy/OculusStrategy.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Oculus/Strategy/OculusStrategy.cpp
rename to src/Scenario/DungeonAi/Wotlk/Oculus/Strategy/OculusStrategy.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/Oculus/Strategy/OculusStrategy.h b/src/Scenario/DungeonAi/Wotlk/Oculus/Strategy/OculusStrategy.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Oculus/Strategy/OculusStrategy.h
rename to src/Scenario/DungeonAi/Wotlk/Oculus/Strategy/OculusStrategy.h
diff --git a/src/Extend/DungeonAi/Wotlk/Oculus/Trigger/OculusTriggers.cpp b/src/Scenario/DungeonAi/Wotlk/Oculus/Trigger/OculusTriggers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Oculus/Trigger/OculusTriggers.cpp
rename to src/Scenario/DungeonAi/Wotlk/Oculus/Trigger/OculusTriggers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/Oculus/Trigger/OculusTriggers.h b/src/Scenario/DungeonAi/Wotlk/Oculus/Trigger/OculusTriggers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/Oculus/Trigger/OculusTriggers.h
rename to src/Scenario/DungeonAi/Wotlk/Oculus/Trigger/OculusTriggers.h
diff --git a/src/Extend/DungeonAi/Wotlk/OldKingdom/Action/OldKingdomActions.cpp b/src/Scenario/DungeonAi/Wotlk/OldKingdom/Action/OldKingdomActions.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/OldKingdom/Action/OldKingdomActions.cpp
rename to src/Scenario/DungeonAi/Wotlk/OldKingdom/Action/OldKingdomActions.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/OldKingdom/Action/OldKingdomActions.h b/src/Scenario/DungeonAi/Wotlk/OldKingdom/Action/OldKingdomActions.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/OldKingdom/Action/OldKingdomActions.h
rename to src/Scenario/DungeonAi/Wotlk/OldKingdom/Action/OldKingdomActions.h
diff --git a/src/Extend/DungeonAi/Wotlk/OldKingdom/Multiplier/OldKingdomMultipliers.cpp b/src/Scenario/DungeonAi/Wotlk/OldKingdom/Multiplier/OldKingdomMultipliers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/OldKingdom/Multiplier/OldKingdomMultipliers.cpp
rename to src/Scenario/DungeonAi/Wotlk/OldKingdom/Multiplier/OldKingdomMultipliers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/OldKingdom/Multiplier/OldKingdomMultipliers.h b/src/Scenario/DungeonAi/Wotlk/OldKingdom/Multiplier/OldKingdomMultipliers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/OldKingdom/Multiplier/OldKingdomMultipliers.h
rename to src/Scenario/DungeonAi/Wotlk/OldKingdom/Multiplier/OldKingdomMultipliers.h
diff --git a/src/Extend/DungeonAi/Wotlk/OldKingdom/OldKingdomActionContext.h b/src/Scenario/DungeonAi/Wotlk/OldKingdom/OldKingdomActionContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/OldKingdom/OldKingdomActionContext.h
rename to src/Scenario/DungeonAi/Wotlk/OldKingdom/OldKingdomActionContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/OldKingdom/OldKingdomTriggerContext.h b/src/Scenario/DungeonAi/Wotlk/OldKingdom/OldKingdomTriggerContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/OldKingdom/OldKingdomTriggerContext.h
rename to src/Scenario/DungeonAi/Wotlk/OldKingdom/OldKingdomTriggerContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/OldKingdom/Strategy/OldKingdomStrategy.cpp b/src/Scenario/DungeonAi/Wotlk/OldKingdom/Strategy/OldKingdomStrategy.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/OldKingdom/Strategy/OldKingdomStrategy.cpp
rename to src/Scenario/DungeonAi/Wotlk/OldKingdom/Strategy/OldKingdomStrategy.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/OldKingdom/Strategy/OldKingdomStrategy.h b/src/Scenario/DungeonAi/Wotlk/OldKingdom/Strategy/OldKingdomStrategy.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/OldKingdom/Strategy/OldKingdomStrategy.h
rename to src/Scenario/DungeonAi/Wotlk/OldKingdom/Strategy/OldKingdomStrategy.h
diff --git a/src/Extend/DungeonAi/Wotlk/OldKingdom/Trigger/OldKingdomTriggers.cpp b/src/Scenario/DungeonAi/Wotlk/OldKingdom/Trigger/OldKingdomTriggers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/OldKingdom/Trigger/OldKingdomTriggers.cpp
rename to src/Scenario/DungeonAi/Wotlk/OldKingdom/Trigger/OldKingdomTriggers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/OldKingdom/Trigger/OldKingdomTriggers.h b/src/Scenario/DungeonAi/Wotlk/OldKingdom/Trigger/OldKingdomTriggers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/OldKingdom/Trigger/OldKingdomTriggers.h
rename to src/Scenario/DungeonAi/Wotlk/OldKingdom/Trigger/OldKingdomTriggers.h
diff --git a/src/Extend/DungeonAi/Wotlk/PitOfSaron/Action/PitOfSaronActions.cpp b/src/Scenario/DungeonAi/Wotlk/PitOfSaron/Action/PitOfSaronActions.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/PitOfSaron/Action/PitOfSaronActions.cpp
rename to src/Scenario/DungeonAi/Wotlk/PitOfSaron/Action/PitOfSaronActions.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/PitOfSaron/Action/PitOfSaronActions.h b/src/Scenario/DungeonAi/Wotlk/PitOfSaron/Action/PitOfSaronActions.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/PitOfSaron/Action/PitOfSaronActions.h
rename to src/Scenario/DungeonAi/Wotlk/PitOfSaron/Action/PitOfSaronActions.h
diff --git a/src/Extend/DungeonAi/Wotlk/PitOfSaron/Multiplier/PitOfSaronMultipliers.cpp b/src/Scenario/DungeonAi/Wotlk/PitOfSaron/Multiplier/PitOfSaronMultipliers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/PitOfSaron/Multiplier/PitOfSaronMultipliers.cpp
rename to src/Scenario/DungeonAi/Wotlk/PitOfSaron/Multiplier/PitOfSaronMultipliers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/PitOfSaron/Multiplier/PitOfSaronMultipliers.h b/src/Scenario/DungeonAi/Wotlk/PitOfSaron/Multiplier/PitOfSaronMultipliers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/PitOfSaron/Multiplier/PitOfSaronMultipliers.h
rename to src/Scenario/DungeonAi/Wotlk/PitOfSaron/Multiplier/PitOfSaronMultipliers.h
diff --git a/src/Extend/DungeonAi/Wotlk/PitOfSaron/PitOfSaronActionContext.h b/src/Scenario/DungeonAi/Wotlk/PitOfSaron/PitOfSaronActionContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/PitOfSaron/PitOfSaronActionContext.h
rename to src/Scenario/DungeonAi/Wotlk/PitOfSaron/PitOfSaronActionContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/PitOfSaron/PitOfSaronTriggerContext.h b/src/Scenario/DungeonAi/Wotlk/PitOfSaron/PitOfSaronTriggerContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/PitOfSaron/PitOfSaronTriggerContext.h
rename to src/Scenario/DungeonAi/Wotlk/PitOfSaron/PitOfSaronTriggerContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/PitOfSaron/Strategy/PitOfSaronStrategy.cpp b/src/Scenario/DungeonAi/Wotlk/PitOfSaron/Strategy/PitOfSaronStrategy.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/PitOfSaron/Strategy/PitOfSaronStrategy.cpp
rename to src/Scenario/DungeonAi/Wotlk/PitOfSaron/Strategy/PitOfSaronStrategy.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/PitOfSaron/Strategy/PitOfSaronStrategy.h b/src/Scenario/DungeonAi/Wotlk/PitOfSaron/Strategy/PitOfSaronStrategy.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/PitOfSaron/Strategy/PitOfSaronStrategy.h
rename to src/Scenario/DungeonAi/Wotlk/PitOfSaron/Strategy/PitOfSaronStrategy.h
diff --git a/src/Extend/DungeonAi/Wotlk/PitOfSaron/Trigger/PitOfSaronTriggers.cpp b/src/Scenario/DungeonAi/Wotlk/PitOfSaron/Trigger/PitOfSaronTriggers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/PitOfSaron/Trigger/PitOfSaronTriggers.cpp
rename to src/Scenario/DungeonAi/Wotlk/PitOfSaron/Trigger/PitOfSaronTriggers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/PitOfSaron/Trigger/PitOfSaronTriggers.h b/src/Scenario/DungeonAi/Wotlk/PitOfSaron/Trigger/PitOfSaronTriggers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/PitOfSaron/Trigger/PitOfSaronTriggers.h
rename to src/Scenario/DungeonAi/Wotlk/PitOfSaron/Trigger/PitOfSaronTriggers.h
diff --git a/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Action/TrialOfTheChampionActions.cpp b/src/Scenario/DungeonAi/Wotlk/TrialOfTheChampion/Action/TrialOfTheChampionActions.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Action/TrialOfTheChampionActions.cpp
rename to src/Scenario/DungeonAi/Wotlk/TrialOfTheChampion/Action/TrialOfTheChampionActions.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Action/TrialOfTheChampionActions.h b/src/Scenario/DungeonAi/Wotlk/TrialOfTheChampion/Action/TrialOfTheChampionActions.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Action/TrialOfTheChampionActions.h
rename to src/Scenario/DungeonAi/Wotlk/TrialOfTheChampion/Action/TrialOfTheChampionActions.h
diff --git a/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Multiplier/TrialOfTheChampionMultipliers.cpp b/src/Scenario/DungeonAi/Wotlk/TrialOfTheChampion/Multiplier/TrialOfTheChampionMultipliers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Multiplier/TrialOfTheChampionMultipliers.cpp
rename to src/Scenario/DungeonAi/Wotlk/TrialOfTheChampion/Multiplier/TrialOfTheChampionMultipliers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Multiplier/TrialOfTheChampionMultipliers.h b/src/Scenario/DungeonAi/Wotlk/TrialOfTheChampion/Multiplier/TrialOfTheChampionMultipliers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Multiplier/TrialOfTheChampionMultipliers.h
rename to src/Scenario/DungeonAi/Wotlk/TrialOfTheChampion/Multiplier/TrialOfTheChampionMultipliers.h
diff --git a/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.cpp b/src/Scenario/DungeonAi/Wotlk/TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.cpp
rename to src/Scenario/DungeonAi/Wotlk/TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.h b/src/Scenario/DungeonAi/Wotlk/TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.h
rename to src/Scenario/DungeonAi/Wotlk/TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.h
diff --git a/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/TrialOfTheChampionActionContext.h b/src/Scenario/DungeonAi/Wotlk/TrialOfTheChampion/TrialOfTheChampionActionContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/TrialOfTheChampionActionContext.h
rename to src/Scenario/DungeonAi/Wotlk/TrialOfTheChampion/TrialOfTheChampionActionContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/TrialOfTheChampionTriggerContext.h b/src/Scenario/DungeonAi/Wotlk/TrialOfTheChampion/TrialOfTheChampionTriggerContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/TrialOfTheChampionTriggerContext.h
rename to src/Scenario/DungeonAi/Wotlk/TrialOfTheChampion/TrialOfTheChampionTriggerContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Trigger/TrialOfTheChampionTriggers.cpp b/src/Scenario/DungeonAi/Wotlk/TrialOfTheChampion/Trigger/TrialOfTheChampionTriggers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Trigger/TrialOfTheChampionTriggers.cpp
rename to src/Scenario/DungeonAi/Wotlk/TrialOfTheChampion/Trigger/TrialOfTheChampionTriggers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Trigger/TrialOfTheChampionTriggers.h b/src/Scenario/DungeonAi/Wotlk/TrialOfTheChampion/Trigger/TrialOfTheChampionTriggers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/TrialOfTheChampion/Trigger/TrialOfTheChampionTriggers.h
rename to src/Scenario/DungeonAi/Wotlk/TrialOfTheChampion/Trigger/TrialOfTheChampionTriggers.h
diff --git a/src/Extend/DungeonAi/Wotlk/UtgardeKeep/Action/UtgardeKeepActions.cpp b/src/Scenario/DungeonAi/Wotlk/UtgardeKeep/Action/UtgardeKeepActions.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/UtgardeKeep/Action/UtgardeKeepActions.cpp
rename to src/Scenario/DungeonAi/Wotlk/UtgardeKeep/Action/UtgardeKeepActions.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/UtgardeKeep/Action/UtgardeKeepActions.h b/src/Scenario/DungeonAi/Wotlk/UtgardeKeep/Action/UtgardeKeepActions.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/UtgardeKeep/Action/UtgardeKeepActions.h
rename to src/Scenario/DungeonAi/Wotlk/UtgardeKeep/Action/UtgardeKeepActions.h
diff --git a/src/Extend/DungeonAi/Wotlk/UtgardeKeep/Multiplier/UtgardeKeepMultipliers.cpp b/src/Scenario/DungeonAi/Wotlk/UtgardeKeep/Multiplier/UtgardeKeepMultipliers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/UtgardeKeep/Multiplier/UtgardeKeepMultipliers.cpp
rename to src/Scenario/DungeonAi/Wotlk/UtgardeKeep/Multiplier/UtgardeKeepMultipliers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/UtgardeKeep/Multiplier/UtgardeKeepMultipliers.h b/src/Scenario/DungeonAi/Wotlk/UtgardeKeep/Multiplier/UtgardeKeepMultipliers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/UtgardeKeep/Multiplier/UtgardeKeepMultipliers.h
rename to src/Scenario/DungeonAi/Wotlk/UtgardeKeep/Multiplier/UtgardeKeepMultipliers.h
diff --git a/src/Extend/DungeonAi/Wotlk/UtgardeKeep/Strategy/UtgardeKeepStrategy.cpp b/src/Scenario/DungeonAi/Wotlk/UtgardeKeep/Strategy/UtgardeKeepStrategy.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/UtgardeKeep/Strategy/UtgardeKeepStrategy.cpp
rename to src/Scenario/DungeonAi/Wotlk/UtgardeKeep/Strategy/UtgardeKeepStrategy.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/UtgardeKeep/Strategy/UtgardeKeepStrategy.h b/src/Scenario/DungeonAi/Wotlk/UtgardeKeep/Strategy/UtgardeKeepStrategy.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/UtgardeKeep/Strategy/UtgardeKeepStrategy.h
rename to src/Scenario/DungeonAi/Wotlk/UtgardeKeep/Strategy/UtgardeKeepStrategy.h
diff --git a/src/Extend/DungeonAi/Wotlk/UtgardeKeep/Trigger/UtgardeKeepTriggers.cpp b/src/Scenario/DungeonAi/Wotlk/UtgardeKeep/Trigger/UtgardeKeepTriggers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/UtgardeKeep/Trigger/UtgardeKeepTriggers.cpp
rename to src/Scenario/DungeonAi/Wotlk/UtgardeKeep/Trigger/UtgardeKeepTriggers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/UtgardeKeep/Trigger/UtgardeKeepTriggers.h b/src/Scenario/DungeonAi/Wotlk/UtgardeKeep/Trigger/UtgardeKeepTriggers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/UtgardeKeep/Trigger/UtgardeKeepTriggers.h
rename to src/Scenario/DungeonAi/Wotlk/UtgardeKeep/Trigger/UtgardeKeepTriggers.h
diff --git a/src/Extend/DungeonAi/Wotlk/UtgardeKeep/UtgardeKeepActionContext.h b/src/Scenario/DungeonAi/Wotlk/UtgardeKeep/UtgardeKeepActionContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/UtgardeKeep/UtgardeKeepActionContext.h
rename to src/Scenario/DungeonAi/Wotlk/UtgardeKeep/UtgardeKeepActionContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/UtgardeKeep/UtgardeKeepTriggerContext.h b/src/Scenario/DungeonAi/Wotlk/UtgardeKeep/UtgardeKeepTriggerContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/UtgardeKeep/UtgardeKeepTriggerContext.h
rename to src/Scenario/DungeonAi/Wotlk/UtgardeKeep/UtgardeKeepTriggerContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Action/UtgardePinnacleActions.cpp b/src/Scenario/DungeonAi/Wotlk/UtgardePinnacle/Action/UtgardePinnacleActions.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Action/UtgardePinnacleActions.cpp
rename to src/Scenario/DungeonAi/Wotlk/UtgardePinnacle/Action/UtgardePinnacleActions.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Action/UtgardePinnacleActions.h b/src/Scenario/DungeonAi/Wotlk/UtgardePinnacle/Action/UtgardePinnacleActions.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Action/UtgardePinnacleActions.h
rename to src/Scenario/DungeonAi/Wotlk/UtgardePinnacle/Action/UtgardePinnacleActions.h
diff --git a/src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Multiplier/UtgardePinnacleMultipliers.cpp b/src/Scenario/DungeonAi/Wotlk/UtgardePinnacle/Multiplier/UtgardePinnacleMultipliers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Multiplier/UtgardePinnacleMultipliers.cpp
rename to src/Scenario/DungeonAi/Wotlk/UtgardePinnacle/Multiplier/UtgardePinnacleMultipliers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Multiplier/UtgardePinnacleMultipliers.h b/src/Scenario/DungeonAi/Wotlk/UtgardePinnacle/Multiplier/UtgardePinnacleMultipliers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Multiplier/UtgardePinnacleMultipliers.h
rename to src/Scenario/DungeonAi/Wotlk/UtgardePinnacle/Multiplier/UtgardePinnacleMultipliers.h
diff --git a/src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Strategy/UtgardePinnacleStrategy.cpp b/src/Scenario/DungeonAi/Wotlk/UtgardePinnacle/Strategy/UtgardePinnacleStrategy.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Strategy/UtgardePinnacleStrategy.cpp
rename to src/Scenario/DungeonAi/Wotlk/UtgardePinnacle/Strategy/UtgardePinnacleStrategy.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Strategy/UtgardePinnacleStrategy.h b/src/Scenario/DungeonAi/Wotlk/UtgardePinnacle/Strategy/UtgardePinnacleStrategy.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Strategy/UtgardePinnacleStrategy.h
rename to src/Scenario/DungeonAi/Wotlk/UtgardePinnacle/Strategy/UtgardePinnacleStrategy.h
diff --git a/src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Trigger/UtgardePinnacleTriggers.cpp b/src/Scenario/DungeonAi/Wotlk/UtgardePinnacle/Trigger/UtgardePinnacleTriggers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Trigger/UtgardePinnacleTriggers.cpp
rename to src/Scenario/DungeonAi/Wotlk/UtgardePinnacle/Trigger/UtgardePinnacleTriggers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Trigger/UtgardePinnacleTriggers.h b/src/Scenario/DungeonAi/Wotlk/UtgardePinnacle/Trigger/UtgardePinnacleTriggers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/UtgardePinnacle/Trigger/UtgardePinnacleTriggers.h
rename to src/Scenario/DungeonAi/Wotlk/UtgardePinnacle/Trigger/UtgardePinnacleTriggers.h
diff --git a/src/Extend/DungeonAi/Wotlk/UtgardePinnacle/UtgardePinnacleActionContext.h b/src/Scenario/DungeonAi/Wotlk/UtgardePinnacle/UtgardePinnacleActionContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/UtgardePinnacle/UtgardePinnacleActionContext.h
rename to src/Scenario/DungeonAi/Wotlk/UtgardePinnacle/UtgardePinnacleActionContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/UtgardePinnacle/UtgardePinnacleTriggerContext.h b/src/Scenario/DungeonAi/Wotlk/UtgardePinnacle/UtgardePinnacleTriggerContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/UtgardePinnacle/UtgardePinnacleTriggerContext.h
rename to src/Scenario/DungeonAi/Wotlk/UtgardePinnacle/UtgardePinnacleTriggerContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/VioletHold/Action/VioletHoldActions.cpp b/src/Scenario/DungeonAi/Wotlk/VioletHold/Action/VioletHoldActions.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/VioletHold/Action/VioletHoldActions.cpp
rename to src/Scenario/DungeonAi/Wotlk/VioletHold/Action/VioletHoldActions.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/VioletHold/Action/VioletHoldActions.h b/src/Scenario/DungeonAi/Wotlk/VioletHold/Action/VioletHoldActions.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/VioletHold/Action/VioletHoldActions.h
rename to src/Scenario/DungeonAi/Wotlk/VioletHold/Action/VioletHoldActions.h
diff --git a/src/Extend/DungeonAi/Wotlk/VioletHold/Multiplier/VioletHoldMultipliers.cpp b/src/Scenario/DungeonAi/Wotlk/VioletHold/Multiplier/VioletHoldMultipliers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/VioletHold/Multiplier/VioletHoldMultipliers.cpp
rename to src/Scenario/DungeonAi/Wotlk/VioletHold/Multiplier/VioletHoldMultipliers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/VioletHold/Multiplier/VioletHoldMultipliers.h b/src/Scenario/DungeonAi/Wotlk/VioletHold/Multiplier/VioletHoldMultipliers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/VioletHold/Multiplier/VioletHoldMultipliers.h
rename to src/Scenario/DungeonAi/Wotlk/VioletHold/Multiplier/VioletHoldMultipliers.h
diff --git a/src/Extend/DungeonAi/Wotlk/VioletHold/Strategy/VioletHoldStrategy.cpp b/src/Scenario/DungeonAi/Wotlk/VioletHold/Strategy/VioletHoldStrategy.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/VioletHold/Strategy/VioletHoldStrategy.cpp
rename to src/Scenario/DungeonAi/Wotlk/VioletHold/Strategy/VioletHoldStrategy.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/VioletHold/Strategy/VioletHoldStrategy.h b/src/Scenario/DungeonAi/Wotlk/VioletHold/Strategy/VioletHoldStrategy.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/VioletHold/Strategy/VioletHoldStrategy.h
rename to src/Scenario/DungeonAi/Wotlk/VioletHold/Strategy/VioletHoldStrategy.h
diff --git a/src/Extend/DungeonAi/Wotlk/VioletHold/Trigger/VioletHoldTriggers.cpp b/src/Scenario/DungeonAi/Wotlk/VioletHold/Trigger/VioletHoldTriggers.cpp
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/VioletHold/Trigger/VioletHoldTriggers.cpp
rename to src/Scenario/DungeonAi/Wotlk/VioletHold/Trigger/VioletHoldTriggers.cpp
diff --git a/src/Extend/DungeonAi/Wotlk/VioletHold/Trigger/VioletHoldTriggers.h b/src/Scenario/DungeonAi/Wotlk/VioletHold/Trigger/VioletHoldTriggers.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/VioletHold/Trigger/VioletHoldTriggers.h
rename to src/Scenario/DungeonAi/Wotlk/VioletHold/Trigger/VioletHoldTriggers.h
diff --git a/src/Extend/DungeonAi/Wotlk/VioletHold/VioletHoldActionContext.h b/src/Scenario/DungeonAi/Wotlk/VioletHold/VioletHoldActionContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/VioletHold/VioletHoldActionContext.h
rename to src/Scenario/DungeonAi/Wotlk/VioletHold/VioletHoldActionContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/VioletHold/VioletHoldTriggerContext.h b/src/Scenario/DungeonAi/Wotlk/VioletHold/VioletHoldTriggerContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/VioletHold/VioletHoldTriggerContext.h
rename to src/Scenario/DungeonAi/Wotlk/VioletHold/VioletHoldTriggerContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/WotlkDungeonActionContext.h b/src/Scenario/DungeonAi/Wotlk/WotlkDungeonActionContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/WotlkDungeonActionContext.h
rename to src/Scenario/DungeonAi/Wotlk/WotlkDungeonActionContext.h
diff --git a/src/Extend/DungeonAi/Wotlk/WotlkDungeonTriggerContext.h b/src/Scenario/DungeonAi/Wotlk/WotlkDungeonTriggerContext.h
similarity index 100%
rename from src/Extend/DungeonAi/Wotlk/WotlkDungeonTriggerContext.h
rename to src/Scenario/DungeonAi/Wotlk/WotlkDungeonTriggerContext.h
diff --git a/src/Extend/RaidAi/Aq20/Action/RaidAq20Actions.cpp b/src/Scenario/RaidAi/Aq20/Action/RaidAq20Actions.cpp
similarity index 100%
rename from src/Extend/RaidAi/Aq20/Action/RaidAq20Actions.cpp
rename to src/Scenario/RaidAi/Aq20/Action/RaidAq20Actions.cpp
diff --git a/src/Extend/RaidAi/Aq20/Action/RaidAq20Actions.h b/src/Scenario/RaidAi/Aq20/Action/RaidAq20Actions.h
similarity index 100%
rename from src/Extend/RaidAi/Aq20/Action/RaidAq20Actions.h
rename to src/Scenario/RaidAi/Aq20/Action/RaidAq20Actions.h
diff --git a/src/Extend/RaidAi/Aq20/RaidAq20ActionContext.h b/src/Scenario/RaidAi/Aq20/RaidAq20ActionContext.h
similarity index 100%
rename from src/Extend/RaidAi/Aq20/RaidAq20ActionContext.h
rename to src/Scenario/RaidAi/Aq20/RaidAq20ActionContext.h
diff --git a/src/Extend/RaidAi/Aq20/RaidAq20TriggerContext.h b/src/Scenario/RaidAi/Aq20/RaidAq20TriggerContext.h
similarity index 100%
rename from src/Extend/RaidAi/Aq20/RaidAq20TriggerContext.h
rename to src/Scenario/RaidAi/Aq20/RaidAq20TriggerContext.h
diff --git a/src/Extend/RaidAi/Aq20/Strategy/RaidAq20Strategy.cpp b/src/Scenario/RaidAi/Aq20/Strategy/RaidAq20Strategy.cpp
similarity index 100%
rename from src/Extend/RaidAi/Aq20/Strategy/RaidAq20Strategy.cpp
rename to src/Scenario/RaidAi/Aq20/Strategy/RaidAq20Strategy.cpp
diff --git a/src/Extend/RaidAi/Aq20/Strategy/RaidAq20Strategy.h b/src/Scenario/RaidAi/Aq20/Strategy/RaidAq20Strategy.h
similarity index 100%
rename from src/Extend/RaidAi/Aq20/Strategy/RaidAq20Strategy.h
rename to src/Scenario/RaidAi/Aq20/Strategy/RaidAq20Strategy.h
diff --git a/src/Extend/RaidAi/Aq20/Trigger/RaidAq20Triggers.cpp b/src/Scenario/RaidAi/Aq20/Trigger/RaidAq20Triggers.cpp
similarity index 100%
rename from src/Extend/RaidAi/Aq20/Trigger/RaidAq20Triggers.cpp
rename to src/Scenario/RaidAi/Aq20/Trigger/RaidAq20Triggers.cpp
diff --git a/src/Extend/RaidAi/Aq20/Trigger/RaidAq20Triggers.h b/src/Scenario/RaidAi/Aq20/Trigger/RaidAq20Triggers.h
similarity index 100%
rename from src/Extend/RaidAi/Aq20/Trigger/RaidAq20Triggers.h
rename to src/Scenario/RaidAi/Aq20/Trigger/RaidAq20Triggers.h
diff --git a/src/Extend/RaidAi/Aq20/Util/RaidAq20Utils.cpp b/src/Scenario/RaidAi/Aq20/Util/RaidAq20Utils.cpp
similarity index 100%
rename from src/Extend/RaidAi/Aq20/Util/RaidAq20Utils.cpp
rename to src/Scenario/RaidAi/Aq20/Util/RaidAq20Utils.cpp
diff --git a/src/Extend/RaidAi/Aq20/Util/RaidAq20Utils.h b/src/Scenario/RaidAi/Aq20/Util/RaidAq20Utils.h
similarity index 100%
rename from src/Extend/RaidAi/Aq20/Util/RaidAq20Utils.h
rename to src/Scenario/RaidAi/Aq20/Util/RaidAq20Utils.h
diff --git a/src/Extend/RaidAi/BlackwingLair/Action/RaidBwlActions.cpp b/src/Scenario/RaidAi/BlackwingLair/Action/RaidBwlActions.cpp
similarity index 100%
rename from src/Extend/RaidAi/BlackwingLair/Action/RaidBwlActions.cpp
rename to src/Scenario/RaidAi/BlackwingLair/Action/RaidBwlActions.cpp
diff --git a/src/Extend/RaidAi/BlackwingLair/Action/RaidBwlActions.h b/src/Scenario/RaidAi/BlackwingLair/Action/RaidBwlActions.h
similarity index 100%
rename from src/Extend/RaidAi/BlackwingLair/Action/RaidBwlActions.h
rename to src/Scenario/RaidAi/BlackwingLair/Action/RaidBwlActions.h
diff --git a/src/Extend/RaidAi/BlackwingLair/RaidBwlActionContext.h b/src/Scenario/RaidAi/BlackwingLair/RaidBwlActionContext.h
similarity index 100%
rename from src/Extend/RaidAi/BlackwingLair/RaidBwlActionContext.h
rename to src/Scenario/RaidAi/BlackwingLair/RaidBwlActionContext.h
diff --git a/src/Extend/RaidAi/BlackwingLair/RaidBwlTriggerContext.h b/src/Scenario/RaidAi/BlackwingLair/RaidBwlTriggerContext.h
similarity index 100%
rename from src/Extend/RaidAi/BlackwingLair/RaidBwlTriggerContext.h
rename to src/Scenario/RaidAi/BlackwingLair/RaidBwlTriggerContext.h
diff --git a/src/Extend/RaidAi/BlackwingLair/Strategy/RaidBwlStrategy.cpp b/src/Scenario/RaidAi/BlackwingLair/Strategy/RaidBwlStrategy.cpp
similarity index 100%
rename from src/Extend/RaidAi/BlackwingLair/Strategy/RaidBwlStrategy.cpp
rename to src/Scenario/RaidAi/BlackwingLair/Strategy/RaidBwlStrategy.cpp
diff --git a/src/Extend/RaidAi/BlackwingLair/Strategy/RaidBwlStrategy.h b/src/Scenario/RaidAi/BlackwingLair/Strategy/RaidBwlStrategy.h
similarity index 100%
rename from src/Extend/RaidAi/BlackwingLair/Strategy/RaidBwlStrategy.h
rename to src/Scenario/RaidAi/BlackwingLair/Strategy/RaidBwlStrategy.h
diff --git a/src/Extend/RaidAi/BlackwingLair/Trigger/RaidBwlTriggers.cpp b/src/Scenario/RaidAi/BlackwingLair/Trigger/RaidBwlTriggers.cpp
similarity index 100%
rename from src/Extend/RaidAi/BlackwingLair/Trigger/RaidBwlTriggers.cpp
rename to src/Scenario/RaidAi/BlackwingLair/Trigger/RaidBwlTriggers.cpp
diff --git a/src/Extend/RaidAi/BlackwingLair/Trigger/RaidBwlTriggers.h b/src/Scenario/RaidAi/BlackwingLair/Trigger/RaidBwlTriggers.h
similarity index 100%
rename from src/Extend/RaidAi/BlackwingLair/Trigger/RaidBwlTriggers.h
rename to src/Scenario/RaidAi/BlackwingLair/Trigger/RaidBwlTriggers.h
diff --git a/src/Extend/RaidAi/EyeOfEternity/Action/RaidEoEActions.cpp b/src/Scenario/RaidAi/EyeOfEternity/Action/RaidEoEActions.cpp
similarity index 100%
rename from src/Extend/RaidAi/EyeOfEternity/Action/RaidEoEActions.cpp
rename to src/Scenario/RaidAi/EyeOfEternity/Action/RaidEoEActions.cpp
diff --git a/src/Extend/RaidAi/EyeOfEternity/Action/RaidEoEActions.h b/src/Scenario/RaidAi/EyeOfEternity/Action/RaidEoEActions.h
similarity index 100%
rename from src/Extend/RaidAi/EyeOfEternity/Action/RaidEoEActions.h
rename to src/Scenario/RaidAi/EyeOfEternity/Action/RaidEoEActions.h
diff --git a/src/Extend/RaidAi/EyeOfEternity/Multiplier/RaidEoEMultipliers.cpp b/src/Scenario/RaidAi/EyeOfEternity/Multiplier/RaidEoEMultipliers.cpp
similarity index 100%
rename from src/Extend/RaidAi/EyeOfEternity/Multiplier/RaidEoEMultipliers.cpp
rename to src/Scenario/RaidAi/EyeOfEternity/Multiplier/RaidEoEMultipliers.cpp
diff --git a/src/Extend/RaidAi/EyeOfEternity/Multiplier/RaidEoEMultipliers.h b/src/Scenario/RaidAi/EyeOfEternity/Multiplier/RaidEoEMultipliers.h
similarity index 100%
rename from src/Extend/RaidAi/EyeOfEternity/Multiplier/RaidEoEMultipliers.h
rename to src/Scenario/RaidAi/EyeOfEternity/Multiplier/RaidEoEMultipliers.h
diff --git a/src/Extend/RaidAi/EyeOfEternity/RaidEoEActionContext.h b/src/Scenario/RaidAi/EyeOfEternity/RaidEoEActionContext.h
similarity index 100%
rename from src/Extend/RaidAi/EyeOfEternity/RaidEoEActionContext.h
rename to src/Scenario/RaidAi/EyeOfEternity/RaidEoEActionContext.h
diff --git a/src/Extend/RaidAi/EyeOfEternity/RaidEoETriggerContext.h b/src/Scenario/RaidAi/EyeOfEternity/RaidEoETriggerContext.h
similarity index 100%
rename from src/Extend/RaidAi/EyeOfEternity/RaidEoETriggerContext.h
rename to src/Scenario/RaidAi/EyeOfEternity/RaidEoETriggerContext.h
diff --git a/src/Extend/RaidAi/EyeOfEternity/Strategy/RaidEoEStrategy.cpp b/src/Scenario/RaidAi/EyeOfEternity/Strategy/RaidEoEStrategy.cpp
similarity index 100%
rename from src/Extend/RaidAi/EyeOfEternity/Strategy/RaidEoEStrategy.cpp
rename to src/Scenario/RaidAi/EyeOfEternity/Strategy/RaidEoEStrategy.cpp
diff --git a/src/Extend/RaidAi/EyeOfEternity/Strategy/RaidEoEStrategy.h b/src/Scenario/RaidAi/EyeOfEternity/Strategy/RaidEoEStrategy.h
similarity index 100%
rename from src/Extend/RaidAi/EyeOfEternity/Strategy/RaidEoEStrategy.h
rename to src/Scenario/RaidAi/EyeOfEternity/Strategy/RaidEoEStrategy.h
diff --git a/src/Extend/RaidAi/EyeOfEternity/Trigger/RaidEoETriggers.cpp b/src/Scenario/RaidAi/EyeOfEternity/Trigger/RaidEoETriggers.cpp
similarity index 100%
rename from src/Extend/RaidAi/EyeOfEternity/Trigger/RaidEoETriggers.cpp
rename to src/Scenario/RaidAi/EyeOfEternity/Trigger/RaidEoETriggers.cpp
diff --git a/src/Extend/RaidAi/EyeOfEternity/Trigger/RaidEoETriggers.h b/src/Scenario/RaidAi/EyeOfEternity/Trigger/RaidEoETriggers.h
similarity index 100%
rename from src/Extend/RaidAi/EyeOfEternity/Trigger/RaidEoETriggers.h
rename to src/Scenario/RaidAi/EyeOfEternity/Trigger/RaidEoETriggers.h
diff --git a/src/Extend/RaidAi/GruulsLair/Action/RaidGruulsLairActions.cpp b/src/Scenario/RaidAi/GruulsLair/Action/RaidGruulsLairActions.cpp
similarity index 100%
rename from src/Extend/RaidAi/GruulsLair/Action/RaidGruulsLairActions.cpp
rename to src/Scenario/RaidAi/GruulsLair/Action/RaidGruulsLairActions.cpp
diff --git a/src/Extend/RaidAi/GruulsLair/Action/RaidGruulsLairActions.h b/src/Scenario/RaidAi/GruulsLair/Action/RaidGruulsLairActions.h
similarity index 100%
rename from src/Extend/RaidAi/GruulsLair/Action/RaidGruulsLairActions.h
rename to src/Scenario/RaidAi/GruulsLair/Action/RaidGruulsLairActions.h
diff --git a/src/Extend/RaidAi/GruulsLair/Multiplier/RaidGruulsLairMultipliers.cpp b/src/Scenario/RaidAi/GruulsLair/Multiplier/RaidGruulsLairMultipliers.cpp
similarity index 100%
rename from src/Extend/RaidAi/GruulsLair/Multiplier/RaidGruulsLairMultipliers.cpp
rename to src/Scenario/RaidAi/GruulsLair/Multiplier/RaidGruulsLairMultipliers.cpp
diff --git a/src/Extend/RaidAi/GruulsLair/Multiplier/RaidGruulsLairMultipliers.h b/src/Scenario/RaidAi/GruulsLair/Multiplier/RaidGruulsLairMultipliers.h
similarity index 100%
rename from src/Extend/RaidAi/GruulsLair/Multiplier/RaidGruulsLairMultipliers.h
rename to src/Scenario/RaidAi/GruulsLair/Multiplier/RaidGruulsLairMultipliers.h
diff --git a/src/Extend/RaidAi/GruulsLair/RaidGruulsLairActionContext.h b/src/Scenario/RaidAi/GruulsLair/RaidGruulsLairActionContext.h
similarity index 100%
rename from src/Extend/RaidAi/GruulsLair/RaidGruulsLairActionContext.h
rename to src/Scenario/RaidAi/GruulsLair/RaidGruulsLairActionContext.h
diff --git a/src/Extend/RaidAi/GruulsLair/RaidGruulsLairTriggerContext.h b/src/Scenario/RaidAi/GruulsLair/RaidGruulsLairTriggerContext.h
similarity index 100%
rename from src/Extend/RaidAi/GruulsLair/RaidGruulsLairTriggerContext.h
rename to src/Scenario/RaidAi/GruulsLair/RaidGruulsLairTriggerContext.h
diff --git a/src/Extend/RaidAi/GruulsLair/Strategy/RaidGruulsLairStrategy.cpp b/src/Scenario/RaidAi/GruulsLair/Strategy/RaidGruulsLairStrategy.cpp
similarity index 100%
rename from src/Extend/RaidAi/GruulsLair/Strategy/RaidGruulsLairStrategy.cpp
rename to src/Scenario/RaidAi/GruulsLair/Strategy/RaidGruulsLairStrategy.cpp
diff --git a/src/Extend/RaidAi/GruulsLair/Strategy/RaidGruulsLairStrategy.h b/src/Scenario/RaidAi/GruulsLair/Strategy/RaidGruulsLairStrategy.h
similarity index 100%
rename from src/Extend/RaidAi/GruulsLair/Strategy/RaidGruulsLairStrategy.h
rename to src/Scenario/RaidAi/GruulsLair/Strategy/RaidGruulsLairStrategy.h
diff --git a/src/Extend/RaidAi/GruulsLair/Trigger/RaidGruulsLairTriggers.cpp b/src/Scenario/RaidAi/GruulsLair/Trigger/RaidGruulsLairTriggers.cpp
similarity index 100%
rename from src/Extend/RaidAi/GruulsLair/Trigger/RaidGruulsLairTriggers.cpp
rename to src/Scenario/RaidAi/GruulsLair/Trigger/RaidGruulsLairTriggers.cpp
diff --git a/src/Extend/RaidAi/GruulsLair/Trigger/RaidGruulsLairTriggers.h b/src/Scenario/RaidAi/GruulsLair/Trigger/RaidGruulsLairTriggers.h
similarity index 100%
rename from src/Extend/RaidAi/GruulsLair/Trigger/RaidGruulsLairTriggers.h
rename to src/Scenario/RaidAi/GruulsLair/Trigger/RaidGruulsLairTriggers.h
diff --git a/src/Extend/RaidAi/GruulsLair/Util/RaidGruulsLairHelpers.cpp b/src/Scenario/RaidAi/GruulsLair/Util/RaidGruulsLairHelpers.cpp
similarity index 100%
rename from src/Extend/RaidAi/GruulsLair/Util/RaidGruulsLairHelpers.cpp
rename to src/Scenario/RaidAi/GruulsLair/Util/RaidGruulsLairHelpers.cpp
diff --git a/src/Extend/RaidAi/GruulsLair/Util/RaidGruulsLairHelpers.h b/src/Scenario/RaidAi/GruulsLair/Util/RaidGruulsLairHelpers.h
similarity index 100%
rename from src/Extend/RaidAi/GruulsLair/Util/RaidGruulsLairHelpers.h
rename to src/Scenario/RaidAi/GruulsLair/Util/RaidGruulsLairHelpers.h
diff --git a/src/Extend/RaidAi/Icecrown/Action/RaidIccActions.cpp b/src/Scenario/RaidAi/Icecrown/Action/RaidIccActions.cpp
similarity index 100%
rename from src/Extend/RaidAi/Icecrown/Action/RaidIccActions.cpp
rename to src/Scenario/RaidAi/Icecrown/Action/RaidIccActions.cpp
diff --git a/src/Extend/RaidAi/Icecrown/Action/RaidIccActions.h b/src/Scenario/RaidAi/Icecrown/Action/RaidIccActions.h
similarity index 100%
rename from src/Extend/RaidAi/Icecrown/Action/RaidIccActions.h
rename to src/Scenario/RaidAi/Icecrown/Action/RaidIccActions.h
diff --git a/src/Extend/RaidAi/Icecrown/Multiplier/RaidIccMultipliers.cpp b/src/Scenario/RaidAi/Icecrown/Multiplier/RaidIccMultipliers.cpp
similarity index 100%
rename from src/Extend/RaidAi/Icecrown/Multiplier/RaidIccMultipliers.cpp
rename to src/Scenario/RaidAi/Icecrown/Multiplier/RaidIccMultipliers.cpp
diff --git a/src/Extend/RaidAi/Icecrown/Multiplier/RaidIccMultipliers.h b/src/Scenario/RaidAi/Icecrown/Multiplier/RaidIccMultipliers.h
similarity index 100%
rename from src/Extend/RaidAi/Icecrown/Multiplier/RaidIccMultipliers.h
rename to src/Scenario/RaidAi/Icecrown/Multiplier/RaidIccMultipliers.h
diff --git a/src/Extend/RaidAi/Icecrown/RaidIccActionContext.h b/src/Scenario/RaidAi/Icecrown/RaidIccActionContext.h
similarity index 100%
rename from src/Extend/RaidAi/Icecrown/RaidIccActionContext.h
rename to src/Scenario/RaidAi/Icecrown/RaidIccActionContext.h
diff --git a/src/Extend/RaidAi/Icecrown/RaidIccScripts.h b/src/Scenario/RaidAi/Icecrown/RaidIccScripts.h
similarity index 100%
rename from src/Extend/RaidAi/Icecrown/RaidIccScripts.h
rename to src/Scenario/RaidAi/Icecrown/RaidIccScripts.h
diff --git a/src/Extend/RaidAi/Icecrown/RaidIccTriggerContext.h b/src/Scenario/RaidAi/Icecrown/RaidIccTriggerContext.h
similarity index 100%
rename from src/Extend/RaidAi/Icecrown/RaidIccTriggerContext.h
rename to src/Scenario/RaidAi/Icecrown/RaidIccTriggerContext.h
diff --git a/src/Extend/RaidAi/Icecrown/Strategy/RaidIccStrategy.cpp b/src/Scenario/RaidAi/Icecrown/Strategy/RaidIccStrategy.cpp
similarity index 100%
rename from src/Extend/RaidAi/Icecrown/Strategy/RaidIccStrategy.cpp
rename to src/Scenario/RaidAi/Icecrown/Strategy/RaidIccStrategy.cpp
diff --git a/src/Extend/RaidAi/Icecrown/Strategy/RaidIccStrategy.h b/src/Scenario/RaidAi/Icecrown/Strategy/RaidIccStrategy.h
similarity index 100%
rename from src/Extend/RaidAi/Icecrown/Strategy/RaidIccStrategy.h
rename to src/Scenario/RaidAi/Icecrown/Strategy/RaidIccStrategy.h
diff --git a/src/Extend/RaidAi/Icecrown/Trigger/RaidIccTriggers.cpp b/src/Scenario/RaidAi/Icecrown/Trigger/RaidIccTriggers.cpp
similarity index 100%
rename from src/Extend/RaidAi/Icecrown/Trigger/RaidIccTriggers.cpp
rename to src/Scenario/RaidAi/Icecrown/Trigger/RaidIccTriggers.cpp
diff --git a/src/Extend/RaidAi/Icecrown/Trigger/RaidIccTriggers.h b/src/Scenario/RaidAi/Icecrown/Trigger/RaidIccTriggers.h
similarity index 100%
rename from src/Extend/RaidAi/Icecrown/Trigger/RaidIccTriggers.h
rename to src/Scenario/RaidAi/Icecrown/Trigger/RaidIccTriggers.h
diff --git a/src/Extend/RaidAi/Karazhan/Action/RaidKarazhanActions.cpp b/src/Scenario/RaidAi/Karazhan/Action/RaidKarazhanActions.cpp
similarity index 100%
rename from src/Extend/RaidAi/Karazhan/Action/RaidKarazhanActions.cpp
rename to src/Scenario/RaidAi/Karazhan/Action/RaidKarazhanActions.cpp
diff --git a/src/Extend/RaidAi/Karazhan/Action/RaidKarazhanActions.h b/src/Scenario/RaidAi/Karazhan/Action/RaidKarazhanActions.h
similarity index 100%
rename from src/Extend/RaidAi/Karazhan/Action/RaidKarazhanActions.h
rename to src/Scenario/RaidAi/Karazhan/Action/RaidKarazhanActions.h
diff --git a/src/Extend/RaidAi/Karazhan/Multiplier/RaidKarazhanMultipliers.cpp b/src/Scenario/RaidAi/Karazhan/Multiplier/RaidKarazhanMultipliers.cpp
similarity index 100%
rename from src/Extend/RaidAi/Karazhan/Multiplier/RaidKarazhanMultipliers.cpp
rename to src/Scenario/RaidAi/Karazhan/Multiplier/RaidKarazhanMultipliers.cpp
diff --git a/src/Extend/RaidAi/Karazhan/Multiplier/RaidKarazhanMultipliers.h b/src/Scenario/RaidAi/Karazhan/Multiplier/RaidKarazhanMultipliers.h
similarity index 100%
rename from src/Extend/RaidAi/Karazhan/Multiplier/RaidKarazhanMultipliers.h
rename to src/Scenario/RaidAi/Karazhan/Multiplier/RaidKarazhanMultipliers.h
diff --git a/src/Extend/RaidAi/Karazhan/RaidKarazhanActionContext.h b/src/Scenario/RaidAi/Karazhan/RaidKarazhanActionContext.h
similarity index 100%
rename from src/Extend/RaidAi/Karazhan/RaidKarazhanActionContext.h
rename to src/Scenario/RaidAi/Karazhan/RaidKarazhanActionContext.h
diff --git a/src/Extend/RaidAi/Karazhan/RaidKarazhanTriggerContext.h b/src/Scenario/RaidAi/Karazhan/RaidKarazhanTriggerContext.h
similarity index 100%
rename from src/Extend/RaidAi/Karazhan/RaidKarazhanTriggerContext.h
rename to src/Scenario/RaidAi/Karazhan/RaidKarazhanTriggerContext.h
diff --git a/src/Extend/RaidAi/Karazhan/Strategy/RaidKarazhanStrategy.cpp b/src/Scenario/RaidAi/Karazhan/Strategy/RaidKarazhanStrategy.cpp
similarity index 100%
rename from src/Extend/RaidAi/Karazhan/Strategy/RaidKarazhanStrategy.cpp
rename to src/Scenario/RaidAi/Karazhan/Strategy/RaidKarazhanStrategy.cpp
diff --git a/src/Extend/RaidAi/Karazhan/Strategy/RaidKarazhanStrategy.h b/src/Scenario/RaidAi/Karazhan/Strategy/RaidKarazhanStrategy.h
similarity index 100%
rename from src/Extend/RaidAi/Karazhan/Strategy/RaidKarazhanStrategy.h
rename to src/Scenario/RaidAi/Karazhan/Strategy/RaidKarazhanStrategy.h
diff --git a/src/Extend/RaidAi/Karazhan/Trigger/RaidKarazhanTriggers.cpp b/src/Scenario/RaidAi/Karazhan/Trigger/RaidKarazhanTriggers.cpp
similarity index 100%
rename from src/Extend/RaidAi/Karazhan/Trigger/RaidKarazhanTriggers.cpp
rename to src/Scenario/RaidAi/Karazhan/Trigger/RaidKarazhanTriggers.cpp
diff --git a/src/Extend/RaidAi/Karazhan/Trigger/RaidKarazhanTriggers.h b/src/Scenario/RaidAi/Karazhan/Trigger/RaidKarazhanTriggers.h
similarity index 100%
rename from src/Extend/RaidAi/Karazhan/Trigger/RaidKarazhanTriggers.h
rename to src/Scenario/RaidAi/Karazhan/Trigger/RaidKarazhanTriggers.h
diff --git a/src/Extend/RaidAi/Karazhan/Util/RaidKarazhanHelpers.cpp b/src/Scenario/RaidAi/Karazhan/Util/RaidKarazhanHelpers.cpp
similarity index 100%
rename from src/Extend/RaidAi/Karazhan/Util/RaidKarazhanHelpers.cpp
rename to src/Scenario/RaidAi/Karazhan/Util/RaidKarazhanHelpers.cpp
diff --git a/src/Extend/RaidAi/Karazhan/Util/RaidKarazhanHelpers.h b/src/Scenario/RaidAi/Karazhan/Util/RaidKarazhanHelpers.h
similarity index 100%
rename from src/Extend/RaidAi/Karazhan/Util/RaidKarazhanHelpers.h
rename to src/Scenario/RaidAi/Karazhan/Util/RaidKarazhanHelpers.h
diff --git a/src/Extend/RaidAi/Magtheridon/Action/RaidMagtheridonActions.cpp b/src/Scenario/RaidAi/Magtheridon/Action/RaidMagtheridonActions.cpp
similarity index 100%
rename from src/Extend/RaidAi/Magtheridon/Action/RaidMagtheridonActions.cpp
rename to src/Scenario/RaidAi/Magtheridon/Action/RaidMagtheridonActions.cpp
diff --git a/src/Extend/RaidAi/Magtheridon/Action/RaidMagtheridonActions.h b/src/Scenario/RaidAi/Magtheridon/Action/RaidMagtheridonActions.h
similarity index 100%
rename from src/Extend/RaidAi/Magtheridon/Action/RaidMagtheridonActions.h
rename to src/Scenario/RaidAi/Magtheridon/Action/RaidMagtheridonActions.h
diff --git a/src/Extend/RaidAi/Magtheridon/Multiplier/RaidMagtheridonMultipliers.cpp b/src/Scenario/RaidAi/Magtheridon/Multiplier/RaidMagtheridonMultipliers.cpp
similarity index 100%
rename from src/Extend/RaidAi/Magtheridon/Multiplier/RaidMagtheridonMultipliers.cpp
rename to src/Scenario/RaidAi/Magtheridon/Multiplier/RaidMagtheridonMultipliers.cpp
diff --git a/src/Extend/RaidAi/Magtheridon/Multiplier/RaidMagtheridonMultipliers.h b/src/Scenario/RaidAi/Magtheridon/Multiplier/RaidMagtheridonMultipliers.h
similarity index 100%
rename from src/Extend/RaidAi/Magtheridon/Multiplier/RaidMagtheridonMultipliers.h
rename to src/Scenario/RaidAi/Magtheridon/Multiplier/RaidMagtheridonMultipliers.h
diff --git a/src/Extend/RaidAi/Magtheridon/RaidMagtheridonActionContext.h b/src/Scenario/RaidAi/Magtheridon/RaidMagtheridonActionContext.h
similarity index 100%
rename from src/Extend/RaidAi/Magtheridon/RaidMagtheridonActionContext.h
rename to src/Scenario/RaidAi/Magtheridon/RaidMagtheridonActionContext.h
diff --git a/src/Extend/RaidAi/Magtheridon/RaidMagtheridonTriggerContext.h b/src/Scenario/RaidAi/Magtheridon/RaidMagtheridonTriggerContext.h
similarity index 100%
rename from src/Extend/RaidAi/Magtheridon/RaidMagtheridonTriggerContext.h
rename to src/Scenario/RaidAi/Magtheridon/RaidMagtheridonTriggerContext.h
diff --git a/src/Extend/RaidAi/Magtheridon/Strategy/RaidMagtheridonStrategy.cpp b/src/Scenario/RaidAi/Magtheridon/Strategy/RaidMagtheridonStrategy.cpp
similarity index 100%
rename from src/Extend/RaidAi/Magtheridon/Strategy/RaidMagtheridonStrategy.cpp
rename to src/Scenario/RaidAi/Magtheridon/Strategy/RaidMagtheridonStrategy.cpp
diff --git a/src/Extend/RaidAi/Magtheridon/Strategy/RaidMagtheridonStrategy.h b/src/Scenario/RaidAi/Magtheridon/Strategy/RaidMagtheridonStrategy.h
similarity index 100%
rename from src/Extend/RaidAi/Magtheridon/Strategy/RaidMagtheridonStrategy.h
rename to src/Scenario/RaidAi/Magtheridon/Strategy/RaidMagtheridonStrategy.h
diff --git a/src/Extend/RaidAi/Magtheridon/Trigger/RaidMagtheridonTriggers.cpp b/src/Scenario/RaidAi/Magtheridon/Trigger/RaidMagtheridonTriggers.cpp
similarity index 100%
rename from src/Extend/RaidAi/Magtheridon/Trigger/RaidMagtheridonTriggers.cpp
rename to src/Scenario/RaidAi/Magtheridon/Trigger/RaidMagtheridonTriggers.cpp
diff --git a/src/Extend/RaidAi/Magtheridon/Trigger/RaidMagtheridonTriggers.h b/src/Scenario/RaidAi/Magtheridon/Trigger/RaidMagtheridonTriggers.h
similarity index 100%
rename from src/Extend/RaidAi/Magtheridon/Trigger/RaidMagtheridonTriggers.h
rename to src/Scenario/RaidAi/Magtheridon/Trigger/RaidMagtheridonTriggers.h
diff --git a/src/Extend/RaidAi/Magtheridon/Util/RaidMagtheridonHelpers.cpp b/src/Scenario/RaidAi/Magtheridon/Util/RaidMagtheridonHelpers.cpp
similarity index 100%
rename from src/Extend/RaidAi/Magtheridon/Util/RaidMagtheridonHelpers.cpp
rename to src/Scenario/RaidAi/Magtheridon/Util/RaidMagtheridonHelpers.cpp
diff --git a/src/Extend/RaidAi/Magtheridon/Util/RaidMagtheridonHelpers.h b/src/Scenario/RaidAi/Magtheridon/Util/RaidMagtheridonHelpers.h
similarity index 100%
rename from src/Extend/RaidAi/Magtheridon/Util/RaidMagtheridonHelpers.h
rename to src/Scenario/RaidAi/Magtheridon/Util/RaidMagtheridonHelpers.h
diff --git a/src/Extend/RaidAi/MoltenCore/Action/RaidMcActions.cpp b/src/Scenario/RaidAi/MoltenCore/Action/RaidMcActions.cpp
similarity index 100%
rename from src/Extend/RaidAi/MoltenCore/Action/RaidMcActions.cpp
rename to src/Scenario/RaidAi/MoltenCore/Action/RaidMcActions.cpp
diff --git a/src/Extend/RaidAi/MoltenCore/Action/RaidMcActions.h b/src/Scenario/RaidAi/MoltenCore/Action/RaidMcActions.h
similarity index 100%
rename from src/Extend/RaidAi/MoltenCore/Action/RaidMcActions.h
rename to src/Scenario/RaidAi/MoltenCore/Action/RaidMcActions.h
diff --git a/src/Extend/RaidAi/MoltenCore/Multiplier/RaidMcMultipliers.cpp b/src/Scenario/RaidAi/MoltenCore/Multiplier/RaidMcMultipliers.cpp
similarity index 100%
rename from src/Extend/RaidAi/MoltenCore/Multiplier/RaidMcMultipliers.cpp
rename to src/Scenario/RaidAi/MoltenCore/Multiplier/RaidMcMultipliers.cpp
diff --git a/src/Extend/RaidAi/MoltenCore/Multiplier/RaidMcMultipliers.h b/src/Scenario/RaidAi/MoltenCore/Multiplier/RaidMcMultipliers.h
similarity index 100%
rename from src/Extend/RaidAi/MoltenCore/Multiplier/RaidMcMultipliers.h
rename to src/Scenario/RaidAi/MoltenCore/Multiplier/RaidMcMultipliers.h
diff --git a/src/Extend/RaidAi/MoltenCore/RaidMcActionContext.h b/src/Scenario/RaidAi/MoltenCore/RaidMcActionContext.h
similarity index 100%
rename from src/Extend/RaidAi/MoltenCore/RaidMcActionContext.h
rename to src/Scenario/RaidAi/MoltenCore/RaidMcActionContext.h
diff --git a/src/Extend/RaidAi/MoltenCore/RaidMcHelpers.h b/src/Scenario/RaidAi/MoltenCore/RaidMcHelpers.h
similarity index 100%
rename from src/Extend/RaidAi/MoltenCore/RaidMcHelpers.h
rename to src/Scenario/RaidAi/MoltenCore/RaidMcHelpers.h
diff --git a/src/Extend/RaidAi/MoltenCore/RaidMcTriggerContext.h b/src/Scenario/RaidAi/MoltenCore/RaidMcTriggerContext.h
similarity index 100%
rename from src/Extend/RaidAi/MoltenCore/RaidMcTriggerContext.h
rename to src/Scenario/RaidAi/MoltenCore/RaidMcTriggerContext.h
diff --git a/src/Extend/RaidAi/MoltenCore/Strategy/RaidMcStrategy.cpp b/src/Scenario/RaidAi/MoltenCore/Strategy/RaidMcStrategy.cpp
similarity index 100%
rename from src/Extend/RaidAi/MoltenCore/Strategy/RaidMcStrategy.cpp
rename to src/Scenario/RaidAi/MoltenCore/Strategy/RaidMcStrategy.cpp
diff --git a/src/Extend/RaidAi/MoltenCore/Strategy/RaidMcStrategy.h b/src/Scenario/RaidAi/MoltenCore/Strategy/RaidMcStrategy.h
similarity index 100%
rename from src/Extend/RaidAi/MoltenCore/Strategy/RaidMcStrategy.h
rename to src/Scenario/RaidAi/MoltenCore/Strategy/RaidMcStrategy.h
diff --git a/src/Extend/RaidAi/MoltenCore/Trigger/RaidMcTriggers.cpp b/src/Scenario/RaidAi/MoltenCore/Trigger/RaidMcTriggers.cpp
similarity index 100%
rename from src/Extend/RaidAi/MoltenCore/Trigger/RaidMcTriggers.cpp
rename to src/Scenario/RaidAi/MoltenCore/Trigger/RaidMcTriggers.cpp
diff --git a/src/Extend/RaidAi/MoltenCore/Trigger/RaidMcTriggers.h b/src/Scenario/RaidAi/MoltenCore/Trigger/RaidMcTriggers.h
similarity index 100%
rename from src/Extend/RaidAi/MoltenCore/Trigger/RaidMcTriggers.h
rename to src/Scenario/RaidAi/MoltenCore/Trigger/RaidMcTriggers.h
diff --git a/src/Extend/RaidAi/ObsidianSanctum/Action/RaidOsActions.cpp b/src/Scenario/RaidAi/ObsidianSanctum/Action/RaidOsActions.cpp
similarity index 100%
rename from src/Extend/RaidAi/ObsidianSanctum/Action/RaidOsActions.cpp
rename to src/Scenario/RaidAi/ObsidianSanctum/Action/RaidOsActions.cpp
diff --git a/src/Extend/RaidAi/ObsidianSanctum/Action/RaidOsActions.h b/src/Scenario/RaidAi/ObsidianSanctum/Action/RaidOsActions.h
similarity index 100%
rename from src/Extend/RaidAi/ObsidianSanctum/Action/RaidOsActions.h
rename to src/Scenario/RaidAi/ObsidianSanctum/Action/RaidOsActions.h
diff --git a/src/Extend/RaidAi/ObsidianSanctum/Multiplier/RaidOsMultipliers.cpp b/src/Scenario/RaidAi/ObsidianSanctum/Multiplier/RaidOsMultipliers.cpp
similarity index 100%
rename from src/Extend/RaidAi/ObsidianSanctum/Multiplier/RaidOsMultipliers.cpp
rename to src/Scenario/RaidAi/ObsidianSanctum/Multiplier/RaidOsMultipliers.cpp
diff --git a/src/Extend/RaidAi/ObsidianSanctum/Multiplier/RaidOsMultipliers.h b/src/Scenario/RaidAi/ObsidianSanctum/Multiplier/RaidOsMultipliers.h
similarity index 100%
rename from src/Extend/RaidAi/ObsidianSanctum/Multiplier/RaidOsMultipliers.h
rename to src/Scenario/RaidAi/ObsidianSanctum/Multiplier/RaidOsMultipliers.h
diff --git a/src/Extend/RaidAi/ObsidianSanctum/RaidOsActionContext.h b/src/Scenario/RaidAi/ObsidianSanctum/RaidOsActionContext.h
similarity index 100%
rename from src/Extend/RaidAi/ObsidianSanctum/RaidOsActionContext.h
rename to src/Scenario/RaidAi/ObsidianSanctum/RaidOsActionContext.h
diff --git a/src/Extend/RaidAi/ObsidianSanctum/RaidOsTriggerContext.h b/src/Scenario/RaidAi/ObsidianSanctum/RaidOsTriggerContext.h
similarity index 100%
rename from src/Extend/RaidAi/ObsidianSanctum/RaidOsTriggerContext.h
rename to src/Scenario/RaidAi/ObsidianSanctum/RaidOsTriggerContext.h
diff --git a/src/Extend/RaidAi/ObsidianSanctum/Strategy/RaidOsStrategy.cpp b/src/Scenario/RaidAi/ObsidianSanctum/Strategy/RaidOsStrategy.cpp
similarity index 100%
rename from src/Extend/RaidAi/ObsidianSanctum/Strategy/RaidOsStrategy.cpp
rename to src/Scenario/RaidAi/ObsidianSanctum/Strategy/RaidOsStrategy.cpp
diff --git a/src/Extend/RaidAi/ObsidianSanctum/Strategy/RaidOsStrategy.h b/src/Scenario/RaidAi/ObsidianSanctum/Strategy/RaidOsStrategy.h
similarity index 100%
rename from src/Extend/RaidAi/ObsidianSanctum/Strategy/RaidOsStrategy.h
rename to src/Scenario/RaidAi/ObsidianSanctum/Strategy/RaidOsStrategy.h
diff --git a/src/Extend/RaidAi/ObsidianSanctum/Trigger/RaidOsTriggers.cpp b/src/Scenario/RaidAi/ObsidianSanctum/Trigger/RaidOsTriggers.cpp
similarity index 100%
rename from src/Extend/RaidAi/ObsidianSanctum/Trigger/RaidOsTriggers.cpp
rename to src/Scenario/RaidAi/ObsidianSanctum/Trigger/RaidOsTriggers.cpp
diff --git a/src/Extend/RaidAi/ObsidianSanctum/Trigger/RaidOsTriggers.h b/src/Scenario/RaidAi/ObsidianSanctum/Trigger/RaidOsTriggers.h
similarity index 100%
rename from src/Extend/RaidAi/ObsidianSanctum/Trigger/RaidOsTriggers.h
rename to src/Scenario/RaidAi/ObsidianSanctum/Trigger/RaidOsTriggers.h
diff --git a/src/Extend/RaidAi/Onyxia/Action/RaidOnyxiaActions.cpp b/src/Scenario/RaidAi/Onyxia/Action/RaidOnyxiaActions.cpp
similarity index 100%
rename from src/Extend/RaidAi/Onyxia/Action/RaidOnyxiaActions.cpp
rename to src/Scenario/RaidAi/Onyxia/Action/RaidOnyxiaActions.cpp
diff --git a/src/Extend/RaidAi/Onyxia/Action/RaidOnyxiaActions.h b/src/Scenario/RaidAi/Onyxia/Action/RaidOnyxiaActions.h
similarity index 100%
rename from src/Extend/RaidAi/Onyxia/Action/RaidOnyxiaActions.h
rename to src/Scenario/RaidAi/Onyxia/Action/RaidOnyxiaActions.h
diff --git a/src/Extend/RaidAi/Onyxia/RaidOnyxiaActionContext.h b/src/Scenario/RaidAi/Onyxia/RaidOnyxiaActionContext.h
similarity index 100%
rename from src/Extend/RaidAi/Onyxia/RaidOnyxiaActionContext.h
rename to src/Scenario/RaidAi/Onyxia/RaidOnyxiaActionContext.h
diff --git a/src/Extend/RaidAi/Onyxia/RaidOnyxiaTriggerContext.h b/src/Scenario/RaidAi/Onyxia/RaidOnyxiaTriggerContext.h
similarity index 100%
rename from src/Extend/RaidAi/Onyxia/RaidOnyxiaTriggerContext.h
rename to src/Scenario/RaidAi/Onyxia/RaidOnyxiaTriggerContext.h
diff --git a/src/Extend/RaidAi/Onyxia/Strategy/RaidOnyxiaStrategy.cpp b/src/Scenario/RaidAi/Onyxia/Strategy/RaidOnyxiaStrategy.cpp
similarity index 100%
rename from src/Extend/RaidAi/Onyxia/Strategy/RaidOnyxiaStrategy.cpp
rename to src/Scenario/RaidAi/Onyxia/Strategy/RaidOnyxiaStrategy.cpp
diff --git a/src/Extend/RaidAi/Onyxia/Strategy/RaidOnyxiaStrategy.h b/src/Scenario/RaidAi/Onyxia/Strategy/RaidOnyxiaStrategy.h
similarity index 100%
rename from src/Extend/RaidAi/Onyxia/Strategy/RaidOnyxiaStrategy.h
rename to src/Scenario/RaidAi/Onyxia/Strategy/RaidOnyxiaStrategy.h
diff --git a/src/Extend/RaidAi/Onyxia/Trigger/RaidOnyxiaTriggers.cpp b/src/Scenario/RaidAi/Onyxia/Trigger/RaidOnyxiaTriggers.cpp
similarity index 100%
rename from src/Extend/RaidAi/Onyxia/Trigger/RaidOnyxiaTriggers.cpp
rename to src/Scenario/RaidAi/Onyxia/Trigger/RaidOnyxiaTriggers.cpp
diff --git a/src/Extend/RaidAi/Onyxia/Trigger/RaidOnyxiaTriggers.h b/src/Scenario/RaidAi/Onyxia/Trigger/RaidOnyxiaTriggers.h
similarity index 100%
rename from src/Extend/RaidAi/Onyxia/Trigger/RaidOnyxiaTriggers.h
rename to src/Scenario/RaidAi/Onyxia/Trigger/RaidOnyxiaTriggers.h
diff --git a/src/Extend/RaidAi/RaidStrategyContext.h b/src/Scenario/RaidAi/RaidStrategyContext.h
similarity index 100%
rename from src/Extend/RaidAi/RaidStrategyContext.h
rename to src/Scenario/RaidAi/RaidStrategyContext.h
diff --git a/src/Extend/RaidAi/Ulduar/Action/RaidUlduarActions.cpp b/src/Scenario/RaidAi/Ulduar/Action/RaidUlduarActions.cpp
similarity index 100%
rename from src/Extend/RaidAi/Ulduar/Action/RaidUlduarActions.cpp
rename to src/Scenario/RaidAi/Ulduar/Action/RaidUlduarActions.cpp
diff --git a/src/Extend/RaidAi/Ulduar/Action/RaidUlduarActions.h b/src/Scenario/RaidAi/Ulduar/Action/RaidUlduarActions.h
similarity index 100%
rename from src/Extend/RaidAi/Ulduar/Action/RaidUlduarActions.h
rename to src/Scenario/RaidAi/Ulduar/Action/RaidUlduarActions.h
diff --git a/src/Extend/RaidAi/Ulduar/Multiplier/RaidUlduarMultipliers.cpp b/src/Scenario/RaidAi/Ulduar/Multiplier/RaidUlduarMultipliers.cpp
similarity index 100%
rename from src/Extend/RaidAi/Ulduar/Multiplier/RaidUlduarMultipliers.cpp
rename to src/Scenario/RaidAi/Ulduar/Multiplier/RaidUlduarMultipliers.cpp
diff --git a/src/Extend/RaidAi/Ulduar/Multiplier/RaidUlduarMultipliers.h b/src/Scenario/RaidAi/Ulduar/Multiplier/RaidUlduarMultipliers.h
similarity index 85%
rename from src/Extend/RaidAi/Ulduar/Multiplier/RaidUlduarMultipliers.h
rename to src/Scenario/RaidAi/Ulduar/Multiplier/RaidUlduarMultipliers.h
index 05bf76b9..539a5ea9 100644
--- a/src/Extend/RaidAi/Ulduar/Multiplier/RaidUlduarMultipliers.h
+++ b/src/Scenario/RaidAi/Ulduar/Multiplier/RaidUlduarMultipliers.h
@@ -3,7 +3,7 @@
 #define _PLAYERRBOT_RAIDULDUARMULTIPLIERS_H_
 
 #include "Multiplier.h"
-#include "Extend/RaidAi/Ulduar/RaidUlduarBossHelper.h"
+#include "Scenario/RaidAi/Ulduar/RaidUlduarBossHelper.h"
 
 class FlameLeviathanMultiplier : public Multiplier
 {
diff --git a/src/Extend/RaidAi/Ulduar/RaidUlduarActionContext.h b/src/Scenario/RaidAi/Ulduar/RaidUlduarActionContext.h
similarity index 100%
rename from src/Extend/RaidAi/Ulduar/RaidUlduarActionContext.h
rename to src/Scenario/RaidAi/Ulduar/RaidUlduarActionContext.h
diff --git a/src/Extend/RaidAi/Ulduar/RaidUlduarBossHelper.cpp b/src/Scenario/RaidAi/Ulduar/RaidUlduarBossHelper.cpp
similarity index 100%
rename from src/Extend/RaidAi/Ulduar/RaidUlduarBossHelper.cpp
rename to src/Scenario/RaidAi/Ulduar/RaidUlduarBossHelper.cpp
diff --git a/src/Extend/RaidAi/Ulduar/RaidUlduarBossHelper.h b/src/Scenario/RaidAi/Ulduar/RaidUlduarBossHelper.h
similarity index 100%
rename from src/Extend/RaidAi/Ulduar/RaidUlduarBossHelper.h
rename to src/Scenario/RaidAi/Ulduar/RaidUlduarBossHelper.h
diff --git a/src/Extend/RaidAi/Ulduar/RaidUlduarScripts.h b/src/Scenario/RaidAi/Ulduar/RaidUlduarScripts.h
similarity index 100%
rename from src/Extend/RaidAi/Ulduar/RaidUlduarScripts.h
rename to src/Scenario/RaidAi/Ulduar/RaidUlduarScripts.h
diff --git a/src/Extend/RaidAi/Ulduar/RaidUlduarTriggerContext.h b/src/Scenario/RaidAi/Ulduar/RaidUlduarTriggerContext.h
similarity index 100%
rename from src/Extend/RaidAi/Ulduar/RaidUlduarTriggerContext.h
rename to src/Scenario/RaidAi/Ulduar/RaidUlduarTriggerContext.h
diff --git a/src/Extend/RaidAi/Ulduar/Strategy/RaidUlduarStrategy.cpp b/src/Scenario/RaidAi/Ulduar/Strategy/RaidUlduarStrategy.cpp
similarity index 100%
rename from src/Extend/RaidAi/Ulduar/Strategy/RaidUlduarStrategy.cpp
rename to src/Scenario/RaidAi/Ulduar/Strategy/RaidUlduarStrategy.cpp
diff --git a/src/Extend/RaidAi/Ulduar/Strategy/RaidUlduarStrategy.h b/src/Scenario/RaidAi/Ulduar/Strategy/RaidUlduarStrategy.h
similarity index 100%
rename from src/Extend/RaidAi/Ulduar/Strategy/RaidUlduarStrategy.h
rename to src/Scenario/RaidAi/Ulduar/Strategy/RaidUlduarStrategy.h
diff --git a/src/Extend/RaidAi/Ulduar/Trigger/RaidUlduarTriggers.cpp b/src/Scenario/RaidAi/Ulduar/Trigger/RaidUlduarTriggers.cpp
similarity index 100%
rename from src/Extend/RaidAi/Ulduar/Trigger/RaidUlduarTriggers.cpp
rename to src/Scenario/RaidAi/Ulduar/Trigger/RaidUlduarTriggers.cpp
diff --git a/src/Extend/RaidAi/Ulduar/Trigger/RaidUlduarTriggers.h b/src/Scenario/RaidAi/Ulduar/Trigger/RaidUlduarTriggers.h
similarity index 100%
rename from src/Extend/RaidAi/Ulduar/Trigger/RaidUlduarTriggers.h
rename to src/Scenario/RaidAi/Ulduar/Trigger/RaidUlduarTriggers.h
diff --git a/src/Extend/RaidAi/VaultOfArchavon/Action/RaidVoAActions.cpp b/src/Scenario/RaidAi/VaultOfArchavon/Action/RaidVoAActions.cpp
similarity index 100%
rename from src/Extend/RaidAi/VaultOfArchavon/Action/RaidVoAActions.cpp
rename to src/Scenario/RaidAi/VaultOfArchavon/Action/RaidVoAActions.cpp
diff --git a/src/Extend/RaidAi/VaultOfArchavon/Action/RaidVoAActions.h b/src/Scenario/RaidAi/VaultOfArchavon/Action/RaidVoAActions.h
similarity index 100%
rename from src/Extend/RaidAi/VaultOfArchavon/Action/RaidVoAActions.h
rename to src/Scenario/RaidAi/VaultOfArchavon/Action/RaidVoAActions.h
diff --git a/src/Extend/RaidAi/VaultOfArchavon/RaidVoAActionContext.h b/src/Scenario/RaidAi/VaultOfArchavon/RaidVoAActionContext.h
similarity index 100%
rename from src/Extend/RaidAi/VaultOfArchavon/RaidVoAActionContext.h
rename to src/Scenario/RaidAi/VaultOfArchavon/RaidVoAActionContext.h
diff --git a/src/Extend/RaidAi/VaultOfArchavon/RaidVoATriggerContext.h b/src/Scenario/RaidAi/VaultOfArchavon/RaidVoATriggerContext.h
similarity index 100%
rename from src/Extend/RaidAi/VaultOfArchavon/RaidVoATriggerContext.h
rename to src/Scenario/RaidAi/VaultOfArchavon/RaidVoATriggerContext.h
diff --git a/src/Extend/RaidAi/VaultOfArchavon/Strategy/RaidVoAStrategy.cpp b/src/Scenario/RaidAi/VaultOfArchavon/Strategy/RaidVoAStrategy.cpp
similarity index 100%
rename from src/Extend/RaidAi/VaultOfArchavon/Strategy/RaidVoAStrategy.cpp
rename to src/Scenario/RaidAi/VaultOfArchavon/Strategy/RaidVoAStrategy.cpp
diff --git a/src/Extend/RaidAi/VaultOfArchavon/Strategy/RaidVoAStrategy.h b/src/Scenario/RaidAi/VaultOfArchavon/Strategy/RaidVoAStrategy.h
similarity index 100%
rename from src/Extend/RaidAi/VaultOfArchavon/Strategy/RaidVoAStrategy.h
rename to src/Scenario/RaidAi/VaultOfArchavon/Strategy/RaidVoAStrategy.h
diff --git a/src/Extend/RaidAi/VaultOfArchavon/Trigger/RaidVoATriggers.cpp b/src/Scenario/RaidAi/VaultOfArchavon/Trigger/RaidVoATriggers.cpp
similarity index 100%
rename from src/Extend/RaidAi/VaultOfArchavon/Trigger/RaidVoATriggers.cpp
rename to src/Scenario/RaidAi/VaultOfArchavon/Trigger/RaidVoATriggers.cpp
diff --git a/src/Extend/RaidAi/VaultOfArchavon/Trigger/RaidVoATriggers.h b/src/Scenario/RaidAi/VaultOfArchavon/Trigger/RaidVoATriggers.h
similarity index 100%
rename from src/Extend/RaidAi/VaultOfArchavon/Trigger/RaidVoATriggers.h
rename to src/Scenario/RaidAi/VaultOfArchavon/Trigger/RaidVoATriggers.h
diff --git a/src/Extend/WorldAi/Rpg/Action/NewRpgAction.cpp b/src/Scenario/WorldAi/Rpg/Action/NewRpgAction.cpp
similarity index 100%
rename from src/Extend/WorldAi/Rpg/Action/NewRpgAction.cpp
rename to src/Scenario/WorldAi/Rpg/Action/NewRpgAction.cpp
diff --git a/src/Extend/WorldAi/Rpg/Action/NewRpgAction.h b/src/Scenario/WorldAi/Rpg/Action/NewRpgAction.h
similarity index 100%
rename from src/Extend/WorldAi/Rpg/Action/NewRpgAction.h
rename to src/Scenario/WorldAi/Rpg/Action/NewRpgAction.h
diff --git a/src/Extend/WorldAi/Rpg/Action/NewRpgBaseAction.cpp b/src/Scenario/WorldAi/Rpg/Action/NewRpgBaseAction.cpp
similarity index 100%
rename from src/Extend/WorldAi/Rpg/Action/NewRpgBaseAction.cpp
rename to src/Scenario/WorldAi/Rpg/Action/NewRpgBaseAction.cpp
diff --git a/src/Extend/WorldAi/Rpg/Action/NewRpgBaseAction.h b/src/Scenario/WorldAi/Rpg/Action/NewRpgBaseAction.h
similarity index 100%
rename from src/Extend/WorldAi/Rpg/Action/NewRpgBaseAction.h
rename to src/Scenario/WorldAi/Rpg/Action/NewRpgBaseAction.h
diff --git a/src/Extend/WorldAi/Rpg/NewRpgInfo.cpp b/src/Scenario/WorldAi/Rpg/NewRpgInfo.cpp
similarity index 100%
rename from src/Extend/WorldAi/Rpg/NewRpgInfo.cpp
rename to src/Scenario/WorldAi/Rpg/NewRpgInfo.cpp
diff --git a/src/Extend/WorldAi/Rpg/NewRpgInfo.h b/src/Scenario/WorldAi/Rpg/NewRpgInfo.h
similarity index 100%
rename from src/Extend/WorldAi/Rpg/NewRpgInfo.h
rename to src/Scenario/WorldAi/Rpg/NewRpgInfo.h
diff --git a/src/Extend/WorldAi/Rpg/Strategy/NewRpgStrategy.cpp b/src/Scenario/WorldAi/Rpg/Strategy/NewRpgStrategy.cpp
similarity index 100%
rename from src/Extend/WorldAi/Rpg/Strategy/NewRpgStrategy.cpp
rename to src/Scenario/WorldAi/Rpg/Strategy/NewRpgStrategy.cpp
diff --git a/src/Extend/WorldAi/Rpg/Strategy/NewRpgStrategy.h b/src/Scenario/WorldAi/Rpg/Strategy/NewRpgStrategy.h
similarity index 100%
rename from src/Extend/WorldAi/Rpg/Strategy/NewRpgStrategy.h
rename to src/Scenario/WorldAi/Rpg/Strategy/NewRpgStrategy.h
diff --git a/src/Extend/WorldAi/Rpg/Trigger/NewRpgTrigger.cpp b/src/Scenario/WorldAi/Rpg/Trigger/NewRpgTrigger.cpp
similarity index 100%
rename from src/Extend/WorldAi/Rpg/Trigger/NewRpgTrigger.cpp
rename to src/Scenario/WorldAi/Rpg/Trigger/NewRpgTrigger.cpp
diff --git a/src/Extend/WorldAi/Rpg/Trigger/NewRpgTriggers.h b/src/Scenario/WorldAi/Rpg/Trigger/NewRpgTriggers.h
similarity index 100%
rename from src/Extend/WorldAi/Rpg/Trigger/NewRpgTriggers.h
rename to src/Scenario/WorldAi/Rpg/Trigger/NewRpgTriggers.h
diff --git a/src/Core/ScriptHook/PlayerbotCommandScript.cpp b/src/ScriptHook/PlayerbotCommandScript.cpp
similarity index 100%
rename from src/Core/ScriptHook/PlayerbotCommandScript.cpp
rename to src/ScriptHook/PlayerbotCommandScript.cpp
diff --git a/src/Core/ScriptHook/PlayerbotCommandScript.h b/src/ScriptHook/PlayerbotCommandScript.h
similarity index 100%
rename from src/Core/ScriptHook/PlayerbotCommandScript.h
rename to src/ScriptHook/PlayerbotCommandScript.h
diff --git a/src/Core/ScriptHook/Playerbots.cpp b/src/ScriptHook/Playerbots.cpp
similarity index 100%
rename from src/Core/ScriptHook/Playerbots.cpp
rename to src/ScriptHook/Playerbots.cpp
diff --git a/src/Core/ScriptHook/Playerbots.h b/src/ScriptHook/Playerbots.h
similarity index 100%
rename from src/Core/ScriptHook/Playerbots.h
rename to src/ScriptHook/Playerbots.h
diff --git a/src/Core/ScriptHook/PlayerbotsSecureLogin.cpp b/src/ScriptHook/PlayerbotsSecureLogin.cpp
similarity index 100%
rename from src/Core/ScriptHook/PlayerbotsSecureLogin.cpp
rename to src/ScriptHook/PlayerbotsSecureLogin.cpp
diff --git a/src/Core/ScriptHook/WorldThread/PlayerbotOperation.h b/src/ScriptHook/WorldThread/PlayerbotOperation.h
similarity index 100%
rename from src/Core/ScriptHook/WorldThread/PlayerbotOperation.h
rename to src/ScriptHook/WorldThread/PlayerbotOperation.h
diff --git a/src/Core/ScriptHook/WorldThread/PlayerbotOperations.h b/src/ScriptHook/WorldThread/PlayerbotOperations.h
similarity index 100%
rename from src/Core/ScriptHook/WorldThread/PlayerbotOperations.h
rename to src/ScriptHook/WorldThread/PlayerbotOperations.h
diff --git a/src/Core/ScriptHook/WorldThread/PlayerbotWorldThreadProcessor.cpp b/src/ScriptHook/WorldThread/PlayerbotWorldThreadProcessor.cpp
similarity index 100%
rename from src/Core/ScriptHook/WorldThread/PlayerbotWorldThreadProcessor.cpp
rename to src/ScriptHook/WorldThread/PlayerbotWorldThreadProcessor.cpp
diff --git a/src/Core/ScriptHook/WorldThread/PlayerbotWorldThreadProcessor.h b/src/ScriptHook/WorldThread/PlayerbotWorldThreadProcessor.h
similarity index 100%
rename from src/Core/ScriptHook/WorldThread/PlayerbotWorldThreadProcessor.h
rename to src/ScriptHook/WorldThread/PlayerbotWorldThreadProcessor.h
diff --git a/src/Core/ScriptHook/WorldThread/Queue.cpp b/src/ScriptHook/WorldThread/Queue.cpp
similarity index 100%
rename from src/Core/ScriptHook/WorldThread/Queue.cpp
rename to src/ScriptHook/WorldThread/Queue.cpp
diff --git a/src/Core/ScriptHook/WorldThread/Queue.h b/src/ScriptHook/WorldThread/Queue.h
similarity index 100%
rename from src/Core/ScriptHook/WorldThread/Queue.h
rename to src/ScriptHook/WorldThread/Queue.h
diff --git a/src/Core/ScriptHook/playerbots_loader.cpp b/src/ScriptHook/playerbots_loader.cpp
similarity index 100%
rename from src/Core/ScriptHook/playerbots_loader.cpp
rename to src/ScriptHook/playerbots_loader.cpp
diff --git a/src/Core/Debug/PerfMonitor.cpp b/src/Util/PerfMonitor.cpp
similarity index 100%
rename from src/Core/Debug/PerfMonitor.cpp
rename to src/Util/PerfMonitor.cpp
diff --git a/src/Core/Debug/PerfMonitor.h b/src/Util/PerfMonitor.h
similarity index 100%
rename from src/Core/Debug/PerfMonitor.h
rename to src/Util/PerfMonitor.h