diff --git a/src/strategy/classes/deathknight/BloodDKStrategy.cpp b/src/strategy/deathknight/BloodDKStrategy.cpp
similarity index 100%
rename from src/strategy/classes/deathknight/BloodDKStrategy.cpp
rename to src/strategy/deathknight/BloodDKStrategy.cpp
diff --git a/src/strategy/classes/deathknight/BloodDKStrategy.h b/src/strategy/deathknight/BloodDKStrategy.h
similarity index 100%
rename from src/strategy/classes/deathknight/BloodDKStrategy.h
rename to src/strategy/deathknight/BloodDKStrategy.h
diff --git a/src/strategy/classes/deathknight/DKActions.cpp b/src/strategy/deathknight/DKActions.cpp
similarity index 100%
rename from src/strategy/classes/deathknight/DKActions.cpp
rename to src/strategy/deathknight/DKActions.cpp
diff --git a/src/strategy/classes/deathknight/DKActions.h b/src/strategy/deathknight/DKActions.h
similarity index 100%
rename from src/strategy/classes/deathknight/DKActions.h
rename to src/strategy/deathknight/DKActions.h
diff --git a/src/strategy/classes/deathknight/DKAiObjectContext.cpp b/src/strategy/deathknight/DKAiObjectContext.cpp
similarity index 100%
rename from src/strategy/classes/deathknight/DKAiObjectContext.cpp
rename to src/strategy/deathknight/DKAiObjectContext.cpp
diff --git a/src/strategy/classes/deathknight/DKAiObjectContext.h b/src/strategy/deathknight/DKAiObjectContext.h
similarity index 100%
rename from src/strategy/classes/deathknight/DKAiObjectContext.h
rename to src/strategy/deathknight/DKAiObjectContext.h
diff --git a/src/strategy/classes/deathknight/DKTriggers.cpp b/src/strategy/deathknight/DKTriggers.cpp
similarity index 100%
rename from src/strategy/classes/deathknight/DKTriggers.cpp
rename to src/strategy/deathknight/DKTriggers.cpp
diff --git a/src/strategy/classes/deathknight/DKTriggers.h b/src/strategy/deathknight/DKTriggers.h
similarity index 100%
rename from src/strategy/classes/deathknight/DKTriggers.h
rename to src/strategy/deathknight/DKTriggers.h
diff --git a/src/strategy/classes/deathknight/FrostDKStrategy.cpp b/src/strategy/deathknight/FrostDKStrategy.cpp
similarity index 100%
rename from src/strategy/classes/deathknight/FrostDKStrategy.cpp
rename to src/strategy/deathknight/FrostDKStrategy.cpp
diff --git a/src/strategy/classes/deathknight/FrostDKStrategy.h b/src/strategy/deathknight/FrostDKStrategy.h
similarity index 100%
rename from src/strategy/classes/deathknight/FrostDKStrategy.h
rename to src/strategy/deathknight/FrostDKStrategy.h
diff --git a/src/strategy/classes/deathknight/GenericDKNonCombatStrategy.cpp b/src/strategy/deathknight/GenericDKNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/classes/deathknight/GenericDKNonCombatStrategy.cpp
rename to src/strategy/deathknight/GenericDKNonCombatStrategy.cpp
diff --git a/src/strategy/classes/deathknight/GenericDKNonCombatStrategy.h b/src/strategy/deathknight/GenericDKNonCombatStrategy.h
similarity index 100%
rename from src/strategy/classes/deathknight/GenericDKNonCombatStrategy.h
rename to src/strategy/deathknight/GenericDKNonCombatStrategy.h
diff --git a/src/strategy/classes/deathknight/GenericDKStrategy.cpp b/src/strategy/deathknight/GenericDKStrategy.cpp
similarity index 100%
rename from src/strategy/classes/deathknight/GenericDKStrategy.cpp
rename to src/strategy/deathknight/GenericDKStrategy.cpp
diff --git a/src/strategy/classes/deathknight/GenericDKStrategy.h b/src/strategy/deathknight/GenericDKStrategy.h
similarity index 100%
rename from src/strategy/classes/deathknight/GenericDKStrategy.h
rename to src/strategy/deathknight/GenericDKStrategy.h
diff --git a/src/strategy/classes/deathknight/UnholyDKStrategy.cpp b/src/strategy/deathknight/UnholyDKStrategy.cpp
similarity index 100%
rename from src/strategy/classes/deathknight/UnholyDKStrategy.cpp
rename to src/strategy/deathknight/UnholyDKStrategy.cpp
diff --git a/src/strategy/classes/deathknight/UnholyDKStrategy.h b/src/strategy/deathknight/UnholyDKStrategy.h
similarity index 100%
rename from src/strategy/classes/deathknight/UnholyDKStrategy.h
rename to src/strategy/deathknight/UnholyDKStrategy.h
diff --git a/src/strategy/classes/druid/BearTankDruidStrategy.cpp b/src/strategy/druid/BearTankDruidStrategy.cpp
similarity index 100%
rename from src/strategy/classes/druid/BearTankDruidStrategy.cpp
rename to src/strategy/druid/BearTankDruidStrategy.cpp
diff --git a/src/strategy/classes/druid/BearTankDruidStrategy.h b/src/strategy/druid/BearTankDruidStrategy.h
similarity index 100%
rename from src/strategy/classes/druid/BearTankDruidStrategy.h
rename to src/strategy/druid/BearTankDruidStrategy.h
diff --git a/src/strategy/classes/druid/CasterDruidStrategy.cpp b/src/strategy/druid/CasterDruidStrategy.cpp
similarity index 100%
rename from src/strategy/classes/druid/CasterDruidStrategy.cpp
rename to src/strategy/druid/CasterDruidStrategy.cpp
diff --git a/src/strategy/classes/druid/CasterDruidStrategy.h b/src/strategy/druid/CasterDruidStrategy.h
similarity index 100%
rename from src/strategy/classes/druid/CasterDruidStrategy.h
rename to src/strategy/druid/CasterDruidStrategy.h
diff --git a/src/strategy/classes/druid/CatDpsDruidStrategy.cpp b/src/strategy/druid/CatDpsDruidStrategy.cpp
similarity index 100%
rename from src/strategy/classes/druid/CatDpsDruidStrategy.cpp
rename to src/strategy/druid/CatDpsDruidStrategy.cpp
diff --git a/src/strategy/classes/druid/CatDpsDruidStrategy.h b/src/strategy/druid/CatDpsDruidStrategy.h
similarity index 100%
rename from src/strategy/classes/druid/CatDpsDruidStrategy.h
rename to src/strategy/druid/CatDpsDruidStrategy.h
diff --git a/src/strategy/classes/druid/DruidActions.cpp b/src/strategy/druid/DruidActions.cpp
similarity index 100%
rename from src/strategy/classes/druid/DruidActions.cpp
rename to src/strategy/druid/DruidActions.cpp
diff --git a/src/strategy/classes/druid/DruidActions.h b/src/strategy/druid/DruidActions.h
similarity index 100%
rename from src/strategy/classes/druid/DruidActions.h
rename to src/strategy/druid/DruidActions.h
diff --git a/src/strategy/classes/druid/DruidAiObjectContext.cpp b/src/strategy/druid/DruidAiObjectContext.cpp
similarity index 100%
rename from src/strategy/classes/druid/DruidAiObjectContext.cpp
rename to src/strategy/druid/DruidAiObjectContext.cpp
diff --git a/src/strategy/classes/druid/DruidAiObjectContext.h b/src/strategy/druid/DruidAiObjectContext.h
similarity index 100%
rename from src/strategy/classes/druid/DruidAiObjectContext.h
rename to src/strategy/druid/DruidAiObjectContext.h
diff --git a/src/strategy/classes/druid/DruidBearActions.cpp b/src/strategy/druid/DruidBearActions.cpp
similarity index 100%
rename from src/strategy/classes/druid/DruidBearActions.cpp
rename to src/strategy/druid/DruidBearActions.cpp
diff --git a/src/strategy/classes/druid/DruidBearActions.h b/src/strategy/druid/DruidBearActions.h
similarity index 100%
rename from src/strategy/classes/druid/DruidBearActions.h
rename to src/strategy/druid/DruidBearActions.h
diff --git a/src/strategy/classes/druid/DruidCatActions.cpp b/src/strategy/druid/DruidCatActions.cpp
similarity index 100%
rename from src/strategy/classes/druid/DruidCatActions.cpp
rename to src/strategy/druid/DruidCatActions.cpp
diff --git a/src/strategy/classes/druid/DruidCatActions.h b/src/strategy/druid/DruidCatActions.h
similarity index 100%
rename from src/strategy/classes/druid/DruidCatActions.h
rename to src/strategy/druid/DruidCatActions.h
diff --git a/src/strategy/classes/druid/DruidShapeshiftActions.cpp b/src/strategy/druid/DruidShapeshiftActions.cpp
similarity index 100%
rename from src/strategy/classes/druid/DruidShapeshiftActions.cpp
rename to src/strategy/druid/DruidShapeshiftActions.cpp
diff --git a/src/strategy/classes/druid/DruidShapeshiftActions.h b/src/strategy/druid/DruidShapeshiftActions.h
similarity index 100%
rename from src/strategy/classes/druid/DruidShapeshiftActions.h
rename to src/strategy/druid/DruidShapeshiftActions.h
diff --git a/src/strategy/classes/druid/DruidTriggers.cpp b/src/strategy/druid/DruidTriggers.cpp
similarity index 100%
rename from src/strategy/classes/druid/DruidTriggers.cpp
rename to src/strategy/druid/DruidTriggers.cpp
diff --git a/src/strategy/classes/druid/DruidTriggers.h b/src/strategy/druid/DruidTriggers.h
similarity index 100%
rename from src/strategy/classes/druid/DruidTriggers.h
rename to src/strategy/druid/DruidTriggers.h
diff --git a/src/strategy/classes/druid/FeralDruidStrategy.cpp b/src/strategy/druid/FeralDruidStrategy.cpp
similarity index 100%
rename from src/strategy/classes/druid/FeralDruidStrategy.cpp
rename to src/strategy/druid/FeralDruidStrategy.cpp
diff --git a/src/strategy/classes/druid/FeralDruidStrategy.h b/src/strategy/druid/FeralDruidStrategy.h
similarity index 100%
rename from src/strategy/classes/druid/FeralDruidStrategy.h
rename to src/strategy/druid/FeralDruidStrategy.h
diff --git a/src/strategy/classes/druid/GenericDruidNonCombatStrategy.cpp b/src/strategy/druid/GenericDruidNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/classes/druid/GenericDruidNonCombatStrategy.cpp
rename to src/strategy/druid/GenericDruidNonCombatStrategy.cpp
diff --git a/src/strategy/classes/druid/GenericDruidNonCombatStrategy.h b/src/strategy/druid/GenericDruidNonCombatStrategy.h
similarity index 100%
rename from src/strategy/classes/druid/GenericDruidNonCombatStrategy.h
rename to src/strategy/druid/GenericDruidNonCombatStrategy.h
diff --git a/src/strategy/classes/druid/GenericDruidStrategy.cpp b/src/strategy/druid/GenericDruidStrategy.cpp
similarity index 100%
rename from src/strategy/classes/druid/GenericDruidStrategy.cpp
rename to src/strategy/druid/GenericDruidStrategy.cpp
diff --git a/src/strategy/classes/druid/GenericDruidStrategy.h b/src/strategy/druid/GenericDruidStrategy.h
similarity index 100%
rename from src/strategy/classes/druid/GenericDruidStrategy.h
rename to src/strategy/druid/GenericDruidStrategy.h
diff --git a/src/strategy/classes/druid/HealDruidStrategy.cpp b/src/strategy/druid/HealDruidStrategy.cpp
similarity index 100%
rename from src/strategy/classes/druid/HealDruidStrategy.cpp
rename to src/strategy/druid/HealDruidStrategy.cpp
diff --git a/src/strategy/classes/druid/HealDruidStrategy.h b/src/strategy/druid/HealDruidStrategy.h
similarity index 100%
rename from src/strategy/classes/druid/HealDruidStrategy.h
rename to src/strategy/druid/HealDruidStrategy.h
diff --git a/src/strategy/classes/druid/MeleeDruidStrategy.cpp b/src/strategy/druid/MeleeDruidStrategy.cpp
similarity index 100%
rename from src/strategy/classes/druid/MeleeDruidStrategy.cpp
rename to src/strategy/druid/MeleeDruidStrategy.cpp
diff --git a/src/strategy/classes/druid/MeleeDruidStrategy.h b/src/strategy/druid/MeleeDruidStrategy.h
similarity index 100%
rename from src/strategy/classes/druid/MeleeDruidStrategy.h
rename to src/strategy/druid/MeleeDruidStrategy.h
diff --git a/src/strategy/classes/hunter/DpsHunterStrategy.cpp b/src/strategy/hunter/DpsHunterStrategy.cpp
similarity index 100%
rename from src/strategy/classes/hunter/DpsHunterStrategy.cpp
rename to src/strategy/hunter/DpsHunterStrategy.cpp
diff --git a/src/strategy/classes/hunter/DpsHunterStrategy.h b/src/strategy/hunter/DpsHunterStrategy.h
similarity index 100%
rename from src/strategy/classes/hunter/DpsHunterStrategy.h
rename to src/strategy/hunter/DpsHunterStrategy.h
diff --git a/src/strategy/classes/hunter/GenericHunterNonCombatStrategy.cpp b/src/strategy/hunter/GenericHunterNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/classes/hunter/GenericHunterNonCombatStrategy.cpp
rename to src/strategy/hunter/GenericHunterNonCombatStrategy.cpp
diff --git a/src/strategy/classes/hunter/GenericHunterNonCombatStrategy.h b/src/strategy/hunter/GenericHunterNonCombatStrategy.h
similarity index 100%
rename from src/strategy/classes/hunter/GenericHunterNonCombatStrategy.h
rename to src/strategy/hunter/GenericHunterNonCombatStrategy.h
diff --git a/src/strategy/classes/hunter/GenericHunterStrategy.cpp b/src/strategy/hunter/GenericHunterStrategy.cpp
similarity index 100%
rename from src/strategy/classes/hunter/GenericHunterStrategy.cpp
rename to src/strategy/hunter/GenericHunterStrategy.cpp
diff --git a/src/strategy/classes/hunter/GenericHunterStrategy.h b/src/strategy/hunter/GenericHunterStrategy.h
similarity index 100%
rename from src/strategy/classes/hunter/GenericHunterStrategy.h
rename to src/strategy/hunter/GenericHunterStrategy.h
diff --git a/src/strategy/classes/hunter/HunterActions.cpp b/src/strategy/hunter/HunterActions.cpp
similarity index 100%
rename from src/strategy/classes/hunter/HunterActions.cpp
rename to src/strategy/hunter/HunterActions.cpp
diff --git a/src/strategy/classes/hunter/HunterActions.h b/src/strategy/hunter/HunterActions.h
similarity index 100%
rename from src/strategy/classes/hunter/HunterActions.h
rename to src/strategy/hunter/HunterActions.h
diff --git a/src/strategy/classes/hunter/HunterAiObjectContext.cpp b/src/strategy/hunter/HunterAiObjectContext.cpp
similarity index 100%
rename from src/strategy/classes/hunter/HunterAiObjectContext.cpp
rename to src/strategy/hunter/HunterAiObjectContext.cpp
diff --git a/src/strategy/classes/hunter/HunterAiObjectContext.h b/src/strategy/hunter/HunterAiObjectContext.h
similarity index 100%
rename from src/strategy/classes/hunter/HunterAiObjectContext.h
rename to src/strategy/hunter/HunterAiObjectContext.h
diff --git a/src/strategy/classes/hunter/HunterBuffStrategies.cpp b/src/strategy/hunter/HunterBuffStrategies.cpp
similarity index 100%
rename from src/strategy/classes/hunter/HunterBuffStrategies.cpp
rename to src/strategy/hunter/HunterBuffStrategies.cpp
diff --git a/src/strategy/classes/hunter/HunterBuffStrategies.h b/src/strategy/hunter/HunterBuffStrategies.h
similarity index 100%
rename from src/strategy/classes/hunter/HunterBuffStrategies.h
rename to src/strategy/hunter/HunterBuffStrategies.h
diff --git a/src/strategy/classes/hunter/HunterTriggers.cpp b/src/strategy/hunter/HunterTriggers.cpp
similarity index 100%
rename from src/strategy/classes/hunter/HunterTriggers.cpp
rename to src/strategy/hunter/HunterTriggers.cpp
diff --git a/src/strategy/classes/hunter/HunterTriggers.h b/src/strategy/hunter/HunterTriggers.h
similarity index 100%
rename from src/strategy/classes/hunter/HunterTriggers.h
rename to src/strategy/hunter/HunterTriggers.h
diff --git a/src/strategy/classes/mage/ArcaneMageStrategy.cpp b/src/strategy/mage/ArcaneMageStrategy.cpp
similarity index 100%
rename from src/strategy/classes/mage/ArcaneMageStrategy.cpp
rename to src/strategy/mage/ArcaneMageStrategy.cpp
diff --git a/src/strategy/classes/mage/ArcaneMageStrategy.h b/src/strategy/mage/ArcaneMageStrategy.h
similarity index 100%
rename from src/strategy/classes/mage/ArcaneMageStrategy.h
rename to src/strategy/mage/ArcaneMageStrategy.h
diff --git a/src/strategy/classes/mage/FireMageStrategy.cpp b/src/strategy/mage/FireMageStrategy.cpp
similarity index 100%
rename from src/strategy/classes/mage/FireMageStrategy.cpp
rename to src/strategy/mage/FireMageStrategy.cpp
diff --git a/src/strategy/classes/mage/FireMageStrategy.h b/src/strategy/mage/FireMageStrategy.h
similarity index 100%
rename from src/strategy/classes/mage/FireMageStrategy.h
rename to src/strategy/mage/FireMageStrategy.h
diff --git a/src/strategy/classes/mage/FrostMageStrategy.cpp b/src/strategy/mage/FrostMageStrategy.cpp
similarity index 99%
rename from src/strategy/classes/mage/FrostMageStrategy.cpp
rename to src/strategy/mage/FrostMageStrategy.cpp
index c9b8ee9e..6dd46152 100644
--- a/src/strategy/classes/mage/FrostMageStrategy.cpp
+++ b/src/strategy/mage/FrostMageStrategy.cpp
@@ -60,8 +60,8 @@ FrostMageStrategy::FrostMageStrategy(PlayerbotAI* botAI) : GenericMageStrategy(b
 NextAction** FrostMageStrategy::getDefaultActions()
 {
     return NextAction::array(0, new NextAction("frostbolt", ACTION_DEFAULT + 0.2f),
-                             new NextAction("fireball", ACTION_DEFAULT + 0.1f),
-                             new NextAction("shoot", ACTION_DEFAULT), nullptr);
+                             new NextAction("shoot", ACTION_DEFAULT + 0.1f),
+                             new NextAction("fireball", ACTION_DEFAULT), nullptr);
 }
 
 void FrostMageStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
