diff --git a/src/strategy/deathknight/BloodDKStrategy.cpp b/src/strategy/classes/deathknight/BloodDKStrategy.cpp similarity index 100% rename from src/strategy/deathknight/BloodDKStrategy.cpp rename to src/strategy/classes/deathknight/BloodDKStrategy.cpp diff --git a/src/strategy/deathknight/BloodDKStrategy.h b/src/strategy/classes/deathknight/BloodDKStrategy.h similarity index 100% rename from src/strategy/deathknight/BloodDKStrategy.h rename to src/strategy/classes/deathknight/BloodDKStrategy.h diff --git a/src/strategy/deathknight/DKActions.cpp b/src/strategy/classes/deathknight/DKActions.cpp similarity index 100% rename from src/strategy/deathknight/DKActions.cpp rename to src/strategy/classes/deathknight/DKActions.cpp diff --git a/src/strategy/deathknight/DKActions.h b/src/strategy/classes/deathknight/DKActions.h similarity index 100% rename from src/strategy/deathknight/DKActions.h rename to src/strategy/classes/deathknight/DKActions.h diff --git a/src/strategy/deathknight/DKAiObjectContext.cpp b/src/strategy/classes/deathknight/DKAiObjectContext.cpp similarity index 100% rename from src/strategy/deathknight/DKAiObjectContext.cpp rename to src/strategy/classes/deathknight/DKAiObjectContext.cpp diff --git a/src/strategy/deathknight/DKAiObjectContext.h b/src/strategy/classes/deathknight/DKAiObjectContext.h similarity index 100% rename from src/strategy/deathknight/DKAiObjectContext.h rename to src/strategy/classes/deathknight/DKAiObjectContext.h diff --git a/src/strategy/deathknight/DKTriggers.cpp b/src/strategy/classes/deathknight/DKTriggers.cpp similarity index 100% rename from src/strategy/deathknight/DKTriggers.cpp rename to src/strategy/classes/deathknight/DKTriggers.cpp diff --git a/src/strategy/deathknight/DKTriggers.h b/src/strategy/classes/deathknight/DKTriggers.h similarity index 100% rename from src/strategy/deathknight/DKTriggers.h rename to src/strategy/classes/deathknight/DKTriggers.h diff --git a/src/strategy/deathknight/FrostDKStrategy.cpp b/src/strategy/classes/deathknight/FrostDKStrategy.cpp similarity index 100% rename from src/strategy/deathknight/FrostDKStrategy.cpp rename to src/strategy/classes/deathknight/FrostDKStrategy.cpp diff --git a/src/strategy/deathknight/FrostDKStrategy.h b/src/strategy/classes/deathknight/FrostDKStrategy.h similarity index 100% rename from src/strategy/deathknight/FrostDKStrategy.h rename to src/strategy/classes/deathknight/FrostDKStrategy.h diff --git a/src/strategy/deathknight/GenericDKNonCombatStrategy.cpp b/src/strategy/classes/deathknight/GenericDKNonCombatStrategy.cpp similarity index 100% rename from src/strategy/deathknight/GenericDKNonCombatStrategy.cpp rename to src/strategy/classes/deathknight/GenericDKNonCombatStrategy.cpp diff --git a/src/strategy/deathknight/GenericDKNonCombatStrategy.h b/src/strategy/classes/deathknight/GenericDKNonCombatStrategy.h similarity index 100% rename from src/strategy/deathknight/GenericDKNonCombatStrategy.h rename to src/strategy/classes/deathknight/GenericDKNonCombatStrategy.h diff --git a/src/strategy/deathknight/GenericDKStrategy.cpp b/src/strategy/classes/deathknight/GenericDKStrategy.cpp similarity index 100% rename from src/strategy/deathknight/GenericDKStrategy.cpp rename to src/strategy/classes/deathknight/GenericDKStrategy.cpp diff --git a/src/strategy/deathknight/GenericDKStrategy.h b/src/strategy/classes/deathknight/GenericDKStrategy.h similarity index 100% rename from src/strategy/deathknight/GenericDKStrategy.h rename to src/strategy/classes/deathknight/GenericDKStrategy.h diff --git a/src/strategy/deathknight/UnholyDKStrategy.cpp b/src/strategy/classes/deathknight/UnholyDKStrategy.cpp similarity index 100% rename from src/strategy/deathknight/UnholyDKStrategy.cpp rename to src/strategy/classes/deathknight/UnholyDKStrategy.cpp diff --git a/src/strategy/deathknight/UnholyDKStrategy.h b/src/strategy/classes/deathknight/UnholyDKStrategy.h similarity index 100% rename from src/strategy/deathknight/UnholyDKStrategy.h rename to src/strategy/classes/deathknight/UnholyDKStrategy.h diff --git a/src/strategy/druid/BearTankDruidStrategy.cpp b/src/strategy/classes/druid/BearTankDruidStrategy.cpp similarity index 100% rename from src/strategy/druid/BearTankDruidStrategy.cpp rename to src/strategy/classes/druid/BearTankDruidStrategy.cpp diff --git a/src/strategy/druid/BearTankDruidStrategy.h b/src/strategy/classes/druid/BearTankDruidStrategy.h similarity index 100% rename from src/strategy/druid/BearTankDruidStrategy.h rename to src/strategy/classes/druid/BearTankDruidStrategy.h diff --git a/src/strategy/druid/CasterDruidStrategy.cpp b/src/strategy/classes/druid/CasterDruidStrategy.cpp similarity index 100% rename from src/strategy/druid/CasterDruidStrategy.cpp rename to src/strategy/classes/druid/CasterDruidStrategy.cpp diff --git a/src/strategy/druid/CasterDruidStrategy.h b/src/strategy/classes/druid/CasterDruidStrategy.h similarity index 100% rename from src/strategy/druid/CasterDruidStrategy.h rename to src/strategy/classes/druid/CasterDruidStrategy.h diff --git a/src/strategy/druid/CatDpsDruidStrategy.cpp b/src/strategy/classes/druid/CatDpsDruidStrategy.cpp similarity index 100% rename from src/strategy/druid/CatDpsDruidStrategy.cpp rename to src/strategy/classes/druid/CatDpsDruidStrategy.cpp diff --git a/src/strategy/druid/CatDpsDruidStrategy.h b/src/strategy/classes/druid/CatDpsDruidStrategy.h similarity index 100% rename from src/strategy/druid/CatDpsDruidStrategy.h rename to src/strategy/classes/druid/CatDpsDruidStrategy.h diff --git a/src/strategy/druid/DruidActions.cpp b/src/strategy/classes/druid/DruidActions.cpp similarity index 100% rename from src/strategy/druid/DruidActions.cpp rename to src/strategy/classes/druid/DruidActions.cpp diff --git a/src/strategy/druid/DruidActions.h b/src/strategy/classes/druid/DruidActions.h similarity index 100% rename from src/strategy/druid/DruidActions.h rename to src/strategy/classes/druid/DruidActions.h diff --git a/src/strategy/druid/DruidAiObjectContext.cpp b/src/strategy/classes/druid/DruidAiObjectContext.cpp similarity index 100% rename from src/strategy/druid/DruidAiObjectContext.cpp rename to src/strategy/classes/druid/DruidAiObjectContext.cpp diff --git a/src/strategy/druid/DruidAiObjectContext.h b/src/strategy/classes/druid/DruidAiObjectContext.h similarity index 100% rename from src/strategy/druid/DruidAiObjectContext.h rename to src/strategy/classes/druid/DruidAiObjectContext.h diff --git a/src/strategy/druid/DruidBearActions.cpp b/src/strategy/classes/druid/DruidBearActions.cpp similarity index 100% rename from src/strategy/druid/DruidBearActions.cpp rename to src/strategy/classes/druid/DruidBearActions.cpp diff --git a/src/strategy/druid/DruidBearActions.h b/src/strategy/classes/druid/DruidBearActions.h similarity index 100% rename from src/strategy/druid/DruidBearActions.h rename to src/strategy/classes/druid/DruidBearActions.h diff --git a/src/strategy/druid/DruidCatActions.cpp b/src/strategy/classes/druid/DruidCatActions.cpp similarity index 100% rename from src/strategy/druid/DruidCatActions.cpp rename to src/strategy/classes/druid/DruidCatActions.cpp diff --git a/src/strategy/druid/DruidCatActions.h b/src/strategy/classes/druid/DruidCatActions.h similarity index 100% rename from src/strategy/druid/DruidCatActions.h rename to src/strategy/classes/druid/DruidCatActions.h diff --git a/src/strategy/druid/DruidShapeshiftActions.cpp b/src/strategy/classes/druid/DruidShapeshiftActions.cpp similarity index 100% rename from src/strategy/druid/DruidShapeshiftActions.cpp rename to src/strategy/classes/druid/DruidShapeshiftActions.cpp diff --git a/src/strategy/druid/DruidShapeshiftActions.h b/src/strategy/classes/druid/DruidShapeshiftActions.h similarity index 100% rename from src/strategy/druid/DruidShapeshiftActions.h rename to src/strategy/classes/druid/DruidShapeshiftActions.h diff --git a/src/strategy/druid/DruidTriggers.cpp b/src/strategy/classes/druid/DruidTriggers.cpp similarity index 100% rename from src/strategy/druid/DruidTriggers.cpp rename to src/strategy/classes/druid/DruidTriggers.cpp diff --git a/src/strategy/druid/DruidTriggers.h b/src/strategy/classes/druid/DruidTriggers.h similarity index 100% rename from src/strategy/druid/DruidTriggers.h rename to src/strategy/classes/druid/DruidTriggers.h diff --git a/src/strategy/druid/FeralDruidStrategy.cpp b/src/strategy/classes/druid/FeralDruidStrategy.cpp similarity index 100% rename from src/strategy/druid/FeralDruidStrategy.cpp rename to src/strategy/classes/druid/FeralDruidStrategy.cpp diff --git a/src/strategy/druid/FeralDruidStrategy.h b/src/strategy/classes/druid/FeralDruidStrategy.h similarity index 100% rename from src/strategy/druid/FeralDruidStrategy.h rename to src/strategy/classes/druid/FeralDruidStrategy.h diff --git a/src/strategy/druid/GenericDruidNonCombatStrategy.cpp b/src/strategy/classes/druid/GenericDruidNonCombatStrategy.cpp similarity index 100% rename from src/strategy/druid/GenericDruidNonCombatStrategy.cpp rename to src/strategy/classes/druid/GenericDruidNonCombatStrategy.cpp diff --git a/src/strategy/druid/GenericDruidNonCombatStrategy.h b/src/strategy/classes/druid/GenericDruidNonCombatStrategy.h similarity index 100% rename from src/strategy/druid/GenericDruidNonCombatStrategy.h rename to src/strategy/classes/druid/GenericDruidNonCombatStrategy.h diff --git a/src/strategy/druid/GenericDruidStrategy.cpp b/src/strategy/classes/druid/GenericDruidStrategy.cpp similarity index 100% rename from src/strategy/druid/GenericDruidStrategy.cpp rename to src/strategy/classes/druid/GenericDruidStrategy.cpp diff --git a/src/strategy/druid/GenericDruidStrategy.h b/src/strategy/classes/druid/GenericDruidStrategy.h similarity index 100% rename from src/strategy/druid/GenericDruidStrategy.h rename to src/strategy/classes/druid/GenericDruidStrategy.h diff --git a/src/strategy/druid/HealDruidStrategy.cpp b/src/strategy/classes/druid/HealDruidStrategy.cpp similarity index 100% rename from src/strategy/druid/HealDruidStrategy.cpp rename to src/strategy/classes/druid/HealDruidStrategy.cpp diff --git a/src/strategy/druid/HealDruidStrategy.h b/src/strategy/classes/druid/HealDruidStrategy.h similarity index 100% rename from src/strategy/druid/HealDruidStrategy.h rename to src/strategy/classes/druid/HealDruidStrategy.h diff --git a/src/strategy/druid/MeleeDruidStrategy.cpp b/src/strategy/classes/druid/MeleeDruidStrategy.cpp similarity index 100% rename from src/strategy/druid/MeleeDruidStrategy.cpp rename to src/strategy/classes/druid/MeleeDruidStrategy.cpp diff --git a/src/strategy/druid/MeleeDruidStrategy.h b/src/strategy/classes/druid/MeleeDruidStrategy.h similarity index 100% rename from src/strategy/druid/MeleeDruidStrategy.h rename to src/strategy/classes/druid/MeleeDruidStrategy.h diff --git a/src/strategy/hunter/DpsHunterStrategy.cpp b/src/strategy/classes/hunter/DpsHunterStrategy.cpp similarity index 100% rename from src/strategy/hunter/DpsHunterStrategy.cpp rename to src/strategy/classes/hunter/DpsHunterStrategy.cpp diff --git a/src/strategy/hunter/DpsHunterStrategy.h b/src/strategy/classes/hunter/DpsHunterStrategy.h similarity index 100% rename from src/strategy/hunter/DpsHunterStrategy.h rename to src/strategy/classes/hunter/DpsHunterStrategy.h diff --git a/src/strategy/hunter/GenericHunterNonCombatStrategy.cpp b/src/strategy/classes/hunter/GenericHunterNonCombatStrategy.cpp similarity index 100% rename from src/strategy/hunter/GenericHunterNonCombatStrategy.cpp rename to src/strategy/classes/hunter/GenericHunterNonCombatStrategy.cpp diff --git a/src/strategy/hunter/GenericHunterNonCombatStrategy.h b/src/strategy/classes/hunter/GenericHunterNonCombatStrategy.h similarity index 100% rename from src/strategy/hunter/GenericHunterNonCombatStrategy.h rename to src/strategy/classes/hunter/GenericHunterNonCombatStrategy.h diff --git a/src/strategy/hunter/GenericHunterStrategy.cpp b/src/strategy/classes/hunter/GenericHunterStrategy.cpp similarity index 100% rename from src/strategy/hunter/GenericHunterStrategy.cpp rename to src/strategy/classes/hunter/GenericHunterStrategy.cpp diff --git a/src/strategy/hunter/GenericHunterStrategy.h b/src/strategy/classes/hunter/GenericHunterStrategy.h similarity index 100% rename from src/strategy/hunter/GenericHunterStrategy.h rename to src/strategy/classes/hunter/GenericHunterStrategy.h diff --git a/src/strategy/hunter/HunterActions.cpp b/src/strategy/classes/hunter/HunterActions.cpp similarity index 100% rename from src/strategy/hunter/HunterActions.cpp rename to src/strategy/classes/hunter/HunterActions.cpp diff --git a/src/strategy/hunter/HunterActions.h b/src/strategy/classes/hunter/HunterActions.h similarity index 100% rename from src/strategy/hunter/HunterActions.h rename to src/strategy/classes/hunter/HunterActions.h diff --git a/src/strategy/hunter/HunterAiObjectContext.cpp b/src/strategy/classes/hunter/HunterAiObjectContext.cpp similarity index 100% rename from src/strategy/hunter/HunterAiObjectContext.cpp rename to src/strategy/classes/hunter/HunterAiObjectContext.cpp diff --git a/src/strategy/hunter/HunterAiObjectContext.h b/src/strategy/classes/hunter/HunterAiObjectContext.h similarity index 100% rename from src/strategy/hunter/HunterAiObjectContext.h rename to src/strategy/classes/hunter/HunterAiObjectContext.h diff --git a/src/strategy/hunter/HunterBuffStrategies.cpp b/src/strategy/classes/hunter/HunterBuffStrategies.cpp similarity index 100% rename from src/strategy/hunter/HunterBuffStrategies.cpp rename to src/strategy/classes/hunter/HunterBuffStrategies.cpp diff --git a/src/strategy/hunter/HunterBuffStrategies.h b/src/strategy/classes/hunter/HunterBuffStrategies.h similarity index 100% rename from src/strategy/hunter/HunterBuffStrategies.h rename to src/strategy/classes/hunter/HunterBuffStrategies.h diff --git a/src/strategy/hunter/HunterTriggers.cpp b/src/strategy/classes/hunter/HunterTriggers.cpp similarity index 100% rename from src/strategy/hunter/HunterTriggers.cpp rename to src/strategy/classes/hunter/HunterTriggers.cpp diff --git a/src/strategy/hunter/HunterTriggers.h b/src/strategy/classes/hunter/HunterTriggers.h similarity index 100% rename from src/strategy/hunter/HunterTriggers.h rename to src/strategy/classes/hunter/HunterTriggers.h diff --git a/src/strategy/mage/ArcaneMageStrategy.cpp b/src/strategy/classes/mage/ArcaneMageStrategy.cpp similarity index 100% rename from src/strategy/mage/ArcaneMageStrategy.cpp rename to src/strategy/classes/mage/ArcaneMageStrategy.cpp diff --git a/src/strategy/mage/ArcaneMageStrategy.h b/src/strategy/classes/mage/ArcaneMageStrategy.h similarity index 100% rename from src/strategy/mage/ArcaneMageStrategy.h rename to src/strategy/classes/mage/ArcaneMageStrategy.h diff --git a/src/strategy/mage/FireMageStrategy.cpp b/src/strategy/classes/mage/FireMageStrategy.cpp similarity index 100% rename from src/strategy/mage/FireMageStrategy.cpp rename to src/strategy/classes/mage/FireMageStrategy.cpp diff --git a/src/strategy/mage/FireMageStrategy.h b/src/strategy/classes/mage/FireMageStrategy.h similarity index 100% rename from src/strategy/mage/FireMageStrategy.h rename to src/strategy/classes/mage/FireMageStrategy.h diff --git a/src/strategy/mage/FrostMageStrategy.cpp b/src/strategy/classes/mage/FrostMageStrategy.cpp similarity index 100% rename from src/strategy/mage/FrostMageStrategy.cpp rename to src/strategy/classes/mage/FrostMageStrategy.cpp diff --git a/src/strategy/mage/FrostMageStrategy.h b/src/strategy/classes/mage/FrostMageStrategy.h similarity index 100% rename from src/strategy/mage/FrostMageStrategy.h rename to src/strategy/classes/mage/FrostMageStrategy.h diff --git a/src/strategy/mage/GenericMageNonCombatStrategy.cpp b/src/strategy/classes/mage/GenericMageNonCombatStrategy.cpp similarity index 100% rename from src/strategy/mage/GenericMageNonCombatStrategy.cpp rename to src/strategy/classes/mage/GenericMageNonCombatStrategy.cpp diff --git a/src/strategy/mage/GenericMageNonCombatStrategy.h b/src/strategy/classes/mage/GenericMageNonCombatStrategy.h similarity index 100% rename from src/strategy/mage/GenericMageNonCombatStrategy.h rename to src/strategy/classes/mage/GenericMageNonCombatStrategy.h diff --git a/src/strategy/mage/GenericMageStrategy.cpp b/src/strategy/classes/mage/GenericMageStrategy.cpp similarity index 100% rename from src/strategy/mage/GenericMageStrategy.cpp rename to src/strategy/classes/mage/GenericMageStrategy.cpp diff --git a/src/strategy/mage/GenericMageStrategy.h b/src/strategy/classes/mage/GenericMageStrategy.h similarity index 100% rename from src/strategy/mage/GenericMageStrategy.h rename to src/strategy/classes/mage/GenericMageStrategy.h diff --git a/src/strategy/mage/MageActions.cpp b/src/strategy/classes/mage/MageActions.cpp similarity index 100% rename from src/strategy/mage/MageActions.cpp rename to src/strategy/classes/mage/MageActions.cpp diff --git a/src/strategy/mage/MageActions.h b/src/strategy/classes/mage/MageActions.h similarity index 100% rename from src/strategy/mage/MageActions.h rename to src/strategy/classes/mage/MageActions.h diff --git a/src/strategy/mage/MageAiObjectContext.cpp b/src/strategy/classes/mage/MageAiObjectContext.cpp similarity index 100% rename from src/strategy/mage/MageAiObjectContext.cpp rename to src/strategy/classes/mage/MageAiObjectContext.cpp diff --git a/src/strategy/mage/MageAiObjectContext.h b/src/strategy/classes/mage/MageAiObjectContext.h similarity index 100% rename from src/strategy/mage/MageAiObjectContext.h rename to src/strategy/classes/mage/MageAiObjectContext.h diff --git a/src/strategy/mage/MageTriggers.cpp b/src/strategy/classes/mage/MageTriggers.cpp similarity index 100% rename from src/strategy/mage/MageTriggers.cpp rename to src/strategy/classes/mage/MageTriggers.cpp diff --git a/src/strategy/mage/MageTriggers.h b/src/strategy/classes/mage/MageTriggers.h similarity index 100% rename from src/strategy/mage/MageTriggers.h rename to src/strategy/classes/mage/MageTriggers.h diff --git a/src/strategy/paladin/DpsPaladinStrategy.cpp b/src/strategy/classes/paladin/DpsPaladinStrategy.cpp similarity index 100% rename from src/strategy/paladin/DpsPaladinStrategy.cpp rename to src/strategy/classes/paladin/DpsPaladinStrategy.cpp diff --git a/src/strategy/paladin/DpsPaladinStrategy.h b/src/strategy/classes/paladin/DpsPaladinStrategy.h similarity index 100% rename from src/strategy/paladin/DpsPaladinStrategy.h rename to src/strategy/classes/paladin/DpsPaladinStrategy.h diff --git a/src/strategy/paladin/GenericPaladinNonCombatStrategy.cpp b/src/strategy/classes/paladin/GenericPaladinNonCombatStrategy.cpp similarity index 100% rename from src/strategy/paladin/GenericPaladinNonCombatStrategy.cpp rename to src/strategy/classes/paladin/GenericPaladinNonCombatStrategy.cpp diff --git a/src/strategy/paladin/GenericPaladinNonCombatStrategy.h b/src/strategy/classes/paladin/GenericPaladinNonCombatStrategy.h similarity index 100% rename from src/strategy/paladin/GenericPaladinNonCombatStrategy.h rename to src/strategy/classes/paladin/GenericPaladinNonCombatStrategy.h diff --git a/src/strategy/paladin/GenericPaladinStrategy.cpp b/src/strategy/classes/paladin/GenericPaladinStrategy.cpp similarity index 100% rename from src/strategy/paladin/GenericPaladinStrategy.cpp rename to src/strategy/classes/paladin/GenericPaladinStrategy.cpp diff --git a/src/strategy/paladin/GenericPaladinStrategy.h b/src/strategy/classes/paladin/GenericPaladinStrategy.h similarity index 100% rename from src/strategy/paladin/GenericPaladinStrategy.h rename to src/strategy/classes/paladin/GenericPaladinStrategy.h diff --git a/src/strategy/paladin/GenericPaladinStrategyActionNodeFactory.h b/src/strategy/classes/paladin/GenericPaladinStrategyActionNodeFactory.h similarity index 100% rename from src/strategy/paladin/GenericPaladinStrategyActionNodeFactory.h rename to src/strategy/classes/paladin/GenericPaladinStrategyActionNodeFactory.h diff --git a/src/strategy/paladin/HealPaladinStrategy.cpp b/src/strategy/classes/paladin/HealPaladinStrategy.cpp similarity index 100% rename from src/strategy/paladin/HealPaladinStrategy.cpp rename to src/strategy/classes/paladin/HealPaladinStrategy.cpp diff --git a/src/strategy/paladin/HealPaladinStrategy.h b/src/strategy/classes/paladin/HealPaladinStrategy.h similarity index 100% rename from src/strategy/paladin/HealPaladinStrategy.h rename to src/strategy/classes/paladin/HealPaladinStrategy.h diff --git a/src/strategy/paladin/PaladinActions.cpp b/src/strategy/classes/paladin/PaladinActions.cpp similarity index 100% rename from src/strategy/paladin/PaladinActions.cpp rename to src/strategy/classes/paladin/PaladinActions.cpp diff --git a/src/strategy/paladin/PaladinActions.h b/src/strategy/classes/paladin/PaladinActions.h similarity index 100% rename from src/strategy/paladin/PaladinActions.h rename to src/strategy/classes/paladin/PaladinActions.h diff --git a/src/strategy/paladin/PaladinAiObjectContext.cpp b/src/strategy/classes/paladin/PaladinAiObjectContext.cpp similarity index 100% rename from src/strategy/paladin/PaladinAiObjectContext.cpp rename to src/strategy/classes/paladin/PaladinAiObjectContext.cpp diff --git a/src/strategy/paladin/PaladinAiObjectContext.h b/src/strategy/classes/paladin/PaladinAiObjectContext.h similarity index 100% rename from src/strategy/paladin/PaladinAiObjectContext.h rename to src/strategy/classes/paladin/PaladinAiObjectContext.h diff --git a/src/strategy/paladin/PaladinBuffStrategies.cpp b/src/strategy/classes/paladin/PaladinBuffStrategies.cpp similarity index 100% rename from src/strategy/paladin/PaladinBuffStrategies.cpp rename to src/strategy/classes/paladin/PaladinBuffStrategies.cpp diff --git a/src/strategy/paladin/PaladinBuffStrategies.h b/src/strategy/classes/paladin/PaladinBuffStrategies.h similarity index 100% rename from src/strategy/paladin/PaladinBuffStrategies.h rename to src/strategy/classes/paladin/PaladinBuffStrategies.h diff --git a/src/strategy/paladin/PaladinTriggers.cpp b/src/strategy/classes/paladin/PaladinTriggers.cpp similarity index 100% rename from src/strategy/paladin/PaladinTriggers.cpp rename to src/strategy/classes/paladin/PaladinTriggers.cpp diff --git a/src/strategy/paladin/PaladinTriggers.h b/src/strategy/classes/paladin/PaladinTriggers.h similarity index 100% rename from src/strategy/paladin/PaladinTriggers.h rename to src/strategy/classes/paladin/PaladinTriggers.h diff --git a/src/strategy/paladin/TankPaladinStrategy.cpp b/src/strategy/classes/paladin/TankPaladinStrategy.cpp similarity index 100% rename from src/strategy/paladin/TankPaladinStrategy.cpp rename to src/strategy/classes/paladin/TankPaladinStrategy.cpp diff --git a/src/strategy/paladin/TankPaladinStrategy.h b/src/strategy/classes/paladin/TankPaladinStrategy.h similarity index 100% rename from src/strategy/paladin/TankPaladinStrategy.h rename to src/strategy/classes/paladin/TankPaladinStrategy.h diff --git a/src/strategy/priest/GenericPriestStrategy.cpp b/src/strategy/classes/priest/GenericPriestStrategy.cpp similarity index 100% rename from src/strategy/priest/GenericPriestStrategy.cpp rename to src/strategy/classes/priest/GenericPriestStrategy.cpp diff --git a/src/strategy/priest/GenericPriestStrategy.h b/src/strategy/classes/priest/GenericPriestStrategy.h similarity index 100% rename from src/strategy/priest/GenericPriestStrategy.h rename to src/strategy/classes/priest/GenericPriestStrategy.h diff --git a/src/strategy/priest/GenericPriestStrategyActionNodeFactory.h b/src/strategy/classes/priest/GenericPriestStrategyActionNodeFactory.h similarity index 100% rename from src/strategy/priest/GenericPriestStrategyActionNodeFactory.h rename to src/strategy/classes/priest/GenericPriestStrategyActionNodeFactory.h diff --git a/src/strategy/priest/HealPriestStrategy.cpp b/src/strategy/classes/priest/HealPriestStrategy.cpp similarity index 100% rename from src/strategy/priest/HealPriestStrategy.cpp rename to src/strategy/classes/priest/HealPriestStrategy.cpp diff --git a/src/strategy/priest/HealPriestStrategy.h b/src/strategy/classes/priest/HealPriestStrategy.h similarity index 100% rename from src/strategy/priest/HealPriestStrategy.h rename to src/strategy/classes/priest/HealPriestStrategy.h diff --git a/src/strategy/priest/HolyPriestStrategy.cpp b/src/strategy/classes/priest/HolyPriestStrategy.cpp similarity index 100% rename from src/strategy/priest/HolyPriestStrategy.cpp rename to src/strategy/classes/priest/HolyPriestStrategy.cpp diff --git a/src/strategy/priest/HolyPriestStrategy.h b/src/strategy/classes/priest/HolyPriestStrategy.h similarity index 100% rename from src/strategy/priest/HolyPriestStrategy.h rename to src/strategy/classes/priest/HolyPriestStrategy.h diff --git a/src/strategy/priest/PriestActions.cpp b/src/strategy/classes/priest/PriestActions.cpp similarity index 100% rename from src/strategy/priest/PriestActions.cpp rename to src/strategy/classes/priest/PriestActions.cpp diff --git a/src/strategy/priest/PriestActions.h b/src/strategy/classes/priest/PriestActions.h similarity index 100% rename from src/strategy/priest/PriestActions.h rename to src/strategy/classes/priest/PriestActions.h diff --git a/src/strategy/priest/PriestAiObjectContext.cpp b/src/strategy/classes/priest/PriestAiObjectContext.cpp similarity index 100% rename from src/strategy/priest/PriestAiObjectContext.cpp rename to src/strategy/classes/priest/PriestAiObjectContext.cpp diff --git a/src/strategy/priest/PriestAiObjectContext.h b/src/strategy/classes/priest/PriestAiObjectContext.h similarity index 100% rename from src/strategy/priest/PriestAiObjectContext.h rename to src/strategy/classes/priest/PriestAiObjectContext.h diff --git a/src/strategy/priest/PriestNonCombatStrategy.cpp b/src/strategy/classes/priest/PriestNonCombatStrategy.cpp similarity index 100% rename from src/strategy/priest/PriestNonCombatStrategy.cpp rename to src/strategy/classes/priest/PriestNonCombatStrategy.cpp diff --git a/src/strategy/priest/PriestNonCombatStrategy.h b/src/strategy/classes/priest/PriestNonCombatStrategy.h similarity index 100% rename from src/strategy/priest/PriestNonCombatStrategy.h rename to src/strategy/classes/priest/PriestNonCombatStrategy.h diff --git a/src/strategy/priest/PriestNonCombatStrategyActionNodeFactory.h b/src/strategy/classes/priest/PriestNonCombatStrategyActionNodeFactory.h similarity index 100% rename from src/strategy/priest/PriestNonCombatStrategyActionNodeFactory.h rename to src/strategy/classes/priest/PriestNonCombatStrategyActionNodeFactory.h diff --git a/src/strategy/priest/PriestTriggers.cpp b/src/strategy/classes/priest/PriestTriggers.cpp similarity index 100% rename from src/strategy/priest/PriestTriggers.cpp rename to src/strategy/classes/priest/PriestTriggers.cpp diff --git a/src/strategy/priest/PriestTriggers.h b/src/strategy/classes/priest/PriestTriggers.h similarity index 100% rename from src/strategy/priest/PriestTriggers.h rename to src/strategy/classes/priest/PriestTriggers.h diff --git a/src/strategy/priest/ShadowPriestStrategy.cpp b/src/strategy/classes/priest/ShadowPriestStrategy.cpp similarity index 100% rename from src/strategy/priest/ShadowPriestStrategy.cpp rename to src/strategy/classes/priest/ShadowPriestStrategy.cpp diff --git a/src/strategy/priest/ShadowPriestStrategy.h b/src/strategy/classes/priest/ShadowPriestStrategy.h similarity index 100% rename from src/strategy/priest/ShadowPriestStrategy.h rename to src/strategy/classes/priest/ShadowPriestStrategy.h diff --git a/src/strategy/priest/ShadowPriestStrategyActionNodeFactory.h b/src/strategy/classes/priest/ShadowPriestStrategyActionNodeFactory.h similarity index 100% rename from src/strategy/priest/ShadowPriestStrategyActionNodeFactory.h rename to src/strategy/classes/priest/ShadowPriestStrategyActionNodeFactory.h diff --git a/src/strategy/rogue/AssassinationRogueStrategy.cpp b/src/strategy/classes/rogue/AssassinationRogueStrategy.cpp similarity index 100% rename from src/strategy/rogue/AssassinationRogueStrategy.cpp rename to src/strategy/classes/rogue/AssassinationRogueStrategy.cpp diff --git a/src/strategy/rogue/AssassinationRogueStrategy.h b/src/strategy/classes/rogue/AssassinationRogueStrategy.h similarity index 100% rename from src/strategy/rogue/AssassinationRogueStrategy.h rename to src/strategy/classes/rogue/AssassinationRogueStrategy.h diff --git a/src/strategy/rogue/DpsRogueStrategy.cpp b/src/strategy/classes/rogue/DpsRogueStrategy.cpp similarity index 100% rename from src/strategy/rogue/DpsRogueStrategy.cpp rename to src/strategy/classes/rogue/DpsRogueStrategy.cpp diff --git a/src/strategy/rogue/DpsRogueStrategy.h b/src/strategy/classes/rogue/DpsRogueStrategy.h similarity index 100% rename from src/strategy/rogue/DpsRogueStrategy.h rename to src/strategy/classes/rogue/DpsRogueStrategy.h diff --git a/src/strategy/rogue/GenericRogueNonCombatStrategy.cpp b/src/strategy/classes/rogue/GenericRogueNonCombatStrategy.cpp similarity index 100% rename from src/strategy/rogue/GenericRogueNonCombatStrategy.cpp rename to src/strategy/classes/rogue/GenericRogueNonCombatStrategy.cpp diff --git a/src/strategy/rogue/GenericRogueNonCombatStrategy.h b/src/strategy/classes/rogue/GenericRogueNonCombatStrategy.h similarity index 100% rename from src/strategy/rogue/GenericRogueNonCombatStrategy.h rename to src/strategy/classes/rogue/GenericRogueNonCombatStrategy.h diff --git a/src/strategy/rogue/RogueActions.cpp b/src/strategy/classes/rogue/RogueActions.cpp similarity index 100% rename from src/strategy/rogue/RogueActions.cpp rename to src/strategy/classes/rogue/RogueActions.cpp diff --git a/src/strategy/rogue/RogueActions.h b/src/strategy/classes/rogue/RogueActions.h similarity index 100% rename from src/strategy/rogue/RogueActions.h rename to src/strategy/classes/rogue/RogueActions.h diff --git a/src/strategy/rogue/RogueAiObjectContext.cpp b/src/strategy/classes/rogue/RogueAiObjectContext.cpp similarity index 100% rename from src/strategy/rogue/RogueAiObjectContext.cpp rename to src/strategy/classes/rogue/RogueAiObjectContext.cpp diff --git a/src/strategy/rogue/RogueAiObjectContext.h b/src/strategy/classes/rogue/RogueAiObjectContext.h similarity index 100% rename from src/strategy/rogue/RogueAiObjectContext.h rename to src/strategy/classes/rogue/RogueAiObjectContext.h diff --git a/src/strategy/rogue/RogueComboActions.cpp b/src/strategy/classes/rogue/RogueComboActions.cpp similarity index 100% rename from src/strategy/rogue/RogueComboActions.cpp rename to src/strategy/classes/rogue/RogueComboActions.cpp diff --git a/src/strategy/rogue/RogueComboActions.h b/src/strategy/classes/rogue/RogueComboActions.h similarity index 100% rename from src/strategy/rogue/RogueComboActions.h rename to src/strategy/classes/rogue/RogueComboActions.h diff --git a/src/strategy/rogue/RogueFinishingActions.h b/src/strategy/classes/rogue/RogueFinishingActions.h similarity index 100% rename from src/strategy/rogue/RogueFinishingActions.h rename to src/strategy/classes/rogue/RogueFinishingActions.h diff --git a/src/strategy/rogue/RogueOpeningActions.cpp b/src/strategy/classes/rogue/RogueOpeningActions.cpp similarity index 100% rename from src/strategy/rogue/RogueOpeningActions.cpp rename to src/strategy/classes/rogue/RogueOpeningActions.cpp diff --git a/src/strategy/rogue/RogueOpeningActions.h b/src/strategy/classes/rogue/RogueOpeningActions.h similarity index 100% rename from src/strategy/rogue/RogueOpeningActions.h rename to src/strategy/classes/rogue/RogueOpeningActions.h diff --git a/src/strategy/rogue/RogueTriggers.cpp b/src/strategy/classes/rogue/RogueTriggers.cpp similarity index 100% rename from src/strategy/rogue/RogueTriggers.cpp rename to src/strategy/classes/rogue/RogueTriggers.cpp diff --git a/src/strategy/rogue/RogueTriggers.h b/src/strategy/classes/rogue/RogueTriggers.h similarity index 100% rename from src/strategy/rogue/RogueTriggers.h rename to src/strategy/classes/rogue/RogueTriggers.h diff --git a/src/strategy/shaman/CasterShamanStrategy.cpp b/src/strategy/classes/shaman/CasterShamanStrategy.cpp similarity index 100% rename from src/strategy/shaman/CasterShamanStrategy.cpp rename to src/strategy/classes/shaman/CasterShamanStrategy.cpp diff --git a/src/strategy/shaman/CasterShamanStrategy.h b/src/strategy/classes/shaman/CasterShamanStrategy.h similarity index 100% rename from src/strategy/shaman/CasterShamanStrategy.h rename to src/strategy/classes/shaman/CasterShamanStrategy.h diff --git a/src/strategy/shaman/GenericShamanStrategy.cpp b/src/strategy/classes/shaman/GenericShamanStrategy.cpp similarity index 100% rename from src/strategy/shaman/GenericShamanStrategy.cpp rename to src/strategy/classes/shaman/GenericShamanStrategy.cpp diff --git a/src/strategy/shaman/GenericShamanStrategy.h b/src/strategy/classes/shaman/GenericShamanStrategy.h similarity index 100% rename from src/strategy/shaman/GenericShamanStrategy.h rename to src/strategy/classes/shaman/GenericShamanStrategy.h diff --git a/src/strategy/shaman/HealShamanStrategy.cpp b/src/strategy/classes/shaman/HealShamanStrategy.cpp similarity index 100% rename from src/strategy/shaman/HealShamanStrategy.cpp rename to src/strategy/classes/shaman/HealShamanStrategy.cpp diff --git a/src/strategy/shaman/HealShamanStrategy.h b/src/strategy/classes/shaman/HealShamanStrategy.h similarity index 100% rename from src/strategy/shaman/HealShamanStrategy.h rename to src/strategy/classes/shaman/HealShamanStrategy.h diff --git a/src/strategy/shaman/MeleeShamanStrategy.cpp b/src/strategy/classes/shaman/MeleeShamanStrategy.cpp similarity index 100% rename from src/strategy/shaman/MeleeShamanStrategy.cpp rename to src/strategy/classes/shaman/MeleeShamanStrategy.cpp diff --git a/src/strategy/shaman/MeleeShamanStrategy.h b/src/strategy/classes/shaman/MeleeShamanStrategy.h similarity index 100% rename from src/strategy/shaman/MeleeShamanStrategy.h rename to src/strategy/classes/shaman/MeleeShamanStrategy.h diff --git a/src/strategy/shaman/ShamanActions.cpp b/src/strategy/classes/shaman/ShamanActions.cpp similarity index 100% rename from src/strategy/shaman/ShamanActions.cpp rename to src/strategy/classes/shaman/ShamanActions.cpp diff --git a/src/strategy/shaman/ShamanActions.h b/src/strategy/classes/shaman/ShamanActions.h similarity index 100% rename from src/strategy/shaman/ShamanActions.h rename to src/strategy/classes/shaman/ShamanActions.h diff --git a/src/strategy/shaman/ShamanAiObjectContext.cpp b/src/strategy/classes/shaman/ShamanAiObjectContext.cpp similarity index 100% rename from src/strategy/shaman/ShamanAiObjectContext.cpp rename to src/strategy/classes/shaman/ShamanAiObjectContext.cpp diff --git a/src/strategy/shaman/ShamanAiObjectContext.h b/src/strategy/classes/shaman/ShamanAiObjectContext.h similarity index 100% rename from src/strategy/shaman/ShamanAiObjectContext.h rename to src/strategy/classes/shaman/ShamanAiObjectContext.h diff --git a/src/strategy/shaman/ShamanNonCombatStrategy.cpp b/src/strategy/classes/shaman/ShamanNonCombatStrategy.cpp similarity index 100% rename from src/strategy/shaman/ShamanNonCombatStrategy.cpp rename to src/strategy/classes/shaman/ShamanNonCombatStrategy.cpp diff --git a/src/strategy/shaman/ShamanNonCombatStrategy.h b/src/strategy/classes/shaman/ShamanNonCombatStrategy.h similarity index 100% rename from src/strategy/shaman/ShamanNonCombatStrategy.h rename to src/strategy/classes/shaman/ShamanNonCombatStrategy.h diff --git a/src/strategy/shaman/ShamanTriggers.cpp b/src/strategy/classes/shaman/ShamanTriggers.cpp similarity index 100% rename from src/strategy/shaman/ShamanTriggers.cpp rename to src/strategy/classes/shaman/ShamanTriggers.cpp diff --git a/src/strategy/shaman/ShamanTriggers.h b/src/strategy/classes/shaman/ShamanTriggers.h similarity index 100% rename from src/strategy/shaman/ShamanTriggers.h rename to src/strategy/classes/shaman/ShamanTriggers.h diff --git a/src/strategy/shaman/TotemsShamanStrategy.cpp b/src/strategy/classes/shaman/TotemsShamanStrategy.cpp similarity index 100% rename from src/strategy/shaman/TotemsShamanStrategy.cpp rename to src/strategy/classes/shaman/TotemsShamanStrategy.cpp diff --git a/src/strategy/shaman/TotemsShamanStrategy.h b/src/strategy/classes/shaman/TotemsShamanStrategy.h similarity index 100% rename from src/strategy/shaman/TotemsShamanStrategy.h rename to src/strategy/classes/shaman/TotemsShamanStrategy.h diff --git a/src/strategy/warlock/DpsWarlockStrategy.cpp b/src/strategy/classes/warlock/DpsWarlockStrategy.cpp similarity index 100% rename from src/strategy/warlock/DpsWarlockStrategy.cpp rename to src/strategy/classes/warlock/DpsWarlockStrategy.cpp diff --git a/src/strategy/warlock/DpsWarlockStrategy.h b/src/strategy/classes/warlock/DpsWarlockStrategy.h similarity index 100% rename from src/strategy/warlock/DpsWarlockStrategy.h rename to src/strategy/classes/warlock/DpsWarlockStrategy.h diff --git a/src/strategy/warlock/GenericWarlockNonCombatStrategy.cpp b/src/strategy/classes/warlock/GenericWarlockNonCombatStrategy.cpp similarity index 100% rename from src/strategy/warlock/GenericWarlockNonCombatStrategy.cpp rename to src/strategy/classes/warlock/GenericWarlockNonCombatStrategy.cpp diff --git a/src/strategy/warlock/GenericWarlockNonCombatStrategy.h b/src/strategy/classes/warlock/GenericWarlockNonCombatStrategy.h similarity index 100% rename from src/strategy/warlock/GenericWarlockNonCombatStrategy.h rename to src/strategy/classes/warlock/GenericWarlockNonCombatStrategy.h diff --git a/src/strategy/warlock/GenericWarlockStrategy.cpp b/src/strategy/classes/warlock/GenericWarlockStrategy.cpp similarity index 100% rename from src/strategy/warlock/GenericWarlockStrategy.cpp rename to src/strategy/classes/warlock/GenericWarlockStrategy.cpp diff --git a/src/strategy/warlock/GenericWarlockStrategy.h b/src/strategy/classes/warlock/GenericWarlockStrategy.h similarity index 100% rename from src/strategy/warlock/GenericWarlockStrategy.h rename to src/strategy/classes/warlock/GenericWarlockStrategy.h diff --git a/src/strategy/warlock/TankWarlockStrategy.cpp b/src/strategy/classes/warlock/TankWarlockStrategy.cpp similarity index 100% rename from src/strategy/warlock/TankWarlockStrategy.cpp rename to src/strategy/classes/warlock/TankWarlockStrategy.cpp diff --git a/src/strategy/warlock/TankWarlockStrategy.h b/src/strategy/classes/warlock/TankWarlockStrategy.h similarity index 100% rename from src/strategy/warlock/TankWarlockStrategy.h rename to src/strategy/classes/warlock/TankWarlockStrategy.h diff --git a/src/strategy/warlock/WarlockActions.cpp b/src/strategy/classes/warlock/WarlockActions.cpp similarity index 100% rename from src/strategy/warlock/WarlockActions.cpp rename to src/strategy/classes/warlock/WarlockActions.cpp diff --git a/src/strategy/warlock/WarlockActions.h b/src/strategy/classes/warlock/WarlockActions.h similarity index 100% rename from src/strategy/warlock/WarlockActions.h rename to src/strategy/classes/warlock/WarlockActions.h diff --git a/src/strategy/warlock/WarlockAiObjectContext.cpp b/src/strategy/classes/warlock/WarlockAiObjectContext.cpp similarity index 100% rename from src/strategy/warlock/WarlockAiObjectContext.cpp rename to src/strategy/classes/warlock/WarlockAiObjectContext.cpp diff --git a/src/strategy/warlock/WarlockAiObjectContext.h b/src/strategy/classes/warlock/WarlockAiObjectContext.h similarity index 100% rename from src/strategy/warlock/WarlockAiObjectContext.h rename to src/strategy/classes/warlock/WarlockAiObjectContext.h diff --git a/src/strategy/warlock/WarlockTriggers.cpp b/src/strategy/classes/warlock/WarlockTriggers.cpp similarity index 100% rename from src/strategy/warlock/WarlockTriggers.cpp rename to src/strategy/classes/warlock/WarlockTriggers.cpp diff --git a/src/strategy/warlock/WarlockTriggers.h b/src/strategy/classes/warlock/WarlockTriggers.h similarity index 100% rename from src/strategy/warlock/WarlockTriggers.h rename to src/strategy/classes/warlock/WarlockTriggers.h diff --git a/src/strategy/warrior/ArmsWarriorStrategy.cpp b/src/strategy/classes/warrior/ArmsWarriorStrategy.cpp similarity index 100% rename from src/strategy/warrior/ArmsWarriorStrategy.cpp rename to src/strategy/classes/warrior/ArmsWarriorStrategy.cpp diff --git a/src/strategy/warrior/ArmsWarriorStrategy.h b/src/strategy/classes/warrior/ArmsWarriorStrategy.h similarity index 100% rename from src/strategy/warrior/ArmsWarriorStrategy.h rename to src/strategy/classes/warrior/ArmsWarriorStrategy.h diff --git a/src/strategy/warrior/FuryWarriorStrategy.cpp b/src/strategy/classes/warrior/FuryWarriorStrategy.cpp similarity index 100% rename from src/strategy/warrior/FuryWarriorStrategy.cpp rename to src/strategy/classes/warrior/FuryWarriorStrategy.cpp diff --git a/src/strategy/warrior/FuryWarriorStrategy.h b/src/strategy/classes/warrior/FuryWarriorStrategy.h similarity index 100% rename from src/strategy/warrior/FuryWarriorStrategy.h rename to src/strategy/classes/warrior/FuryWarriorStrategy.h diff --git a/src/strategy/warrior/GenericWarriorNonCombatStrategy.cpp b/src/strategy/classes/warrior/GenericWarriorNonCombatStrategy.cpp similarity index 100% rename from src/strategy/warrior/GenericWarriorNonCombatStrategy.cpp rename to src/strategy/classes/warrior/GenericWarriorNonCombatStrategy.cpp diff --git a/src/strategy/warrior/GenericWarriorNonCombatStrategy.h b/src/strategy/classes/warrior/GenericWarriorNonCombatStrategy.h similarity index 100% rename from src/strategy/warrior/GenericWarriorNonCombatStrategy.h rename to src/strategy/classes/warrior/GenericWarriorNonCombatStrategy.h diff --git a/src/strategy/warrior/GenericWarriorStrategy.cpp b/src/strategy/classes/warrior/GenericWarriorStrategy.cpp similarity index 100% rename from src/strategy/warrior/GenericWarriorStrategy.cpp rename to src/strategy/classes/warrior/GenericWarriorStrategy.cpp diff --git a/src/strategy/warrior/GenericWarriorStrategy.h b/src/strategy/classes/warrior/GenericWarriorStrategy.h similarity index 100% rename from src/strategy/warrior/GenericWarriorStrategy.h rename to src/strategy/classes/warrior/GenericWarriorStrategy.h diff --git a/src/strategy/warrior/TankWarriorStrategy.cpp b/src/strategy/classes/warrior/TankWarriorStrategy.cpp similarity index 100% rename from src/strategy/warrior/TankWarriorStrategy.cpp rename to src/strategy/classes/warrior/TankWarriorStrategy.cpp diff --git a/src/strategy/warrior/TankWarriorStrategy.h b/src/strategy/classes/warrior/TankWarriorStrategy.h similarity index 100% rename from src/strategy/warrior/TankWarriorStrategy.h rename to src/strategy/classes/warrior/TankWarriorStrategy.h diff --git a/src/strategy/warrior/WarriorActions.cpp b/src/strategy/classes/warrior/WarriorActions.cpp similarity index 100% rename from src/strategy/warrior/WarriorActions.cpp rename to src/strategy/classes/warrior/WarriorActions.cpp diff --git a/src/strategy/warrior/WarriorActions.h b/src/strategy/classes/warrior/WarriorActions.h similarity index 100% rename from src/strategy/warrior/WarriorActions.h rename to src/strategy/classes/warrior/WarriorActions.h diff --git a/src/strategy/warrior/WarriorAiObjectContext.cpp b/src/strategy/classes/warrior/WarriorAiObjectContext.cpp similarity index 100% rename from src/strategy/warrior/WarriorAiObjectContext.cpp rename to src/strategy/classes/warrior/WarriorAiObjectContext.cpp diff --git a/src/strategy/warrior/WarriorAiObjectContext.h b/src/strategy/classes/warrior/WarriorAiObjectContext.h similarity index 100% rename from src/strategy/warrior/WarriorAiObjectContext.h rename to src/strategy/classes/warrior/WarriorAiObjectContext.h diff --git a/src/strategy/warrior/WarriorTriggers.cpp b/src/strategy/classes/warrior/WarriorTriggers.cpp similarity index 100% rename from src/strategy/warrior/WarriorTriggers.cpp rename to src/strategy/classes/warrior/WarriorTriggers.cpp diff --git a/src/strategy/warrior/WarriorTriggers.h b/src/strategy/classes/warrior/WarriorTriggers.h similarity index 100% rename from src/strategy/warrior/WarriorTriggers.h rename to src/strategy/classes/warrior/WarriorTriggers.h diff --git a/src/strategy/actions/NewRpgAction.cpp b/src/strategy/rpg/NewRpgAction.cpp similarity index 100% rename from src/strategy/actions/NewRpgAction.cpp rename to src/strategy/rpg/NewRpgAction.cpp diff --git a/src/strategy/actions/NewRpgAction.h b/src/strategy/rpg/NewRpgAction.h similarity index 100% rename from src/strategy/actions/NewRpgAction.h rename to src/strategy/rpg/NewRpgAction.h diff --git a/src/strategy/generic/NewRpgStrategy.cpp b/src/strategy/rpg/NewRpgStrategy.cpp similarity index 100% rename from src/strategy/generic/NewRpgStrategy.cpp rename to src/strategy/rpg/NewRpgStrategy.cpp diff --git a/src/strategy/generic/NewRpgStrategy.h b/src/strategy/rpg/NewRpgStrategy.h similarity index 100% rename from src/strategy/generic/NewRpgStrategy.h rename to src/strategy/rpg/NewRpgStrategy.h diff --git a/src/strategy/triggers/NewRpgTrigger.cpp b/src/strategy/rpg/NewRpgTrigger.cpp similarity index 100% rename from src/strategy/triggers/NewRpgTrigger.cpp rename to src/strategy/rpg/NewRpgTrigger.cpp diff --git a/src/strategy/triggers/NewRpgTriggers.h b/src/strategy/rpg/NewRpgTriggers.h similarity index 100% rename from src/strategy/triggers/NewRpgTriggers.h rename to src/strategy/rpg/NewRpgTriggers.h