diff --git a/src/strategy/classes/mage/FrostMageStrategy.h b/src/strategy/mage/FrostMageStrategy.h
similarity index 100%
rename from src/strategy/classes/mage/FrostMageStrategy.h
rename to src/strategy/mage/FrostMageStrategy.h
diff --git a/src/strategy/classes/mage/GenericMageNonCombatStrategy.cpp b/src/strategy/mage/GenericMageNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/classes/mage/GenericMageNonCombatStrategy.cpp
rename to src/strategy/mage/GenericMageNonCombatStrategy.cpp
diff --git a/src/strategy/classes/mage/GenericMageNonCombatStrategy.h b/src/strategy/mage/GenericMageNonCombatStrategy.h
similarity index 100%
rename from src/strategy/classes/mage/GenericMageNonCombatStrategy.h
rename to src/strategy/mage/GenericMageNonCombatStrategy.h
diff --git a/src/strategy/classes/mage/GenericMageStrategy.cpp b/src/strategy/mage/GenericMageStrategy.cpp
similarity index 100%
rename from src/strategy/classes/mage/GenericMageStrategy.cpp
rename to src/strategy/mage/GenericMageStrategy.cpp
diff --git a/src/strategy/classes/mage/GenericMageStrategy.h b/src/strategy/mage/GenericMageStrategy.h
similarity index 100%
rename from src/strategy/classes/mage/GenericMageStrategy.h
rename to src/strategy/mage/GenericMageStrategy.h
diff --git a/src/strategy/classes/mage/MageActions.cpp b/src/strategy/mage/MageActions.cpp
similarity index 100%
rename from src/strategy/classes/mage/MageActions.cpp
rename to src/strategy/mage/MageActions.cpp
diff --git a/src/strategy/classes/mage/MageActions.h b/src/strategy/mage/MageActions.h
similarity index 100%
rename from src/strategy/classes/mage/MageActions.h
rename to src/strategy/mage/MageActions.h
diff --git a/src/strategy/classes/mage/MageAiObjectContext.cpp b/src/strategy/mage/MageAiObjectContext.cpp
similarity index 100%
rename from src/strategy/classes/mage/MageAiObjectContext.cpp
rename to src/strategy/mage/MageAiObjectContext.cpp
diff --git a/src/strategy/classes/mage/MageAiObjectContext.h b/src/strategy/mage/MageAiObjectContext.h
similarity index 100%
rename from src/strategy/classes/mage/MageAiObjectContext.h
rename to src/strategy/mage/MageAiObjectContext.h
diff --git a/src/strategy/classes/mage/MageTriggers.cpp b/src/strategy/mage/MageTriggers.cpp
similarity index 100%
rename from src/strategy/classes/mage/MageTriggers.cpp
rename to src/strategy/mage/MageTriggers.cpp
diff --git a/src/strategy/classes/mage/MageTriggers.h b/src/strategy/mage/MageTriggers.h
similarity index 100%
rename from src/strategy/classes/mage/MageTriggers.h
rename to src/strategy/mage/MageTriggers.h
diff --git a/src/strategy/classes/paladin/DpsPaladinStrategy.cpp b/src/strategy/paladin/DpsPaladinStrategy.cpp
similarity index 100%
rename from src/strategy/classes/paladin/DpsPaladinStrategy.cpp
rename to src/strategy/paladin/DpsPaladinStrategy.cpp
diff --git a/src/strategy/classes/paladin/DpsPaladinStrategy.h b/src/strategy/paladin/DpsPaladinStrategy.h
similarity index 100%
rename from src/strategy/classes/paladin/DpsPaladinStrategy.h
rename to src/strategy/paladin/DpsPaladinStrategy.h
diff --git a/src/strategy/classes/paladin/GenericPaladinNonCombatStrategy.cpp b/src/strategy/paladin/GenericPaladinNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/classes/paladin/GenericPaladinNonCombatStrategy.cpp
rename to src/strategy/paladin/GenericPaladinNonCombatStrategy.cpp
diff --git a/src/strategy/classes/paladin/GenericPaladinNonCombatStrategy.h b/src/strategy/paladin/GenericPaladinNonCombatStrategy.h
similarity index 100%
rename from src/strategy/classes/paladin/GenericPaladinNonCombatStrategy.h
rename to src/strategy/paladin/GenericPaladinNonCombatStrategy.h
diff --git a/src/strategy/classes/paladin/GenericPaladinStrategy.cpp b/src/strategy/paladin/GenericPaladinStrategy.cpp
similarity index 100%
rename from src/strategy/classes/paladin/GenericPaladinStrategy.cpp
rename to src/strategy/paladin/GenericPaladinStrategy.cpp
diff --git a/src/strategy/classes/paladin/GenericPaladinStrategy.h b/src/strategy/paladin/GenericPaladinStrategy.h
similarity index 100%
rename from src/strategy/classes/paladin/GenericPaladinStrategy.h
rename to src/strategy/paladin/GenericPaladinStrategy.h
diff --git a/src/strategy/classes/paladin/GenericPaladinStrategyActionNodeFactory.h b/src/strategy/paladin/GenericPaladinStrategyActionNodeFactory.h
similarity index 100%
rename from src/strategy/classes/paladin/GenericPaladinStrategyActionNodeFactory.h
rename to src/strategy/paladin/GenericPaladinStrategyActionNodeFactory.h
diff --git a/src/strategy/classes/paladin/HealPaladinStrategy.cpp b/src/strategy/paladin/HealPaladinStrategy.cpp
similarity index 100%
rename from src/strategy/classes/paladin/HealPaladinStrategy.cpp
rename to src/strategy/paladin/HealPaladinStrategy.cpp
diff --git a/src/strategy/classes/paladin/HealPaladinStrategy.h b/src/strategy/paladin/HealPaladinStrategy.h
similarity index 100%
rename from src/strategy/classes/paladin/HealPaladinStrategy.h
rename to src/strategy/paladin/HealPaladinStrategy.h
diff --git a/src/strategy/classes/paladin/PaladinActions.cpp b/src/strategy/paladin/PaladinActions.cpp
similarity index 100%
rename from src/strategy/classes/paladin/PaladinActions.cpp
rename to src/strategy/paladin/PaladinActions.cpp
diff --git a/src/strategy/classes/paladin/PaladinActions.h b/src/strategy/paladin/PaladinActions.h
similarity index 100%
rename from src/strategy/classes/paladin/PaladinActions.h
rename to src/strategy/paladin/PaladinActions.h
diff --git a/src/strategy/classes/paladin/PaladinAiObjectContext.cpp b/src/strategy/paladin/PaladinAiObjectContext.cpp
similarity index 100%
rename from src/strategy/classes/paladin/PaladinAiObjectContext.cpp
rename to src/strategy/paladin/PaladinAiObjectContext.cpp
diff --git a/src/strategy/classes/paladin/PaladinAiObjectContext.h b/src/strategy/paladin/PaladinAiObjectContext.h
similarity index 100%
rename from src/strategy/classes/paladin/PaladinAiObjectContext.h
rename to src/strategy/paladin/PaladinAiObjectContext.h
diff --git a/src/strategy/classes/paladin/PaladinBuffStrategies.cpp b/src/strategy/paladin/PaladinBuffStrategies.cpp
similarity index 100%
rename from src/strategy/classes/paladin/PaladinBuffStrategies.cpp
rename to src/strategy/paladin/PaladinBuffStrategies.cpp
diff --git a/src/strategy/classes/paladin/PaladinBuffStrategies.h b/src/strategy/paladin/PaladinBuffStrategies.h
similarity index 100%
rename from src/strategy/classes/paladin/PaladinBuffStrategies.h
rename to src/strategy/paladin/PaladinBuffStrategies.h
diff --git a/src/strategy/classes/paladin/PaladinTriggers.cpp b/src/strategy/paladin/PaladinTriggers.cpp
similarity index 100%
rename from src/strategy/classes/paladin/PaladinTriggers.cpp
rename to src/strategy/paladin/PaladinTriggers.cpp
diff --git a/src/strategy/classes/paladin/PaladinTriggers.h b/src/strategy/paladin/PaladinTriggers.h
similarity index 100%
rename from src/strategy/classes/paladin/PaladinTriggers.h
rename to src/strategy/paladin/PaladinTriggers.h
diff --git a/src/strategy/classes/paladin/TankPaladinStrategy.cpp b/src/strategy/paladin/TankPaladinStrategy.cpp
similarity index 100%
rename from src/strategy/classes/paladin/TankPaladinStrategy.cpp
rename to src/strategy/paladin/TankPaladinStrategy.cpp
diff --git a/src/strategy/classes/paladin/TankPaladinStrategy.h b/src/strategy/paladin/TankPaladinStrategy.h
similarity index 100%
rename from src/strategy/classes/paladin/TankPaladinStrategy.h
rename to src/strategy/paladin/TankPaladinStrategy.h
diff --git a/src/strategy/classes/priest/GenericPriestStrategy.cpp b/src/strategy/priest/GenericPriestStrategy.cpp
similarity index 100%
rename from src/strategy/classes/priest/GenericPriestStrategy.cpp
rename to src/strategy/priest/GenericPriestStrategy.cpp
diff --git a/src/strategy/classes/priest/GenericPriestStrategy.h b/src/strategy/priest/GenericPriestStrategy.h
similarity index 100%
rename from src/strategy/classes/priest/GenericPriestStrategy.h
rename to src/strategy/priest/GenericPriestStrategy.h
diff --git a/src/strategy/classes/priest/GenericPriestStrategyActionNodeFactory.h b/src/strategy/priest/GenericPriestStrategyActionNodeFactory.h
similarity index 100%
rename from src/strategy/classes/priest/GenericPriestStrategyActionNodeFactory.h
rename to src/strategy/priest/GenericPriestStrategyActionNodeFactory.h
diff --git a/src/strategy/classes/priest/HealPriestStrategy.cpp b/src/strategy/priest/HealPriestStrategy.cpp
similarity index 100%
rename from src/strategy/classes/priest/HealPriestStrategy.cpp
rename to src/strategy/priest/HealPriestStrategy.cpp
diff --git a/src/strategy/classes/priest/HealPriestStrategy.h b/src/strategy/priest/HealPriestStrategy.h
similarity index 100%
rename from src/strategy/classes/priest/HealPriestStrategy.h
rename to src/strategy/priest/HealPriestStrategy.h
diff --git a/src/strategy/classes/priest/HolyPriestStrategy.cpp b/src/strategy/priest/HolyPriestStrategy.cpp
similarity index 100%
rename from src/strategy/classes/priest/HolyPriestStrategy.cpp
rename to src/strategy/priest/HolyPriestStrategy.cpp
diff --git a/src/strategy/classes/priest/HolyPriestStrategy.h b/src/strategy/priest/HolyPriestStrategy.h
similarity index 100%
rename from src/strategy/classes/priest/HolyPriestStrategy.h
rename to src/strategy/priest/HolyPriestStrategy.h
diff --git a/src/strategy/classes/priest/PriestActions.cpp b/src/strategy/priest/PriestActions.cpp
similarity index 100%
rename from src/strategy/classes/priest/PriestActions.cpp
rename to src/strategy/priest/PriestActions.cpp
diff --git a/src/strategy/classes/priest/PriestActions.h b/src/strategy/priest/PriestActions.h
similarity index 100%
rename from src/strategy/classes/priest/PriestActions.h
rename to src/strategy/priest/PriestActions.h
diff --git a/src/strategy/classes/priest/PriestAiObjectContext.cpp b/src/strategy/priest/PriestAiObjectContext.cpp
similarity index 100%
rename from src/strategy/classes/priest/PriestAiObjectContext.cpp
rename to src/strategy/priest/PriestAiObjectContext.cpp
diff --git a/src/strategy/classes/priest/PriestAiObjectContext.h b/src/strategy/priest/PriestAiObjectContext.h
similarity index 100%
rename from src/strategy/classes/priest/PriestAiObjectContext.h
rename to src/strategy/priest/PriestAiObjectContext.h
diff --git a/src/strategy/classes/priest/PriestNonCombatStrategy.cpp b/src/strategy/priest/PriestNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/classes/priest/PriestNonCombatStrategy.cpp
rename to src/strategy/priest/PriestNonCombatStrategy.cpp
diff --git a/src/strategy/classes/priest/PriestNonCombatStrategy.h b/src/strategy/priest/PriestNonCombatStrategy.h
similarity index 100%
rename from src/strategy/classes/priest/PriestNonCombatStrategy.h
rename to src/strategy/priest/PriestNonCombatStrategy.h
diff --git a/src/strategy/classes/priest/PriestNonCombatStrategyActionNodeFactory.h b/src/strategy/priest/PriestNonCombatStrategyActionNodeFactory.h
similarity index 100%
rename from src/strategy/classes/priest/PriestNonCombatStrategyActionNodeFactory.h
rename to src/strategy/priest/PriestNonCombatStrategyActionNodeFactory.h
diff --git a/src/strategy/classes/priest/PriestTriggers.cpp b/src/strategy/priest/PriestTriggers.cpp
similarity index 100%
rename from src/strategy/classes/priest/PriestTriggers.cpp
rename to src/strategy/priest/PriestTriggers.cpp
diff --git a/src/strategy/classes/priest/PriestTriggers.h b/src/strategy/priest/PriestTriggers.h
similarity index 100%
rename from src/strategy/classes/priest/PriestTriggers.h
rename to src/strategy/priest/PriestTriggers.h
diff --git a/src/strategy/classes/priest/ShadowPriestStrategy.cpp b/src/strategy/priest/ShadowPriestStrategy.cpp
similarity index 100%
rename from src/strategy/classes/priest/ShadowPriestStrategy.cpp
rename to src/strategy/priest/ShadowPriestStrategy.cpp
diff --git a/src/strategy/classes/priest/ShadowPriestStrategy.h b/src/strategy/priest/ShadowPriestStrategy.h
similarity index 100%
rename from src/strategy/classes/priest/ShadowPriestStrategy.h
rename to src/strategy/priest/ShadowPriestStrategy.h
diff --git a/src/strategy/classes/priest/ShadowPriestStrategyActionNodeFactory.h b/src/strategy/priest/ShadowPriestStrategyActionNodeFactory.h
similarity index 100%
rename from src/strategy/classes/priest/ShadowPriestStrategyActionNodeFactory.h
rename to src/strategy/priest/ShadowPriestStrategyActionNodeFactory.h
diff --git a/src/strategy/classes/rogue/AssassinationRogueStrategy.cpp b/src/strategy/rogue/AssassinationRogueStrategy.cpp
similarity index 100%
rename from src/strategy/classes/rogue/AssassinationRogueStrategy.cpp
rename to src/strategy/rogue/AssassinationRogueStrategy.cpp
diff --git a/src/strategy/classes/rogue/AssassinationRogueStrategy.h b/src/strategy/rogue/AssassinationRogueStrategy.h
similarity index 100%
rename from src/strategy/classes/rogue/AssassinationRogueStrategy.h
rename to src/strategy/rogue/AssassinationRogueStrategy.h
diff --git a/src/strategy/classes/rogue/DpsRogueStrategy.cpp b/src/strategy/rogue/DpsRogueStrategy.cpp
similarity index 100%
rename from src/strategy/classes/rogue/DpsRogueStrategy.cpp
rename to src/strategy/rogue/DpsRogueStrategy.cpp
diff --git a/src/strategy/classes/rogue/DpsRogueStrategy.h b/src/strategy/rogue/DpsRogueStrategy.h
similarity index 100%
rename from src/strategy/classes/rogue/DpsRogueStrategy.h
rename to src/strategy/rogue/DpsRogueStrategy.h
diff --git a/src/strategy/classes/rogue/GenericRogueNonCombatStrategy.cpp b/src/strategy/rogue/GenericRogueNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/classes/rogue/GenericRogueNonCombatStrategy.cpp
rename to src/strategy/rogue/GenericRogueNonCombatStrategy.cpp
diff --git a/src/strategy/classes/rogue/GenericRogueNonCombatStrategy.h b/src/strategy/rogue/GenericRogueNonCombatStrategy.h
similarity index 100%
rename from src/strategy/classes/rogue/GenericRogueNonCombatStrategy.h
rename to src/strategy/rogue/GenericRogueNonCombatStrategy.h
diff --git a/src/strategy/classes/rogue/RogueActions.cpp b/src/strategy/rogue/RogueActions.cpp
similarity index 100%
rename from src/strategy/classes/rogue/RogueActions.cpp
rename to src/strategy/rogue/RogueActions.cpp
diff --git a/src/strategy/classes/rogue/RogueActions.h b/src/strategy/rogue/RogueActions.h
similarity index 100%
rename from src/strategy/classes/rogue/RogueActions.h
rename to src/strategy/rogue/RogueActions.h
diff --git a/src/strategy/classes/rogue/RogueAiObjectContext.cpp b/src/strategy/rogue/RogueAiObjectContext.cpp
similarity index 100%
rename from src/strategy/classes/rogue/RogueAiObjectContext.cpp
rename to src/strategy/rogue/RogueAiObjectContext.cpp
diff --git a/src/strategy/classes/rogue/RogueAiObjectContext.h b/src/strategy/rogue/RogueAiObjectContext.h
similarity index 100%
rename from src/strategy/classes/rogue/RogueAiObjectContext.h
rename to src/strategy/rogue/RogueAiObjectContext.h
diff --git a/src/strategy/classes/rogue/RogueComboActions.cpp b/src/strategy/rogue/RogueComboActions.cpp
similarity index 100%
rename from src/strategy/classes/rogue/RogueComboActions.cpp
rename to src/strategy/rogue/RogueComboActions.cpp
diff --git a/src/strategy/classes/rogue/RogueComboActions.h b/src/strategy/rogue/RogueComboActions.h
similarity index 100%
rename from src/strategy/classes/rogue/RogueComboActions.h
rename to src/strategy/rogue/RogueComboActions.h
diff --git a/src/strategy/classes/rogue/RogueFinishingActions.h b/src/strategy/rogue/RogueFinishingActions.h
similarity index 100%
rename from src/strategy/classes/rogue/RogueFinishingActions.h
rename to src/strategy/rogue/RogueFinishingActions.h
diff --git a/src/strategy/classes/rogue/RogueOpeningActions.cpp b/src/strategy/rogue/RogueOpeningActions.cpp
similarity index 100%
rename from src/strategy/classes/rogue/RogueOpeningActions.cpp
rename to src/strategy/rogue/RogueOpeningActions.cpp
diff --git a/src/strategy/classes/rogue/RogueOpeningActions.h b/src/strategy/rogue/RogueOpeningActions.h
similarity index 100%
rename from src/strategy/classes/rogue/RogueOpeningActions.h
rename to src/strategy/rogue/RogueOpeningActions.h
diff --git a/src/strategy/classes/rogue/RogueTriggers.cpp b/src/strategy/rogue/RogueTriggers.cpp
similarity index 100%
rename from src/strategy/classes/rogue/RogueTriggers.cpp
rename to src/strategy/rogue/RogueTriggers.cpp
diff --git a/src/strategy/classes/rogue/RogueTriggers.h b/src/strategy/rogue/RogueTriggers.h
similarity index 100%
rename from src/strategy/classes/rogue/RogueTriggers.h
rename to src/strategy/rogue/RogueTriggers.h
diff --git a/src/strategy/rpg/NewRpgAction.cpp b/src/strategy/rpg/NewRpgAction.cpp
index 2dbd139b..7fd6931f 100644
--- a/src/strategy/rpg/NewRpgAction.cpp
+++ b/src/strategy/rpg/NewRpgAction.cpp
@@ -165,7 +165,7 @@ WorldPosition NewRpgStatusUpdateAction::SelectRandomGrindPos()
             hi_prepared_locs.push_back(loc);
         }
 
-        if (bot->GetExactDist(loc) < 1500.0f)
+        if (bot->GetExactDist(loc) < 2500.0f)
         {
             lo_prepared_locs.push_back(loc);
         }
@@ -221,7 +221,7 @@ bool NewRpgGoFarAwayPosAction::MoveFarTo(WorldPosition dest)
     float dis = bot->GetExactDist(dest);
     if (dis < pathFinderDis)
     {
-        return MoveTo(dest.getMapId(), dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ());
+        return MoveTo(dest.getMapId(), dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ(), false, false, false, true);
     }
 
     // performance optimization
@@ -249,12 +249,14 @@ bool NewRpgGoFarAwayPosAction::MoveFarTo(WorldPosition dest)
         bot->UpdateAllowedPositionZ(dx, dy, dz);
         PathGenerator path(bot);
         path.CalculatePath(dx, dy, dz);
-        bool canReach = path.GetPathType() & PATHFIND_NORMAL;
+        PathType type = path.GetPathType();
+        
+        bool canReach = type == PATHFIND_INCOMPLETE || type == PATHFIND_NORMAL;
 
         if (canReach && fabs(delta) <= minDelta)
         {
             found = true;
-            G3D::Vector3 endPos = path.GetPath().back();
+            const G3D::Vector3 &endPos = path.GetActualEndPosition();
             rx = endPos.x;
             ry = endPos.y;
             rz = endPos.z;
@@ -265,7 +267,7 @@ bool NewRpgGoFarAwayPosAction::MoveFarTo(WorldPosition dest)
     {
         return MoveTo(bot->GetMapId(), rx, ry, rz, false, false, false, true);
     }
-    // fallback to direct move
+    // don't fallback to direct move
     // float angle = bot->GetAngle(&dest);
     // return MoveTo(bot->GetMapId(), x + cos(angle) * pathFinderDis, y + sin(angle) * pathFinderDis, z);
     return false;
diff --git a/src/strategy/rpg/NewRpgAction.h b/src/strategy/rpg/NewRpgAction.h
index c95685c8..fb293b8e 100644
--- a/src/strategy/rpg/NewRpgAction.h
+++ b/src/strategy/rpg/NewRpgAction.h
@@ -23,8 +23,8 @@ public:
 protected:
     // const int32 setGrindInterval = 5 * 60 * 1000;
     // const int32 setNpcInterval = 1 * 60 * 1000;
-    const int32 statusNearNpcDuration = 5 * 60 * 1000;
-    const int32 statusNearRandomDuration = 3 * 60 * 1000;
+    const int32 statusNearNpcDuration = 2 * 60 * 1000;
+    const int32 statusNearRandomDuration = 2 * 60 * 1000;
     const int32 statusRestDuration = 30 * 1000;
     WorldPosition SelectRandomGrindPos();
     WorldPosition SelectRandomInnKeeperPos();
diff --git a/src/strategy/classes/shaman/CasterShamanStrategy.cpp b/src/strategy/shaman/CasterShamanStrategy.cpp
similarity index 100%
rename from src/strategy/classes/shaman/CasterShamanStrategy.cpp
rename to src/strategy/shaman/CasterShamanStrategy.cpp
diff --git a/src/strategy/classes/shaman/CasterShamanStrategy.h b/src/strategy/shaman/CasterShamanStrategy.h
similarity index 100%
rename from src/strategy/classes/shaman/CasterShamanStrategy.h
rename to src/strategy/shaman/CasterShamanStrategy.h
diff --git a/src/strategy/classes/shaman/GenericShamanStrategy.cpp b/src/strategy/shaman/GenericShamanStrategy.cpp
similarity index 100%
rename from src/strategy/classes/shaman/GenericShamanStrategy.cpp
rename to src/strategy/shaman/GenericShamanStrategy.cpp
diff --git a/src/strategy/classes/shaman/GenericShamanStrategy.h b/src/strategy/shaman/GenericShamanStrategy.h
similarity index 100%
rename from src/strategy/classes/shaman/GenericShamanStrategy.h
rename to src/strategy/shaman/GenericShamanStrategy.h
diff --git a/src/strategy/classes/shaman/HealShamanStrategy.cpp b/src/strategy/shaman/HealShamanStrategy.cpp
similarity index 100%
rename from src/strategy/classes/shaman/HealShamanStrategy.cpp
rename to src/strategy/shaman/HealShamanStrategy.cpp
diff --git a/src/strategy/classes/shaman/HealShamanStrategy.h b/src/strategy/shaman/HealShamanStrategy.h
similarity index 100%
rename from src/strategy/classes/shaman/HealShamanStrategy.h
rename to src/strategy/shaman/HealShamanStrategy.h
diff --git a/src/strategy/classes/shaman/MeleeShamanStrategy.cpp b/src/strategy/shaman/MeleeShamanStrategy.cpp
similarity index 100%
rename from src/strategy/classes/shaman/MeleeShamanStrategy.cpp
rename to src/strategy/shaman/MeleeShamanStrategy.cpp
diff --git a/src/strategy/classes/shaman/MeleeShamanStrategy.h b/src/strategy/shaman/MeleeShamanStrategy.h
similarity index 100%
rename from src/strategy/classes/shaman/MeleeShamanStrategy.h
rename to src/strategy/shaman/MeleeShamanStrategy.h
diff --git a/src/strategy/classes/shaman/ShamanActions.cpp b/src/strategy/shaman/ShamanActions.cpp
similarity index 100%
rename from src/strategy/classes/shaman/ShamanActions.cpp
rename to src/strategy/shaman/ShamanActions.cpp
diff --git a/src/strategy/classes/shaman/ShamanActions.h b/src/strategy/shaman/ShamanActions.h
similarity index 100%
rename from src/strategy/classes/shaman/ShamanActions.h
rename to src/strategy/shaman/ShamanActions.h
diff --git a/src/strategy/classes/shaman/ShamanAiObjectContext.cpp b/src/strategy/shaman/ShamanAiObjectContext.cpp
similarity index 100%
rename from src/strategy/classes/shaman/ShamanAiObjectContext.cpp
rename to src/strategy/shaman/ShamanAiObjectContext.cpp
diff --git a/src/strategy/classes/shaman/ShamanAiObjectContext.h b/src/strategy/shaman/ShamanAiObjectContext.h
similarity index 100%
rename from src/strategy/classes/shaman/ShamanAiObjectContext.h
rename to src/strategy/shaman/ShamanAiObjectContext.h
diff --git a/src/strategy/classes/shaman/ShamanNonCombatStrategy.cpp b/src/strategy/shaman/ShamanNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/classes/shaman/ShamanNonCombatStrategy.cpp
rename to src/strategy/shaman/ShamanNonCombatStrategy.cpp
diff --git a/src/strategy/classes/shaman/ShamanNonCombatStrategy.h b/src/strategy/shaman/ShamanNonCombatStrategy.h
similarity index 100%
rename from src/strategy/classes/shaman/ShamanNonCombatStrategy.h
rename to src/strategy/shaman/ShamanNonCombatStrategy.h
diff --git a/src/strategy/classes/shaman/ShamanTriggers.cpp b/src/strategy/shaman/ShamanTriggers.cpp
similarity index 100%
rename from src/strategy/classes/shaman/ShamanTriggers.cpp
rename to src/strategy/shaman/ShamanTriggers.cpp
diff --git a/src/strategy/classes/shaman/ShamanTriggers.h b/src/strategy/shaman/ShamanTriggers.h
similarity index 100%
rename from src/strategy/classes/shaman/ShamanTriggers.h
rename to src/strategy/shaman/ShamanTriggers.h
diff --git a/src/strategy/classes/shaman/TotemsShamanStrategy.cpp b/src/strategy/shaman/TotemsShamanStrategy.cpp
similarity index 100%
rename from src/strategy/classes/shaman/TotemsShamanStrategy.cpp
rename to src/strategy/shaman/TotemsShamanStrategy.cpp
diff --git a/src/strategy/classes/shaman/TotemsShamanStrategy.h b/src/strategy/shaman/TotemsShamanStrategy.h
similarity index 100%
rename from src/strategy/classes/shaman/TotemsShamanStrategy.h
rename to src/strategy/shaman/TotemsShamanStrategy.h
diff --git a/src/strategy/classes/warlock/DpsWarlockStrategy.cpp b/src/strategy/warlock/DpsWarlockStrategy.cpp
similarity index 100%
rename from src/strategy/classes/warlock/DpsWarlockStrategy.cpp
rename to src/strategy/warlock/DpsWarlockStrategy.cpp
diff --git a/src/strategy/classes/warlock/DpsWarlockStrategy.h b/src/strategy/warlock/DpsWarlockStrategy.h
similarity index 100%
rename from src/strategy/classes/warlock/DpsWarlockStrategy.h
rename to src/strategy/warlock/DpsWarlockStrategy.h
diff --git a/src/strategy/classes/warlock/GenericWarlockNonCombatStrategy.cpp b/src/strategy/warlock/GenericWarlockNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/classes/warlock/GenericWarlockNonCombatStrategy.cpp
rename to src/strategy/warlock/GenericWarlockNonCombatStrategy.cpp
diff --git a/src/strategy/classes/warlock/GenericWarlockNonCombatStrategy.h b/src/strategy/warlock/GenericWarlockNonCombatStrategy.h
similarity index 100%
rename from src/strategy/classes/warlock/GenericWarlockNonCombatStrategy.h
rename to src/strategy/warlock/GenericWarlockNonCombatStrategy.h
diff --git a/src/strategy/classes/warlock/GenericWarlockStrategy.cpp b/src/strategy/warlock/GenericWarlockStrategy.cpp
similarity index 100%
rename from src/strategy/classes/warlock/GenericWarlockStrategy.cpp
rename to src/strategy/warlock/GenericWarlockStrategy.cpp
diff --git a/src/strategy/classes/warlock/GenericWarlockStrategy.h b/src/strategy/warlock/GenericWarlockStrategy.h
similarity index 100%
rename from src/strategy/classes/warlock/GenericWarlockStrategy.h
rename to src/strategy/warlock/GenericWarlockStrategy.h
diff --git a/src/strategy/classes/warlock/TankWarlockStrategy.cpp b/src/strategy/warlock/TankWarlockStrategy.cpp
similarity index 100%
rename from src/strategy/classes/warlock/TankWarlockStrategy.cpp
rename to src/strategy/warlock/TankWarlockStrategy.cpp
diff --git a/src/strategy/classes/warlock/TankWarlockStrategy.h b/src/strategy/warlock/TankWarlockStrategy.h
similarity index 100%
rename from src/strategy/classes/warlock/TankWarlockStrategy.h
rename to src/strategy/warlock/TankWarlockStrategy.h
diff --git a/src/strategy/classes/warlock/WarlockActions.cpp b/src/strategy/warlock/WarlockActions.cpp
similarity index 100%
rename from src/strategy/classes/warlock/WarlockActions.cpp
rename to src/strategy/warlock/WarlockActions.cpp
diff --git a/src/strategy/classes/warlock/WarlockActions.h b/src/strategy/warlock/WarlockActions.h
similarity index 100%
rename from src/strategy/classes/warlock/WarlockActions.h
rename to src/strategy/warlock/WarlockActions.h
diff --git a/src/strategy/classes/warlock/WarlockAiObjectContext.cpp b/src/strategy/warlock/WarlockAiObjectContext.cpp
similarity index 100%
rename from src/strategy/classes/warlock/WarlockAiObjectContext.cpp
rename to src/strategy/warlock/WarlockAiObjectContext.cpp
diff --git a/src/strategy/classes/warlock/WarlockAiObjectContext.h b/src/strategy/warlock/WarlockAiObjectContext.h
similarity index 100%
rename from src/strategy/classes/warlock/WarlockAiObjectContext.h
rename to src/strategy/warlock/WarlockAiObjectContext.h
diff --git a/src/strategy/classes/warlock/WarlockTriggers.cpp b/src/strategy/warlock/WarlockTriggers.cpp
similarity index 100%
rename from src/strategy/classes/warlock/WarlockTriggers.cpp
rename to src/strategy/warlock/WarlockTriggers.cpp
diff --git a/src/strategy/classes/warlock/WarlockTriggers.h b/src/strategy/warlock/WarlockTriggers.h
similarity index 100%
rename from src/strategy/classes/warlock/WarlockTriggers.h
rename to src/strategy/warlock/WarlockTriggers.h
diff --git a/src/strategy/classes/warrior/ArmsWarriorStrategy.cpp b/src/strategy/warrior/ArmsWarriorStrategy.cpp
similarity index 100%
rename from src/strategy/classes/warrior/ArmsWarriorStrategy.cpp
rename to src/strategy/warrior/ArmsWarriorStrategy.cpp
diff --git a/src/strategy/classes/warrior/ArmsWarriorStrategy.h b/src/strategy/warrior/ArmsWarriorStrategy.h
similarity index 100%
rename from src/strategy/classes/warrior/ArmsWarriorStrategy.h
rename to src/strategy/warrior/ArmsWarriorStrategy.h
diff --git a/src/strategy/classes/warrior/FuryWarriorStrategy.cpp b/src/strategy/warrior/FuryWarriorStrategy.cpp
similarity index 100%
rename from src/strategy/classes/warrior/FuryWarriorStrategy.cpp
rename to src/strategy/warrior/FuryWarriorStrategy.cpp
diff --git a/src/strategy/classes/warrior/FuryWarriorStrategy.h b/src/strategy/warrior/FuryWarriorStrategy.h
similarity index 100%
rename from src/strategy/classes/warrior/FuryWarriorStrategy.h
rename to src/strategy/warrior/FuryWarriorStrategy.h
diff --git a/src/strategy/classes/warrior/GenericWarriorNonCombatStrategy.cpp b/src/strategy/warrior/GenericWarriorNonCombatStrategy.cpp
similarity index 100%
rename from src/strategy/classes/warrior/GenericWarriorNonCombatStrategy.cpp
rename to src/strategy/warrior/GenericWarriorNonCombatStrategy.cpp
diff --git a/src/strategy/classes/warrior/GenericWarriorNonCombatStrategy.h b/src/strategy/warrior/GenericWarriorNonCombatStrategy.h
similarity index 100%
rename from src/strategy/classes/warrior/GenericWarriorNonCombatStrategy.h
rename to src/strategy/warrior/GenericWarriorNonCombatStrategy.h
diff --git a/src/strategy/classes/warrior/GenericWarriorStrategy.cpp b/src/strategy/warrior/GenericWarriorStrategy.cpp
similarity index 100%
rename from src/strategy/classes/warrior/GenericWarriorStrategy.cpp
rename to src/strategy/warrior/GenericWarriorStrategy.cpp
diff --git a/src/strategy/classes/warrior/GenericWarriorStrategy.h b/src/strategy/warrior/GenericWarriorStrategy.h
similarity index 100%
rename from src/strategy/classes/warrior/GenericWarriorStrategy.h
rename to src/strategy/warrior/GenericWarriorStrategy.h
diff --git a/src/strategy/classes/warrior/TankWarriorStrategy.cpp b/src/strategy/warrior/TankWarriorStrategy.cpp
similarity index 100%
rename from src/strategy/classes/warrior/TankWarriorStrategy.cpp
rename to src/strategy/warrior/TankWarriorStrategy.cpp
diff --git a/src/strategy/classes/warrior/TankWarriorStrategy.h b/src/strategy/warrior/TankWarriorStrategy.h
similarity index 100%
rename from src/strategy/classes/warrior/TankWarriorStrategy.h
rename to src/strategy/warrior/TankWarriorStrategy.h
diff --git a/src/strategy/classes/warrior/WarriorActions.cpp b/src/strategy/warrior/WarriorActions.cpp
similarity index 100%
rename from src/strategy/classes/warrior/WarriorActions.cpp
rename to src/strategy/warrior/WarriorActions.cpp
diff --git a/src/strategy/classes/warrior/WarriorActions.h b/src/strategy/warrior/WarriorActions.h
similarity index 100%
rename from src/strategy/classes/warrior/WarriorActions.h
rename to src/strategy/warrior/WarriorActions.h
diff --git a/src/strategy/classes/warrior/WarriorAiObjectContext.cpp b/src/strategy/warrior/WarriorAiObjectContext.cpp
similarity index 100%
rename from src/strategy/classes/warrior/WarriorAiObjectContext.cpp
rename to src/strategy/warrior/WarriorAiObjectContext.cpp
diff --git a/src/strategy/classes/warrior/WarriorAiObjectContext.h b/src/strategy/warrior/WarriorAiObjectContext.h
similarity index 100%
rename from src/strategy/classes/warrior/WarriorAiObjectContext.h
rename to src/strategy/warrior/WarriorAiObjectContext.h
diff --git a/src/strategy/classes/warrior/WarriorTriggers.cpp b/src/strategy/warrior/WarriorTriggers.cpp
similarity index 100%
rename from src/strategy/classes/warrior/WarriorTriggers.cpp
rename to src/strategy/warrior/WarriorTriggers.cpp
diff --git a/src/strategy/classes/warrior/WarriorTriggers.h b/src/strategy/warrior/WarriorTriggers.h
similarity index 100%
rename from src/strategy/classes/warrior/WarriorTriggers.h
rename to src/strategy/warrior/WarriorTriggers.h