From 714bb6bca3c903b9abeaa66df7c89ebd981339e2 Mon Sep 17 00:00:00 2001
From: Keleborn <22352763+Celandriel@users.noreply.github.com>
Date: Sun, 31 May 2026 09:38:01 -0700
Subject: [PATCH] Shorten paths (#2396)

<!--
Thank you for contributing to mod-playerbots, please make sure that
you...
1. Submit your PR to the test-staging branch, not master.
2. Read the guidelines below before submitting.
3. Don't delete parts of this template.

DESIGN PHILOSOPHY: We prioritize STABILITY, PERFORMANCE, AND
PREDICTABILITY over behavioral realism.

Every action and decision executes PER BOT AND PER TRIGGER. Small
increases in logic complexity scale
poorly across thousands of bots and negatively affect all. We prioritize
a stable system over a smarter
one. Bots don't need to behave perfectly; believable behavior is the
goal, not human simulation.
Default behavior must be cheap in processing; expensive behavior must be
opt-in.

Before submitting, make sure your changes aligns with these principles.
-->

## Pull Request Description
<!-- Describe what this change does and why it is needed -->
This is designed to significantly shorten the overall path while
maintaining the more detailed structure. I tried to follow the principle
of removing any folder that had 1 or 2 files in it, shortenining
dungeon/raid names to acronyms, and removing instances when the base
name was in the file name (Like Raid) etc.


## Feature Evaluation
<!--
If your PR is very minimal (comment typo, wrong ID reference, etc), and
it is very obvious it will not have
any impact on performance, you may skip these question. If necessary, a
maintainer may ask you for them later.
-->

<!-- Please answer the following: -->
- Describe the **minimum logic** required to achieve the intended
behavior.
- Describe the **processing cost** when this logic executes across many
bots.



## How to Test the Changes
<!--
- Step-by-step instructions to test the change.
- Any required setup (e.g. multiple players, number of bots, specific
configuration).
- Expected behavior and how to verify it.
-->



## Impact Assessment
<!-- As a generic test, before and after measure of pmon (playerbot pmon
tick) can help you here. -->
- Does this change increase per-bot/per-tick processing or risk scaling
poorly with thousands of bots?
    - - [x] No, not at all
    - - [ ] Minimal impact (**explain below**)
    - - [ ] Moderate impact (**explain below**)



- Does this change modify default bot behavior?
    - - [x] No
    - - [ ] Yes (**explain why**)



- Does this change add new decision branches or increase maintenance
complexity?
    - - [x] No
    - - [ ] Yes (**explain below**)



## AI Assistance
<!--
AI assistance is allowed, but all submitted code must be fully
understood, reviewed, and owned by the contributor.
We expect contributors to be honest about what they do and do not
understand.
-->
Was AI assistance used while working on this change?
- - [ ] No
- - [x] Yes (**explain below**)
<!--
If yes, please specify:
- Purpose of usage (e.g. brainstorming, refactoring, documentation, code
generation).
- Which parts of the change were influenced or generated, and whether it
was thoroughly reviewed.
-->

Plan and execute

<!--
TRANSLATIONS:
Anything new that the bots say in chat must be in a translatable format.
This is done using GetBotTextOrDefault,
which you can search for in the codebase to find examples. Your code
needs to have English as the default fallback,
while the full translations need to be in an SQL update file. The
languages in the file are the nine language
options supported by AzerothCore: English, Korean, French, German,
Chinese, Taiwanese, Spanish, Spanish Mexico, and
Russian. See
data/sql/playerbots/updates/2025_12_27_ai_playerbot_fishing_text.sql as
an example of a translation SQL
update, whose content are called within the codebase at
src/strategy/actions/FishingAction.cpp
-->

## Final Checklist

- - [ ] Stability is not compromised.
- - [ ] Performance impact is understood, tested, and acceptable.
- - [ ] Added logic complexity is justified and explained.
- - [ ] Any new bot dialogue lines are translated.
- - [ ] Documentation updated if needed (Conf comments, WiKi commands).

## Notes for Reviewers
<!-- Anything else that's helpful to review or test your pull request.
-->
---
 src/Ai/Class/Dk/{Action => }/DKActions.cpp    |  0
 src/Ai/Class/Dk/{Action => }/DKActions.h      |  0
 src/Ai/Class/Dk/{Trigger => }/DKTriggers.cpp  |  0
 src/Ai/Class/Dk/{Trigger => }/DKTriggers.h    |  0
 .../Druid/{Trigger => }/DruidTriggers.cpp     |  0
 .../Class/Druid/{Trigger => }/DruidTriggers.h |  0
 .../Hunter/{Action => }/HunterActions.cpp     |  0
 .../Class/Hunter/{Action => }/HunterActions.h |  0
 .../Hunter/{Trigger => }/HunterTriggers.cpp   |  0
 .../Hunter/{Trigger => }/HunterTriggers.h     |  0
 .../Class/Mage/{Action => }/MageActions.cpp   |  0
 src/Ai/Class/Mage/{Action => }/MageActions.h  |  0
 .../Class/Mage/{Trigger => }/MageTriggers.cpp |  0
 .../Class/Mage/{Trigger => }/MageTriggers.h   |  0
 .../{Action => Actions}/PaladinActions.cpp    |  0
 .../{Action => Actions}/PaladinActions.h      |  0
 .../PaladinGreaterBlessingAction.cpp          |  0
 .../PaladinGreaterBlessingAction.h            |  0
 .../Class/Paladin/{Util => }/PaladinHelper.h  |  0
 .../Paladin/{Trigger => }/PaladinTriggers.cpp |  0
 .../Paladin/{Trigger => }/PaladinTriggers.h   |  0
 .../Priest/{Action => }/PriestActions.cpp     |  0
 .../Class/Priest/{Action => }/PriestActions.h |  0
 .../Priest/{Trigger => }/PriestTriggers.cpp   |  0
 .../Priest/{Trigger => }/PriestTriggers.h     |  0
 .../Rogue/{Trigger => }/RogueTriggers.cpp     |  0
 .../Class/Rogue/{Trigger => }/RogueTriggers.h |  0
 .../Shaman/{Action => }/ShamanActions.cpp     |  0
 .../Class/Shaman/{Action => }/ShamanActions.h |  0
 .../Shaman/{Trigger => }/ShamanTriggers.cpp   |  0
 .../Shaman/{Trigger => }/ShamanTriggers.h     |  0
 .../Warlock/{Action => }/WarlockActions.cpp   |  0
 .../Warlock/{Action => }/WarlockActions.h     |  0
 .../Warlock/{Trigger => }/WarlockTriggers.cpp |  0
 .../Warlock/{Trigger => }/WarlockTriggers.h   |  0
 .../Warrior/{Action => }/WarriorActions.cpp   |  0
 .../Warrior/{Action => }/WarriorActions.h     |  0
 .../Warrior/{Trigger => }/WarriorTriggers.cpp |  0
 .../Warrior/{Trigger => }/WarriorTriggers.h   |  0
 .../ACActionContext.h}                        |  2 +-
 .../ACActions.cpp}                            |  4 +--
 .../ACActions.h}                              |  2 +-
 .../ACMultipliers.cpp}                        |  6 ++--
 .../ACMultipliers.h}                          |  0
 .../ACStrategy.cpp}                           |  6 ++--
 .../ACStrategy.h}                             |  0
 .../ACTriggerContext.h}                       |  2 +-
 .../ACTriggers.cpp}                           |  2 +-
 .../ACTriggers.h}                             |  0
 .../AKActionContext.h}                        |  2 +-
 .../AKActions.cpp}                            |  2 +-
 .../OldKingdomActions.h => AK/AKActions.h}    |  2 +-
 .../AKMultipliers.cpp}                        |  6 ++--
 .../AKMultipliers.h}                          |  0
 .../AKStrategy.cpp}                           |  4 +--
 .../OldKingdomStrategy.h => AK/AKStrategy.h}  |  0
 .../AKTriggerContext.h}                       |  2 +-
 .../AKTriggers.cpp}                           |  2 +-
 .../OldKingdomTriggers.h => AK/AKTriggers.h}  |  0
 .../ANActionContext.h}                        |  2 +-
 .../ANActions.cpp}                            |  2 +-
 .../AzjolNerubActions.h => AN/ANActions.h}    |  2 +-
 .../ANMultipliers.cpp}                        |  6 ++--
 .../ANMultipliers.h}                          |  0
 .../ANStrategy.cpp}                           |  4 +--
 .../AzjolNerubStrategy.h => AN/ANStrategy.h}  |  0
 .../ANTriggerContext.h}                       |  2 +-
 .../ANTriggers.cpp}                           |  2 +-
 .../AzjolNerubTriggers.h => AN/ANTriggers.h}  |  0
 .../CoSActionContext.h}                       |  2 +-
 .../CoSActions.cpp}                           |  2 +-
 .../CoSActions.h}                             |  2 +-
 .../CoSMultipliers.cpp}                       |  6 ++--
 .../CoSMultipliers.h}                         |  0
 .../CoSStrategy.cpp}                          |  4 +--
 .../CoSStrategy.h}                            |  0
 .../CoSTriggerContext.h}                      |  2 +-
 .../CoSTriggers.cpp}                          |  2 +-
 .../CoSTriggers.h}                            |  0
 .../DTKActionContext.h}                       |  2 +-
 .../DTKActions.cpp}                           |  2 +-
 .../DTKActions.h}                             |  2 +-
 .../DTKMultipliers.cpp}                       |  6 ++--
 .../DTKMultipliers.h}                         |  0
 .../DTKStrategy.cpp}                          |  4 +--
 .../DTKStrategy.h}                            |  0
 .../DTKTriggerContext.h}                      |  2 +-
 .../DTKTriggers.cpp}                          |  2 +-
 .../DTKTriggers.h}                            |  0
 src/Ai/Dungeon/DungeonStrategyContext.h       | 32 ++++++++---------
 .../FoSActionContext.h}                       |  2 +-
 .../FoSActions.cpp}                           |  2 +-
 .../FoSActions.h}                             |  2 +-
 .../FoSMultipliers.cpp}                       |  8 ++---
 .../FoSMultipliers.h}                         |  0
 .../FoSStrategy.cpp}                          |  4 +--
 .../FoSStrategy.h}                            |  0
 .../FoSTriggerContext.h}                      |  2 +-
 .../FoSTriggers.cpp}                          |  2 +-
 .../FoSTriggers.h}                            |  0
 .../GDActionContext.h}                        |  2 +-
 .../GundrakActions.cpp => GD/GDActions.cpp}   |  2 +-
 .../GundrakActions.h => GD/GDActions.h}       |  2 +-
 .../GDMultipliers.cpp}                        |  6 ++--
 .../GDMultipliers.h}                          |  0
 .../GundrakStrategy.cpp => GD/GDStrategy.cpp} |  4 +--
 .../GundrakStrategy.h => GD/GDStrategy.h}     |  0
 .../GDTriggerContext.h}                       |  2 +-
 .../GundrakTriggers.cpp => GD/GDTriggers.cpp} |  2 +-
 .../GundrakTriggers.h => GD/GDTriggers.h}     |  0
 src/Ai/Dungeon/HallsOfReflection/TODO         |  0
 .../HoLActionContext.h}                       |  2 +-
 .../HoLActions.cpp}                           |  2 +-
 .../HoLActions.h}                             |  2 +-
 .../HoLMultipliers.cpp}                       |  6 ++--
 .../HoLMultipliers.h}                         |  0
 .../HoLStrategy.cpp}                          |  4 +--
 .../HoLStrategy.h}                            |  0
 .../HoLTriggerContext.h}                      |  2 +-
 .../HoLTriggers.cpp}                          |  2 +-
 .../HoLTriggers.h}                            |  0
 .../HoSActionContext.h}                       |  2 +-
 .../HoSActions.cpp}                           |  2 +-
 .../HoSActions.h}                             |  2 +-
 .../HoSMultipliers.cpp}                       |  6 ++--
 .../HoSMultipliers.h}                         |  0
 .../HoSStrategy.cpp}                          |  4 +--
 .../HoSStrategy.h}                            |  0
 .../HoSTriggerContext.h}                      |  2 +-
 .../HoSTriggers.cpp}                          |  2 +-
 .../HoSTriggers.h}                            |  0
 .../NexActionContext.h}                       |  2 +-
 .../NexusActions.cpp => Nex/NexActions.cpp}   |  2 +-
 .../NexusActions.h => Nex/NexActions.h}       |  2 +-
 .../NexMultipliers.cpp}                       |  6 ++--
 .../NexMultipliers.h}                         |  0
 .../NexusStrategy.cpp => Nex/NexStrategy.cpp} |  4 +--
 .../NexusStrategy.h => Nex/NexStrategy.h}     |  0
 .../NexTriggerContext.h}                      |  2 +-
 .../NexusTriggers.cpp => Nex/NexTriggers.cpp} |  2 +-
 .../NexusTriggers.h => Nex/NexTriggers.h}     |  0
 .../OCActionContext.h}                        |  2 +-
 .../OculusActions.cpp => OC/OCActions.cpp}    |  4 +--
 .../Action/OculusActions.h => OC/OCActions.h} |  0
 .../OCMultipliers.cpp}                        |  6 ++--
 .../OCMultipliers.h}                          |  0
 .../OculusStrategy.cpp => OC/OCStrategy.cpp}  |  4 +--
 .../OculusStrategy.h => OC/OCStrategy.h}      |  0
 .../OCTriggerContext.h}                       |  2 +-
 .../OculusTriggers.cpp => OC/OCTriggers.cpp}  |  2 +-
 .../OculusTriggers.h => OC/OCTriggers.h}      |  0
 .../PoSActionContext.h}                       |  2 +-
 .../PoSActions.cpp}                           |  2 +-
 .../PitOfSaronActions.h => PoS/PoSActions.h}  |  2 +-
 .../PoSMultipliers.cpp}                       |  6 ++--
 .../PoSMultipliers.h}                         |  0
 .../PoSStrategy.cpp}                          |  4 +--
 .../PoSStrategy.h}                            |  0
 .../PoSTriggerContext.h}                      |  2 +-
 .../PoSTriggers.cpp}                          |  2 +-
 .../PoSTriggers.h}                            |  0
 .../TOCActionContext.h}                       |  2 +-
 .../TOCActions.cpp}                           |  2 +-
 .../TOCActions.h}                             |  2 +-
 .../TOCMultipliers.cpp}                       |  6 ++--
 .../TOCMultipliers.h}                         |  0
 .../TOCStrategy.cpp}                          |  2 +-
 .../TOCStrategy.h}                            |  2 +-
 .../TOCTriggerContext.h}                      |  2 +-
 .../TOCTriggers.cpp}                          |  2 +-
 .../TOCTriggers.h}                            |  0
 src/Ai/Dungeon/TbcDungeonActionContext.h      |  2 +-
 src/Ai/Dungeon/TbcDungeonTriggerContext.h     |  2 +-
 .../UKActionContext.h}                        |  2 +-
 .../UKActions.cpp}                            |  2 +-
 .../UtgardeKeepActions.h => UK/UKActions.h}   |  2 +-
 .../UKMultipliers.cpp}                        |  6 ++--
 .../UKMultipliers.h}                          |  0
 .../UKStrategy.cpp}                           |  4 +--
 .../UtgardeKeepStrategy.h => UK/UKStrategy.h} |  0
 .../UKTriggerContext.h}                       |  2 +-
 .../UKTriggers.cpp}                           |  2 +-
 .../UtgardeKeepTriggers.h => UK/UKTriggers.h} |  0
 .../UPActionContext.h}                        |  2 +-
 .../UPActions.cpp}                            |  2 +-
 .../UPActions.h}                              |  2 +-
 .../UPMultipliers.cpp}                        |  6 ++--
 .../UPMultipliers.h}                          |  0
 .../UPStrategy.cpp}                           |  4 +--
 .../UPStrategy.h}                             |  0
 .../UPTriggerContext.h}                       |  2 +-
 .../UPTriggers.cpp}                           |  2 +-
 .../UPTriggers.h}                             |  0
 .../VHActionContext.h}                        |  2 +-
 .../VHActions.cpp}                            |  2 +-
 .../VioletHoldActions.h => VH/VHActions.h}    |  2 +-
 .../VHMultipliers.cpp}                        |  6 ++--
 .../VHMultipliers.h}                          |  0
 .../VHStrategy.cpp}                           |  4 +--
 .../VioletHoldStrategy.h => VH/VHStrategy.h}  |  0
 .../VHTriggerContext.h}                       |  2 +-
 .../VHTriggers.cpp}                           |  2 +-
 .../VioletHoldTriggers.h => VH/VHTriggers.h}  |  0
 src/Ai/Dungeon/WotlkDungeonActionContext.h    | 30 ++++++++--------
 src/Ai/Dungeon/WotlkDungeonTriggerContext.h   | 30 ++++++++--------
 ...q20ActionContext.h => Aq20ActionContext.h} |  2 +-
 .../RaidAq20Actions.cpp => Aq20Actions.cpp}   |  4 +--
 .../RaidAq20Actions.h => Aq20Actions.h}       |  0
 .../RaidAq20Strategy.cpp => Aq20Strategy.cpp} |  2 +-
 .../RaidAq20Strategy.h => Aq20Strategy.h}     |  0
 ...0TriggerContext.h => Aq20TriggerContext.h} |  2 +-
 .../RaidAq20Triggers.cpp => Aq20Triggers.cpp} |  4 +--
 .../RaidAq20Triggers.h => Aq20Triggers.h}     |  0
 .../{Util/RaidAq20Utils.cpp => Aq20Utils.cpp} |  2 +-
 .../{Util/RaidAq20Utils.h => Aq20Utils.h}     |  0
 .../BTActionContext.h}                        |  2 +-
 .../BTActions.cpp}                            |  4 +--
 .../BTActions.h}                              |  2 +-
 .../BTHelpers.cpp}                            |  2 +-
 .../BTHelpers.h}                              |  0
 .../BTMultipliers.cpp}                        |  6 ++--
 .../BTMultipliers.h}                          |  0
 .../BTStrategy.cpp}                           |  4 +--
 .../BTStrategy.h}                             |  0
 .../BTTriggerContext.h}                       |  2 +-
 .../BTTriggers.cpp}                           |  6 ++--
 .../BTTriggers.h}                             |  0
 .../BWLActionContext.h}                       |  2 +-
 .../RaidBwlActions.cpp => BWL/BWLActions.cpp} |  4 +--
 .../RaidBwlActions.h => BWL/BWLActions.h}     |  0
 .../RaidBwlHelpers.cpp => BWL/BWLHelpers.cpp} |  2 +-
 .../RaidBwlHelpers.h => BWL/BWLHelpers.h}     |  0
 .../BWLStrategy.cpp}                          |  2 +-
 .../RaidBwlStrategy.h => BWL/BWLStrategy.h}   |  0
 .../BWLTriggerContext.h}                      |  2 +-
 .../BWLTriggers.cpp}                          |  4 +--
 .../RaidBwlTriggers.h => BWL/BWLTriggers.h}   |  0
 .../EoEActionContext.h}                       |  2 +-
 .../RaidEoEActions.cpp => EoE/EoEActions.cpp} |  4 +--
 .../RaidEoEActions.h => EoE/EoEActions.h}     |  0
 .../EoEMultipliers.cpp}                       |  6 ++--
 .../EoEMultipliers.h}                         |  0
 .../EoEStrategy.cpp}                          |  4 +--
 .../RaidEoEStrategy.h => EoE/EoEStrategy.h}   |  0
 .../EoETriggerContext.h}                      |  2 +-
 .../EoETriggers.cpp}                          |  2 +-
 .../RaidEoETriggers.h => EoE/EoETriggers.h}   |  0
 .../GruulActionContext.h}                     |  2 +-
 .../GruulActions.cpp}                         |  4 +--
 .../GruulActions.h}                           |  0
 .../GruulHelpers.cpp}                         |  2 +-
 .../GruulHelpers.h}                           |  0
 .../GruulMultipliers.cpp}                     |  6 ++--
 .../GruulMultipliers.h}                       |  0
 .../GruulStrategy.cpp}                        |  4 +--
 .../GruulStrategy.h}                          |  0
 .../GruulTriggerContext.h}                    |  2 +-
 .../GruulTriggers.cpp}                        |  4 +--
 .../GruulTriggers.h}                          |  0
 .../HyjalActionContext.h}                     |  2 +-
 .../HyjalActions.cpp}                         |  4 +--
 .../HyjalActions.h}                           |  0
 .../HyjalMultipliers.cpp}                     |  6 ++--
 .../HyjalMultipliers.h}                       |  0
 .../HyjalStrategy.cpp}                        |  4 +--
 .../HyjalStrategy.h}                          |  0
 .../HyjalTriggerContext.h}                    |  2 +-
 .../HyjalTriggers.cpp}                        |  6 ++--
 .../HyjalTriggers.h}                          |  0
 .../Util/HyjalHelpers.cpp}                    |  2 +-
 .../Util/HyjalHelpers.h}                      |  0
 .../Util/HyjalScripts.cpp}                    |  2 +-
 .../KaraActionContext.h}                      |  2 +-
 .../KaraActions.cpp}                          |  4 +--
 .../KaraActions.h}                            |  0
 .../KaraHelpers.cpp}                          |  2 +-
 .../KaraHelpers.h}                            |  0
 .../KaraMultipliers.cpp}                      |  6 ++--
 .../KaraMultipliers.h}                        |  0
 .../KaraStrategy.cpp}                         |  4 +--
 .../KaraStrategy.h}                           |  0
 .../KaraTriggerContext.h}                     |  2 +-
 .../KaraTriggers.cpp}                         |  6 ++--
 .../KaraTriggers.h}                           |  0
 .../MCActionContext.h}                        |  2 +-
 .../RaidMcActions.cpp => MC/MCActions.cpp}    |  4 +--
 .../Action/RaidMcActions.h => MC/MCActions.h} |  0
 .../Util/RaidMcHelpers.h => MC/MCHelpers.h}   |  0
 .../MCMultipliers.cpp}                        |  6 ++--
 .../MCMultipliers.h}                          |  0
 .../RaidMcStrategy.cpp => MC/MCStrategy.cpp}  |  4 +--
 .../RaidMcStrategy.h => MC/MCStrategy.h}      |  0
 .../MCTriggerContext.h}                       |  2 +-
 .../RaidMcTriggers.cpp => MC/MCTriggers.cpp}  |  4 +--
 .../RaidMcTriggers.h => MC/MCTriggers.h}      |  0
 .../MagActionContext.h}                       |  2 +-
 .../MagActions.cpp}                           |  4 +--
 .../MagActions.h}                             |  2 +-
 .../MagHelpers.cpp}                           |  2 +-
 .../MagHelpers.h}                             |  0
 .../MagMultipliers.cpp}                       |  6 ++--
 .../MagMultipliers.h}                         |  0
 .../MagStrategy.cpp}                          |  4 +--
 .../MagStrategy.h}                            |  0
 .../MagTriggerContext.h}                      |  2 +-
 .../MagTriggers.cpp}                          |  4 +--
 .../MagTriggers.h}                            |  0
 .../Action/NaxxActions.h}                     |  2 +-
 .../Action/NaxxActions_Anubrekhan.cpp}        |  2 +-
 .../Action/NaxxActions_Faerlina.cpp}          |  2 +-
 .../Action/NaxxActions_FourHorsemen.cpp}      |  2 +-
 .../Action/NaxxActions_Gluth.cpp}             |  2 +-
 .../Action/NaxxActions_Gothik.cpp}            |  2 +-
 .../Action/NaxxActions_Grobbulus.cpp}         |  2 +-
 .../Action/NaxxActions_Heigan.cpp}            |  4 +--
 .../Action/NaxxActions_Kelthuzad.cpp}         |  2 +-
 .../Action/NaxxActions_Loatheb.cpp}           |  2 +-
 .../Action/NaxxActions_Maexxna.cpp}           |  2 +-
 .../Action/NaxxActions_Noth.cpp}              |  2 +-
 .../Action/NaxxActions_Patchwerk.cpp}         |  2 +-
 .../Action/NaxxActions_Razuvious.cpp}         |  2 +-
 .../Action/NaxxActions_Sapphiron.cpp}         |  6 ++--
 .../Action/NaxxActions_Shared.cpp}            |  2 +-
 .../Action/NaxxActions_Thaddius.cpp}          |  4 +--
 .../NaxxActionContext.h}                      |  2 +-
 .../NaxxBossHelper.h}                         |  2 +-
 .../NaxxMultipliers.cpp}                      |  6 ++--
 .../NaxxMultipliers.h}                        |  2 +-
 .../NaxxSpellIds.h}                           |  0
 .../NaxxStrategy.cpp}                         |  4 +--
 .../NaxxStrategy.h}                           |  0
 .../NaxxTriggerContext.h}                     |  2 +-
 .../NaxxTriggers.cpp}                         |  4 +--
 .../NaxxTriggers.h}                           |  2 +-
 .../OSActionContext.h}                        |  2 +-
 .../RaidOsActions.cpp => OS/OSActions.cpp}    |  4 +--
 .../Action/RaidOsActions.h => OS/OSActions.h} |  0
 .../OSMultipliers.cpp}                        |  6 ++--
 .../OSMultipliers.h}                          |  0
 .../RaidOsStrategy.cpp => OS/OSStrategy.cpp}  |  4 +--
 .../RaidOsStrategy.h => OS/OSStrategy.h}      |  0
 .../OSTriggerContext.h}                       |  2 +-
 .../RaidOsTriggers.cpp => OS/OSTriggers.cpp}  |  2 +-
 .../RaidOsTriggers.h => OS/OSTriggers.h}      |  0
 .../OnyActionContext.h}                       |  2 +-
 .../OnyActions.cpp}                           |  2 +-
 .../RaidOnyxiaActions.h => Ony/OnyActions.h}  |  0
 .../OnyStrategy.cpp}                          |  2 +-
 .../OnyStrategy.h}                            |  0
 .../OnyTriggerContext.h}                      |  2 +-
 .../OnyTriggers.cpp}                          |  2 +-
 .../OnyTriggers.h}                            |  0
 src/Ai/Raid/RaidStrategyContext.h             | 34 +++++++++---------
 .../SSCActionContext.h}                       |  2 +-
 .../RaidSSCActions.cpp => SSC/SSCActions.cpp} |  4 +--
 .../RaidSSCActions.h => SSC/SSCActions.h}     |  0
 .../RaidSSCHelpers.cpp => SSC/SSCHelpers.cpp} |  2 +-
 .../RaidSSCHelpers.h => SSC/SSCHelpers.h}     |  0
 .../SSCMultipliers.cpp}                       |  6 ++--
 .../SSCMultipliers.h}                         |  0
 .../SSCStrategy.cpp}                          |  4 +--
 .../RaidSSCStrategy.h => SSC/SSCStrategy.h}   |  0
 .../SSCTriggerContext.h}                      |  2 +-
 .../SSCTriggers.cpp}                          |  6 ++--
 .../RaidSSCTriggers.h => SSC/SSCTriggers.h}   |  0
 .../TKActionContext.h}                        |  2 +-
 .../TKActions.cpp}                            |  6 ++--
 .../TKActions.h}                              |  4 +--
 .../TKMultipliers.cpp}                        |  8 ++---
 .../TKMultipliers.h}                          |  0
 .../TKStrategy.cpp}                           |  4 +--
 .../TKStrategy.h}                             |  0
 .../TKTriggerContext.h}                       |  2 +-
 .../TKTriggers.cpp}                           |  8 ++---
 .../TKTriggers.h}                             |  0
 .../Util/TKHelpers.cpp}                       |  4 +--
 .../Util/TKHelpers.h}                         |  0
 .../Util/TKKaelthasBossAI.h}                  |  0
 .../Util/TKScripts.cpp}                       |  2 +-
 .../UldActionContext.h}                       |  2 +-
 .../UldActions.cpp}                           |  6 ++--
 .../RaidUlduarActions.h => Uld/UldActions.h}  |  4 +--
 .../UldStrategy.cpp}                          |  2 +-
 .../UldStrategy.h}                            |  0
 .../UldTriggerContext.h}                      |  2 +-
 .../UldTriggers.cpp}                          |  6 ++--
 .../UldTriggers.h}                            |  2 +-
 .../Util/UldBossHelper.cpp}                   |  2 +-
 .../Util/UldBossHelper.h}                     |  0
 .../Util/UldScripts.h}                        |  0
 .../VoAActionContext.h}                       |  2 +-
 .../RaidVoAActions.cpp => VoA/VoAActions.cpp} |  4 +--
 .../RaidVoAActions.h => VoA/VoAActions.h}     |  0
 .../VoAStrategy.cpp}                          |  2 +-
 .../RaidVoAStrategy.h => VoA/VoAStrategy.h}   |  0
 .../VoATriggerContext.h}                      |  2 +-
 .../VoATriggers.cpp}                          |  2 +-
 .../RaidVoATriggers.h => VoA/VoATriggers.h}   |  0
 .../ZAActionContext.h}                        |  2 +-
 .../ZAActions.cpp}                            |  4 +--
 .../RaidZulAmanActions.h => ZA/ZAActions.h}   |  0
 .../ZAHelpers.cpp}                            |  2 +-
 .../RaidZulAmanHelpers.h => ZA/ZAHelpers.h}   |  0
 .../ZAMultipliers.cpp}                        |  6 ++--
 .../ZAMultipliers.h}                          |  0
 .../ZAStrategy.cpp}                           |  4 +--
 .../RaidZulAmanStrategy.h => ZA/ZAStrategy.h} |  0
 .../ZATriggerContext.h}                       |  2 +-
 .../ZATriggers.cpp}                           |  6 ++--
 .../RaidZulAmanTriggers.h => ZA/ZATriggers.h} |  0
 src/Bot/Engine/BuildSharedActionContexts.cpp  | 36 +++++++++----------
 src/Bot/Engine/BuildSharedTriggerContexts.cpp | 36 +++++++++----------
 412 files changed, 480 insertions(+), 480 deletions(-)
 rename src/Ai/Class/Dk/{Action => }/DKActions.cpp (100%)
 rename src/Ai/Class/Dk/{Action => }/DKActions.h (100%)
 rename src/Ai/Class/Dk/{Trigger => }/DKTriggers.cpp (100%)
 rename src/Ai/Class/Dk/{Trigger => }/DKTriggers.h (100%)
 rename src/Ai/Class/Druid/{Trigger => }/DruidTriggers.cpp (100%)
 rename src/Ai/Class/Druid/{Trigger => }/DruidTriggers.h (100%)
 rename src/Ai/Class/Hunter/{Action => }/HunterActions.cpp (100%)
 rename src/Ai/Class/Hunter/{Action => }/HunterActions.h (100%)
 rename src/Ai/Class/Hunter/{Trigger => }/HunterTriggers.cpp (100%)
 rename src/Ai/Class/Hunter/{Trigger => }/HunterTriggers.h (100%)
 rename src/Ai/Class/Mage/{Action => }/MageActions.cpp (100%)
 rename src/Ai/Class/Mage/{Action => }/MageActions.h (100%)
 rename src/Ai/Class/Mage/{Trigger => }/MageTriggers.cpp (100%)
 rename src/Ai/Class/Mage/{Trigger => }/MageTriggers.h (100%)
 rename src/Ai/Class/Paladin/{Action => Actions}/PaladinActions.cpp (100%)
 rename src/Ai/Class/Paladin/{Action => Actions}/PaladinActions.h (100%)
 rename src/Ai/Class/Paladin/{Action => Actions}/PaladinGreaterBlessingAction.cpp (100%)
 rename src/Ai/Class/Paladin/{Action => Actions}/PaladinGreaterBlessingAction.h (100%)
 rename src/Ai/Class/Paladin/{Util => }/PaladinHelper.h (100%)
 rename src/Ai/Class/Paladin/{Trigger => }/PaladinTriggers.cpp (100%)
 rename src/Ai/Class/Paladin/{Trigger => }/PaladinTriggers.h (100%)
 rename src/Ai/Class/Priest/{Action => }/PriestActions.cpp (100%)
 rename src/Ai/Class/Priest/{Action => }/PriestActions.h (100%)
 rename src/Ai/Class/Priest/{Trigger => }/PriestTriggers.cpp (100%)
 rename src/Ai/Class/Priest/{Trigger => }/PriestTriggers.h (100%)
 rename src/Ai/Class/Rogue/{Trigger => }/RogueTriggers.cpp (100%)
 rename src/Ai/Class/Rogue/{Trigger => }/RogueTriggers.h (100%)
 rename src/Ai/Class/Shaman/{Action => }/ShamanActions.cpp (100%)
 rename src/Ai/Class/Shaman/{Action => }/ShamanActions.h (100%)
 rename src/Ai/Class/Shaman/{Trigger => }/ShamanTriggers.cpp (100%)
 rename src/Ai/Class/Shaman/{Trigger => }/ShamanTriggers.h (100%)
 rename src/Ai/Class/Warlock/{Action => }/WarlockActions.cpp (100%)
 rename src/Ai/Class/Warlock/{Action => }/WarlockActions.h (100%)
 rename src/Ai/Class/Warlock/{Trigger => }/WarlockTriggers.cpp (100%)
 rename src/Ai/Class/Warlock/{Trigger => }/WarlockTriggers.h (100%)
 rename src/Ai/Class/Warrior/{Action => }/WarriorActions.cpp (100%)
 rename src/Ai/Class/Warrior/{Action => }/WarriorActions.h (100%)
 rename src/Ai/Class/Warrior/{Trigger => }/WarriorTriggers.cpp (100%)
 rename src/Ai/Class/Warrior/{Trigger => }/WarriorTriggers.h (100%)
 rename src/Ai/Dungeon/{AuchenaiCrypts/AuchenaiCryptsActionContext.h => AC/ACActionContext.h} (97%)
 rename src/Ai/Dungeon/{AuchenaiCrypts/Action/AuchenaiCryptsActions.cpp => AC/ACActions.cpp} (98%)
 rename src/Ai/Dungeon/{AuchenaiCrypts/Action/AuchenaiCryptsActions.h => AC/ACActions.h} (96%)
 rename src/Ai/Dungeon/{AuchenaiCrypts/Multiplier/AuchenaiCryptsMultipliers.cpp => AC/ACMultipliers.cpp} (92%)
 rename src/Ai/Dungeon/{AuchenaiCrypts/Multiplier/AuchenaiCryptsMultipliers.h => AC/ACMultipliers.h} (100%)
 rename src/Ai/Dungeon/{AuchenaiCrypts/Strategy/AuchenaiCryptsStrategy.cpp => AC/ACStrategy.cpp} (86%)
 rename src/Ai/Dungeon/{AuchenaiCrypts/Strategy/AuchenaiCryptsStrategy.h => AC/ACStrategy.h} (100%)
 rename src/Ai/Dungeon/{AuchenaiCrypts/AuchenaiCryptsTriggerContext.h => AC/ACTriggerContext.h} (97%)
 rename src/Ai/Dungeon/{AuchenaiCrypts/Trigger/AuchenaiCryptsTriggers.cpp => AC/ACTriggers.cpp} (96%)
 rename src/Ai/Dungeon/{AuchenaiCrypts/Trigger/AuchenaiCryptsTriggers.h => AC/ACTriggers.h} (100%)
 rename src/Ai/Dungeon/{OldKingdom/OldKingdomActionContext.h => AK/AKActionContext.h} (96%)
 rename src/Ai/Dungeon/{OldKingdom/Action/OldKingdomActions.cpp => AK/AKActions.cpp} (98%)
 rename src/Ai/Dungeon/{OldKingdom/Action/OldKingdomActions.h => AK/AKActions.h} (96%)
 rename src/Ai/Dungeon/{OldKingdom/Multiplier/OldKingdomMultipliers.cpp => AK/AKMultipliers.cpp} (94%)
 rename src/Ai/Dungeon/{OldKingdom/Multiplier/OldKingdomMultipliers.h => AK/AKMultipliers.h} (100%)
 rename src/Ai/Dungeon/{OldKingdom/Strategy/OldKingdomStrategy.cpp => AK/AKStrategy.cpp} (95%)
 rename src/Ai/Dungeon/{OldKingdom/Strategy/OldKingdomStrategy.h => AK/AKStrategy.h} (100%)
 rename src/Ai/Dungeon/{OldKingdom/OldKingdomTriggerContext.h => AK/AKTriggerContext.h} (96%)
 rename src/Ai/Dungeon/{OldKingdom/Trigger/OldKingdomTriggers.cpp => AK/AKTriggers.cpp} (97%)
 rename src/Ai/Dungeon/{OldKingdom/Trigger/OldKingdomTriggers.h => AK/AKTriggers.h} (100%)
 rename src/Ai/Dungeon/{AzjolNerub/AzjolNerubActionContext.h => AN/ANActionContext.h} (96%)
 rename src/Ai/Dungeon/{AzjolNerub/Action/AzjolNerubActions.cpp => AN/ANActions.cpp} (99%)
 rename src/Ai/Dungeon/{AzjolNerub/Action/AzjolNerubActions.h => AN/ANActions.h} (96%)
 rename src/Ai/Dungeon/{AzjolNerub/Multiplier/AzjolNerubMultipliers.cpp => AN/ANMultipliers.cpp} (93%)
 rename src/Ai/Dungeon/{AzjolNerub/Multiplier/AzjolNerubMultipliers.h => AN/ANMultipliers.h} (100%)
 rename src/Ai/Dungeon/{AzjolNerub/Strategy/AzjolNerubStrategy.cpp => AN/ANStrategy.cpp} (94%)
 rename src/Ai/Dungeon/{AzjolNerub/Strategy/AzjolNerubStrategy.h => AN/ANStrategy.h} (100%)
 rename src/Ai/Dungeon/{AzjolNerub/AzjolNerubTriggerContext.h => AN/ANTriggerContext.h} (97%)
 rename src/Ai/Dungeon/{AzjolNerub/Trigger/AzjolNerubTriggers.cpp => AN/ANTriggers.cpp} (98%)
 rename src/Ai/Dungeon/{AzjolNerub/Trigger/AzjolNerubTriggers.h => AN/ANTriggers.h} (100%)
 rename src/Ai/Dungeon/{CullingOfStratholme/CullingOfStratholmeActionContext.h => CoS/CoSActionContext.h} (94%)
 rename src/Ai/Dungeon/{CullingOfStratholme/Action/CullingOfStratholmeActions.cpp => CoS/CoSActions.cpp} (97%)
 rename src/Ai/Dungeon/{CullingOfStratholme/Action/CullingOfStratholmeActions.h => CoS/CoSActions.h} (93%)
 rename src/Ai/Dungeon/{CullingOfStratholme/Multiplier/CullingOfStratholmeMultipliers.cpp => CoS/CoSMultipliers.cpp} (76%)
 rename src/Ai/Dungeon/{CullingOfStratholme/Multiplier/CullingOfStratholmeMultipliers.h => CoS/CoSMultipliers.h} (100%)
 rename src/Ai/Dungeon/{CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.cpp => CoS/CoSStrategy.cpp} (90%)
 rename src/Ai/Dungeon/{CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.h => CoS/CoSStrategy.h} (100%)
 rename src/Ai/Dungeon/{CullingOfStratholme/CullingOfStratholmeTriggerContext.h => CoS/CoSTriggerContext.h} (94%)
 rename src/Ai/Dungeon/{CullingOfStratholme/Trigger/CullingOfStratholmeTriggers.cpp => CoS/CoSTriggers.cpp} (95%)
 rename src/Ai/Dungeon/{CullingOfStratholme/Trigger/CullingOfStratholmeTriggers.h => CoS/CoSTriggers.h} (100%)
 rename src/Ai/Dungeon/{DraktharonKeep/DrakTharonKeepActionContext.h => DTK/DTKActionContext.h} (98%)
 rename src/Ai/Dungeon/{DraktharonKeep/Action/DrakTharonKeepActions.cpp => DTK/DTKActions.cpp} (99%)
 rename src/Ai/Dungeon/{DraktharonKeep/Action/DrakTharonKeepActions.h => DTK/DTKActions.h} (98%)
 rename src/Ai/Dungeon/{DraktharonKeep/Multiplier/DrakTharonKeepMultipliers.cpp => DTK/DTKMultipliers.cpp} (93%)
 rename src/Ai/Dungeon/{DraktharonKeep/Multiplier/DrakTharonKeepMultipliers.h => DTK/DTKMultipliers.h} (100%)
 rename src/Ai/Dungeon/{DraktharonKeep/Strategy/DrakTharonKeepStrategy.cpp => DTK/DTKStrategy.cpp} (95%)
 rename src/Ai/Dungeon/{DraktharonKeep/Strategy/DrakTharonKeepStrategy.h => DTK/DTKStrategy.h} (100%)
 rename src/Ai/Dungeon/{DraktharonKeep/DrakTharonKeepTriggerContext.h => DTK/DTKTriggerContext.h} (97%)
 rename src/Ai/Dungeon/{DraktharonKeep/Trigger/DrakTharonKeepTriggers.cpp => DTK/DTKTriggers.cpp} (97%)
 rename src/Ai/Dungeon/{DraktharonKeep/Trigger/DrakTharonKeepTriggers.h => DTK/DTKTriggers.h} (100%)
 rename src/Ai/Dungeon/{ForgeOfSouls/ForgeOfSoulsActionContext.h => FoS/FoSActionContext.h} (97%)
 rename src/Ai/Dungeon/{ForgeOfSouls/Action/ForgeOfSoulsActions.cpp => FoS/FoSActions.cpp} (99%)
 rename src/Ai/Dungeon/{ForgeOfSouls/Action/ForgeOfSoulsActions.h => FoS/FoSActions.h} (97%)
 rename src/Ai/Dungeon/{ForgeOfSouls/Multiplier/ForgeOfSoulsMultipliers.cpp => FoS/FoSMultipliers.cpp} (88%)
 rename src/Ai/Dungeon/{ForgeOfSouls/Multiplier/ForgeOfSoulsMultipliers.h => FoS/FoSMultipliers.h} (100%)
 rename src/Ai/Dungeon/{ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.cpp => FoS/FoSStrategy.cpp} (91%)
 rename src/Ai/Dungeon/{ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.h => FoS/FoSStrategy.h} (100%)
 rename src/Ai/Dungeon/{ForgeOfSouls/ForgeOfSoulsTriggerContext.h => FoS/FoSTriggerContext.h} (97%)
 rename src/Ai/Dungeon/{ForgeOfSouls/Trigger/ForgeOfSoulsTriggers.cpp => FoS/FoSTriggers.cpp} (97%)
 rename src/Ai/Dungeon/{ForgeOfSouls/Trigger/ForgeOfSoulsTriggers.h => FoS/FoSTriggers.h} (100%)
 rename src/Ai/Dungeon/{Gundrak/GundrakActionContext.h => GD/GDActionContext.h} (96%)
 rename src/Ai/Dungeon/{Gundrak/Action/GundrakActions.cpp => GD/GDActions.cpp} (98%)
 rename src/Ai/Dungeon/{Gundrak/Action/GundrakActions.h => GD/GDActions.h} (96%)
 rename src/Ai/Dungeon/{Gundrak/Multiplier/GundrakMultipliers.cpp => GD/GDMultipliers.cpp} (94%)
 rename src/Ai/Dungeon/{Gundrak/Multiplier/GundrakMultipliers.h => GD/GDMultipliers.h} (100%)
 rename src/Ai/Dungeon/{Gundrak/Strategy/GundrakStrategy.cpp => GD/GDStrategy.cpp} (94%)
 rename src/Ai/Dungeon/{Gundrak/Strategy/GundrakStrategy.h => GD/GDStrategy.h} (100%)
 rename src/Ai/Dungeon/{Gundrak/GundrakTriggerContext.h => GD/GDTriggerContext.h} (96%)
 rename src/Ai/Dungeon/{Gundrak/Trigger/GundrakTriggers.cpp => GD/GDTriggers.cpp} (97%)
 rename src/Ai/Dungeon/{Gundrak/Trigger/GundrakTriggers.h => GD/GDTriggers.h} (100%)
 delete mode 100644 src/Ai/Dungeon/HallsOfReflection/TODO
 rename src/Ai/Dungeon/{HallsOfLightning/HallsOfLightningActionContext.h => HoL/HoLActionContext.h} (98%)
 rename src/Ai/Dungeon/{HallsOfLightning/Action/HallsOfLightningActions.cpp => HoL/HoLActions.cpp} (99%)
 rename src/Ai/Dungeon/{HallsOfLightning/Action/HallsOfLightningActions.h => HoL/HoLActions.h} (98%)
 rename src/Ai/Dungeon/{HallsOfLightning/Multiplier/HallsOfLightningMultipliers.cpp => HoL/HoLMultipliers.cpp} (96%)
 rename src/Ai/Dungeon/{HallsOfLightning/Multiplier/HallsOfLightningMultipliers.h => HoL/HoLMultipliers.h} (100%)
 rename src/Ai/Dungeon/{HallsOfLightning/Strategy/HallsOfLightningStrategy.cpp => HoL/HoLStrategy.cpp} (95%)
 rename src/Ai/Dungeon/{HallsOfLightning/Strategy/HallsOfLightningStrategy.h => HoL/HoLStrategy.h} (100%)
 rename src/Ai/Dungeon/{HallsOfLightning/HallsOfLightningTriggerContext.h => HoL/HoLTriggerContext.h} (98%)
 rename src/Ai/Dungeon/{HallsOfLightning/Trigger/HallsOfLightningTriggers.cpp => HoL/HoLTriggers.cpp} (98%)
 rename src/Ai/Dungeon/{HallsOfLightning/Trigger/HallsOfLightningTriggers.h => HoL/HoLTriggers.h} (100%)
 rename src/Ai/Dungeon/{HallsOfStone/HallsOfStoneActionContext.h => HoS/HoSActionContext.h} (95%)
 rename src/Ai/Dungeon/{HallsOfStone/Action/HallsOfStoneActions.cpp => HoS/HoSActions.cpp} (97%)
 rename src/Ai/Dungeon/{HallsOfStone/Action/HallsOfStoneActions.h => HoS/HoSActions.h} (94%)
 rename src/Ai/Dungeon/{HallsOfStone/Multiplier/HallsOfStoneMultipliers.cpp => HoS/HoSMultipliers.cpp} (92%)
 rename src/Ai/Dungeon/{HallsOfStone/Multiplier/HallsOfStoneMultipliers.h => HoS/HoSMultipliers.h} (100%)
 rename src/Ai/Dungeon/{HallsOfStone/Strategy/HallsOfStoneStrategy.cpp => HoS/HoSStrategy.cpp} (93%)
 rename src/Ai/Dungeon/{HallsOfStone/Strategy/HallsOfStoneStrategy.h => HoS/HoSStrategy.h} (100%)
 rename src/Ai/Dungeon/{HallsOfStone/HallsOfStoneTriggerContext.h => HoS/HoSTriggerContext.h} (95%)
 rename src/Ai/Dungeon/{HallsOfStone/Trigger/HallsOfStoneTriggers.cpp => HoS/HoSTriggers.cpp} (95%)
 rename src/Ai/Dungeon/{HallsOfStone/Trigger/HallsOfStoneTriggers.h => HoS/HoSTriggers.h} (100%)
 rename src/Ai/Dungeon/{Nexus/NexusActionContext.h => Nex/NexActionContext.h} (98%)
 rename src/Ai/Dungeon/{Nexus/Action/NexusActions.cpp => Nex/NexActions.cpp} (99%)
 rename src/Ai/Dungeon/{Nexus/Action/NexusActions.h => Nex/NexActions.h} (98%)
 rename src/Ai/Dungeon/{Nexus/Multiplier/NexusMultipliers.cpp => Nex/NexMultipliers.cpp} (97%)
 rename src/Ai/Dungeon/{Nexus/Multiplier/NexusMultipliers.h => Nex/NexMultipliers.h} (100%)
 rename src/Ai/Dungeon/{Nexus/Strategy/NexusStrategy.cpp => Nex/NexStrategy.cpp} (97%)
 rename src/Ai/Dungeon/{Nexus/Strategy/NexusStrategy.h => Nex/NexStrategy.h} (100%)
 rename src/Ai/Dungeon/{Nexus/NexusTriggerContext.h => Nex/NexTriggerContext.h} (98%)
 rename src/Ai/Dungeon/{Nexus/Trigger/NexusTriggers.cpp => Nex/NexTriggers.cpp} (99%)
 rename src/Ai/Dungeon/{Nexus/Trigger/NexusTriggers.h => Nex/NexTriggers.h} (100%)
 rename src/Ai/Dungeon/{Oculus/OculusActionContext.h => OC/OCActionContext.h} (98%)
 rename src/Ai/Dungeon/{Oculus/Action/OculusActions.cpp => OC/OCActions.cpp} (99%)
 rename src/Ai/Dungeon/{Oculus/Action/OculusActions.h => OC/OCActions.h} (100%)
 rename src/Ai/Dungeon/{Oculus/Multiplier/OculusMultipliers.cpp => OC/OCMultipliers.cpp} (97%)
 rename src/Ai/Dungeon/{Oculus/Multiplier/OculusMultipliers.h => OC/OCMultipliers.h} (100%)
 rename src/Ai/Dungeon/{Oculus/Strategy/OculusStrategy.cpp => OC/OCStrategy.cpp} (96%)
 rename src/Ai/Dungeon/{Oculus/Strategy/OculusStrategy.h => OC/OCStrategy.h} (100%)
 rename src/Ai/Dungeon/{Oculus/OculusTriggerContext.h => OC/OCTriggerContext.h} (98%)
 rename src/Ai/Dungeon/{Oculus/Trigger/OculusTriggers.cpp => OC/OCTriggers.cpp} (98%)
 rename src/Ai/Dungeon/{Oculus/Trigger/OculusTriggers.h => OC/OCTriggers.h} (100%)
 rename src/Ai/Dungeon/{PitOfSaron/PitOfSaronActionContext.h => PoS/PoSActionContext.h} (95%)
 rename src/Ai/Dungeon/{PitOfSaron/Action/PitOfSaronActions.cpp => PoS/PoSActions.cpp} (99%)
 rename src/Ai/Dungeon/{PitOfSaron/Action/PitOfSaronActions.h => PoS/PoSActions.h} (96%)
 rename src/Ai/Dungeon/{PitOfSaron/Multiplier/PitOfSaronMultipliers.cpp => PoS/PoSMultipliers.cpp} (93%)
 rename src/Ai/Dungeon/{PitOfSaron/Multiplier/PitOfSaronMultipliers.h => PoS/PoSMultipliers.h} (100%)
 rename src/Ai/Dungeon/{PitOfSaron/Strategy/PitOfSaronStrategy.cpp => PoS/PoSStrategy.cpp} (87%)
 rename src/Ai/Dungeon/{PitOfSaron/Strategy/PitOfSaronStrategy.h => PoS/PoSStrategy.h} (100%)
 rename src/Ai/Dungeon/{PitOfSaron/PitOfSaronTriggerContext.h => PoS/PoSTriggerContext.h} (95%)
 rename src/Ai/Dungeon/{PitOfSaron/Trigger/PitOfSaronTriggers.cpp => PoS/PoSTriggers.cpp} (92%)
 rename src/Ai/Dungeon/{PitOfSaron/Trigger/PitOfSaronTriggers.h => PoS/PoSTriggers.h} (100%)
 rename src/Ai/Dungeon/{TrialOfTheChampion/TrialOfTheChampionActionContext.h => TOC/TOCActionContext.h} (96%)
 rename src/Ai/Dungeon/{TrialOfTheChampion/Action/TrialOfTheChampionActions.cpp => TOC/TOCActions.cpp} (99%)
 rename src/Ai/Dungeon/{TrialOfTheChampion/Action/TrialOfTheChampionActions.h => TOC/TOCActions.h} (97%)
 rename src/Ai/Dungeon/{TrialOfTheChampion/Multiplier/TrialOfTheChampionMultipliers.cpp => TOC/TOCMultipliers.cpp} (59%)
 rename src/Ai/Dungeon/{TrialOfTheChampion/Multiplier/TrialOfTheChampionMultipliers.h => TOC/TOCMultipliers.h} (100%)
 rename src/Ai/Dungeon/{TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.cpp => TOC/TOCStrategy.cpp} (94%)
 rename src/Ai/Dungeon/{TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.h => TOC/TOCStrategy.h} (92%)
 rename src/Ai/Dungeon/{TrialOfTheChampion/TrialOfTheChampionTriggerContext.h => TOC/TOCTriggerContext.h} (96%)
 rename src/Ai/Dungeon/{TrialOfTheChampion/Trigger/TrialOfTheChampionTriggers.cpp => TOC/TOCTriggers.cpp} (97%)
 rename src/Ai/Dungeon/{TrialOfTheChampion/Trigger/TrialOfTheChampionTriggers.h => TOC/TOCTriggers.h} (100%)
 rename src/Ai/Dungeon/{UtgardeKeep/UtgardeKeepActionContext.h => UK/UKActionContext.h} (98%)
 rename src/Ai/Dungeon/{UtgardeKeep/Action/UtgardeKeepActions.cpp => UK/UKActions.cpp} (98%)
 rename src/Ai/Dungeon/{UtgardeKeep/Action/UtgardeKeepActions.h => UK/UKActions.h} (97%)
 rename src/Ai/Dungeon/{UtgardeKeep/Multiplier/UtgardeKeepMultipliers.cpp => UK/UKMultipliers.cpp} (96%)
 rename src/Ai/Dungeon/{UtgardeKeep/Multiplier/UtgardeKeepMultipliers.h => UK/UKMultipliers.h} (100%)
 rename src/Ai/Dungeon/{UtgardeKeep/Strategy/UtgardeKeepStrategy.cpp => UK/UKStrategy.cpp} (96%)
 rename src/Ai/Dungeon/{UtgardeKeep/Strategy/UtgardeKeepStrategy.h => UK/UKStrategy.h} (100%)
 rename src/Ai/Dungeon/{UtgardeKeep/UtgardeKeepTriggerContext.h => UK/UKTriggerContext.h} (98%)
 rename src/Ai/Dungeon/{UtgardeKeep/Trigger/UtgardeKeepTriggers.cpp => UK/UKTriggers.cpp} (98%)
 rename src/Ai/Dungeon/{UtgardeKeep/Trigger/UtgardeKeepTriggers.h => UK/UKTriggers.h} (100%)
 rename src/Ai/Dungeon/{UtgardePinnacle/UtgardePinnacleActionContext.h => UP/UPActionContext.h} (96%)
 rename src/Ai/Dungeon/{UtgardePinnacle/Action/UtgardePinnacleActions.cpp => UP/UPActions.cpp} (98%)
 rename src/Ai/Dungeon/{UtgardePinnacle/Action/UtgardePinnacleActions.h => UP/UPActions.h} (94%)
 rename src/Ai/Dungeon/{UtgardePinnacle/Multiplier/UtgardePinnacleMultipliers.cpp => UP/UPMultipliers.cpp} (96%)
 rename src/Ai/Dungeon/{UtgardePinnacle/Multiplier/UtgardePinnacleMultipliers.h => UP/UPMultipliers.h} (100%)
 rename src/Ai/Dungeon/{UtgardePinnacle/Strategy/UtgardePinnacleStrategy.cpp => UP/UPStrategy.cpp} (92%)
 rename src/Ai/Dungeon/{UtgardePinnacle/Strategy/UtgardePinnacleStrategy.h => UP/UPStrategy.h} (100%)
 rename src/Ai/Dungeon/{UtgardePinnacle/UtgardePinnacleTriggerContext.h => UP/UPTriggerContext.h} (95%)
 rename src/Ai/Dungeon/{UtgardePinnacle/Trigger/UtgardePinnacleTriggers.cpp => UP/UPTriggers.cpp} (98%)
 rename src/Ai/Dungeon/{UtgardePinnacle/Trigger/UtgardePinnacleTriggers.h => UP/UPTriggers.h} (100%)
 rename src/Ai/Dungeon/{VioletHold/VioletHoldActionContext.h => VH/VHActionContext.h} (97%)
 rename src/Ai/Dungeon/{VioletHold/Action/VioletHoldActions.cpp => VH/VHActions.cpp} (98%)
 rename src/Ai/Dungeon/{VioletHold/Action/VioletHoldActions.h => VH/VHActions.h} (97%)
 rename src/Ai/Dungeon/{VioletHold/Multiplier/VioletHoldMultipliers.cpp => VH/VHMultipliers.cpp} (93%)
 rename src/Ai/Dungeon/{VioletHold/Multiplier/VioletHoldMultipliers.h => VH/VHMultipliers.h} (100%)
 rename src/Ai/Dungeon/{VioletHold/Strategy/VioletHoldStrategy.cpp => VH/VHStrategy.cpp} (95%)
 rename src/Ai/Dungeon/{VioletHold/Strategy/VioletHoldStrategy.h => VH/VHStrategy.h} (100%)
 rename src/Ai/Dungeon/{VioletHold/VioletHoldTriggerContext.h => VH/VHTriggerContext.h} (97%)
 rename src/Ai/Dungeon/{VioletHold/Trigger/VioletHoldTriggers.cpp => VH/VHTriggers.cpp} (97%)
 rename src/Ai/Dungeon/{VioletHold/Trigger/VioletHoldTriggers.h => VH/VHTriggers.h} (100%)
 rename src/Ai/Raid/Aq20/{RaidAq20ActionContext.h => Aq20ActionContext.h} (93%)
 rename src/Ai/Raid/Aq20/{Action/RaidAq20Actions.cpp => Aq20Actions.cpp} (97%)
 rename src/Ai/Raid/Aq20/{Action/RaidAq20Actions.h => Aq20Actions.h} (100%)
 rename src/Ai/Raid/Aq20/{Strategy/RaidAq20Strategy.cpp => Aq20Strategy.cpp} (88%)
 rename src/Ai/Raid/Aq20/{Strategy/RaidAq20Strategy.h => Aq20Strategy.h} (100%)
 rename src/Ai/Raid/Aq20/{RaidAq20TriggerContext.h => Aq20TriggerContext.h} (93%)
 rename src/Ai/Raid/Aq20/{Trigger/RaidAq20Triggers.cpp => Aq20Triggers.cpp} (96%)
 rename src/Ai/Raid/Aq20/{Trigger/RaidAq20Triggers.h => Aq20Triggers.h} (100%)
 rename src/Ai/Raid/Aq20/{Util/RaidAq20Utils.cpp => Aq20Utils.cpp} (97%)
 rename src/Ai/Raid/Aq20/{Util/RaidAq20Utils.h => Aq20Utils.h} (100%)
 rename src/Ai/Raid/{BlackTemple/RaidBlackTempleActionContext.h => BT/BTActionContext.h} (99%)
 rename src/Ai/Raid/{BlackTemple/Action/RaidBlackTempleActions.cpp => BT/BTActions.cpp} (99%)
 rename src/Ai/Raid/{BlackTemple/Action/RaidBlackTempleActions.h => BT/BTActions.h} (99%)
 rename src/Ai/Raid/{BlackTemple/Util/RaidBlackTempleHelpers.cpp => BT/BTHelpers.cpp} (99%)
 rename src/Ai/Raid/{BlackTemple/Util/RaidBlackTempleHelpers.h => BT/BTHelpers.h} (100%)
 rename src/Ai/Raid/{BlackTemple/Multiplier/RaidBlackTempleMultipliers.cpp => BT/BTMultipliers.cpp} (99%)
 rename src/Ai/Raid/{BlackTemple/Multiplier/RaidBlackTempleMultipliers.h => BT/BTMultipliers.h} (100%)
 rename src/Ai/Raid/{BlackTemple/Strategy/RaidBlackTempleStrategy.cpp => BT/BTStrategy.cpp} (99%)
 rename src/Ai/Raid/{BlackTemple/Strategy/RaidBlackTempleStrategy.h => BT/BTStrategy.h} (100%)
 rename src/Ai/Raid/{BlackTemple/RaidBlackTempleTriggerContext.h => BT/BTTriggerContext.h} (99%)
 rename src/Ai/Raid/{BlackTemple/Trigger/RaidBlackTempleTriggers.cpp => BT/BTTriggers.cpp} (99%)
 rename src/Ai/Raid/{BlackTemple/Trigger/RaidBlackTempleTriggers.h => BT/BTTriggers.h} (100%)
 rename src/Ai/Raid/{BlackwingLair/RaidBwlActionContext.h => BWL/BWLActionContext.h} (97%)
 rename src/Ai/Raid/{BlackwingLair/Action/RaidBwlActions.cpp => BWL/BWLActions.cpp} (95%)
 rename src/Ai/Raid/{BlackwingLair/Action/RaidBwlActions.h => BWL/BWLActions.h} (100%)
 rename src/Ai/Raid/{BlackwingLair/Util/RaidBwlHelpers.cpp => BWL/BWLHelpers.cpp} (91%)
 rename src/Ai/Raid/{BlackwingLair/Util/RaidBwlHelpers.h => BWL/BWLHelpers.h} (100%)
 rename src/Ai/Raid/{BlackwingLair/Strategy/RaidBwlStrategy.cpp => BWL/BWLStrategy.cpp} (96%)
 rename src/Ai/Raid/{BlackwingLair/Strategy/RaidBwlStrategy.h => BWL/BWLStrategy.h} (100%)
 rename src/Ai/Raid/{BlackwingLair/RaidBwlTriggerContext.h => BWL/BWLTriggerContext.h} (97%)
 rename src/Ai/Raid/{BlackwingLair/Trigger/RaidBwlTriggers.cpp => BWL/BWLTriggers.cpp} (94%)
 rename src/Ai/Raid/{BlackwingLair/Trigger/RaidBwlTriggers.h => BWL/BWLTriggers.h} (100%)
 rename src/Ai/Raid/{EyeOfEternity/RaidEoEActionContext.h => EoE/EoEActionContext.h} (97%)
 rename src/Ai/Raid/{EyeOfEternity/Action/RaidEoEActions.cpp => EoE/EoEActions.cpp} (99%)
 rename src/Ai/Raid/{EyeOfEternity/Action/RaidEoEActions.h => EoE/EoEActions.h} (100%)
 rename src/Ai/Raid/{EyeOfEternity/Multiplier/RaidEoEMultipliers.cpp => EoE/EoEMultipliers.cpp} (95%)
 rename src/Ai/Raid/{EyeOfEternity/Multiplier/RaidEoEMultipliers.h => EoE/EoEMultipliers.h} (100%)
 rename src/Ai/Raid/{EyeOfEternity/Strategy/RaidEoEStrategy.cpp => EoE/EoEStrategy.cpp} (91%)
 rename src/Ai/Raid/{EyeOfEternity/Strategy/RaidEoEStrategy.h => EoE/EoEStrategy.h} (100%)
 rename src/Ai/Raid/{EyeOfEternity/RaidEoETriggerContext.h => EoE/EoETriggerContext.h} (95%)
 rename src/Ai/Raid/{EyeOfEternity/Trigger/RaidEoETriggers.cpp => EoE/EoETriggers.cpp} (97%)
 rename src/Ai/Raid/{EyeOfEternity/Trigger/RaidEoETriggers.h => EoE/EoETriggers.h} (100%)
 rename src/Ai/Raid/{GruulsLair/RaidGruulsLairActionContext.h => Gruul/GruulActionContext.h} (99%)
 rename src/Ai/Raid/{GruulsLair/Action/RaidGruulsLairActions.cpp => Gruul/GruulActions.cpp} (99%)
 rename src/Ai/Raid/{GruulsLair/Action/RaidGruulsLairActions.h => Gruul/GruulActions.h} (100%)
 rename src/Ai/Raid/{GruulsLair/Util/RaidGruulsLairHelpers.cpp => Gruul/GruulHelpers.cpp} (99%)
 rename src/Ai/Raid/{GruulsLair/Util/RaidGruulsLairHelpers.h => Gruul/GruulHelpers.h} (100%)
 rename src/Ai/Raid/{GruulsLair/Multiplier/RaidGruulsLairMultipliers.cpp => Gruul/GruulMultipliers.cpp} (96%)
 rename src/Ai/Raid/{GruulsLair/Multiplier/RaidGruulsLairMultipliers.h => Gruul/GruulMultipliers.h} (100%)
 rename src/Ai/Raid/{GruulsLair/Strategy/RaidGruulsLairStrategy.cpp => Gruul/GruulStrategy.cpp} (97%)
 rename src/Ai/Raid/{GruulsLair/Strategy/RaidGruulsLairStrategy.h => Gruul/GruulStrategy.h} (100%)
 rename src/Ai/Raid/{GruulsLair/RaidGruulsLairTriggerContext.h => Gruul/GruulTriggerContext.h} (99%)
 rename src/Ai/Raid/{GruulsLair/Trigger/RaidGruulsLairTriggers.cpp => Gruul/GruulTriggers.cpp} (98%)
 rename src/Ai/Raid/{GruulsLair/Trigger/RaidGruulsLairTriggers.h => Gruul/GruulTriggers.h} (100%)
 rename src/Ai/Raid/{HyjalSummit/RaidHyjalSummitActionContext.h => Hyjal/HyjalActionContext.h} (99%)
 rename src/Ai/Raid/{HyjalSummit/Action/RaidHyjalSummitActions.cpp => Hyjal/HyjalActions.cpp} (99%)
 rename src/Ai/Raid/{HyjalSummit/Action/RaidHyjalSummitActions.h => Hyjal/HyjalActions.h} (100%)
 rename src/Ai/Raid/{HyjalSummit/Multiplier/RaidHyjalSummitMultipliers.cpp => Hyjal/HyjalMultipliers.cpp} (98%)
 rename src/Ai/Raid/{HyjalSummit/Multiplier/RaidHyjalSummitMultipliers.h => Hyjal/HyjalMultipliers.h} (100%)
 rename src/Ai/Raid/{HyjalSummit/Strategy/RaidHyjalSummitStrategy.cpp => Hyjal/HyjalStrategy.cpp} (98%)
 rename src/Ai/Raid/{HyjalSummit/Strategy/RaidHyjalSummitStrategy.h => Hyjal/HyjalStrategy.h} (100%)
 rename src/Ai/Raid/{HyjalSummit/RaidHyjalSummitTriggerContext.h => Hyjal/HyjalTriggerContext.h} (99%)
 rename src/Ai/Raid/{HyjalSummit/Trigger/RaidHyjalSummitTriggers.cpp => Hyjal/HyjalTriggers.cpp} (98%)
 rename src/Ai/Raid/{HyjalSummit/Trigger/RaidHyjalSummitTriggers.h => Hyjal/HyjalTriggers.h} (100%)
 rename src/Ai/Raid/{HyjalSummit/Util/RaidHyjalSummitHelpers.cpp => Hyjal/Util/HyjalHelpers.cpp} (99%)
 rename src/Ai/Raid/{HyjalSummit/Util/RaidHyjalSummitHelpers.h => Hyjal/Util/HyjalHelpers.h} (100%)
 rename src/Ai/Raid/{HyjalSummit/Util/RaidHyjalSummitScripts.cpp => Hyjal/Util/HyjalScripts.cpp} (99%)
 rename src/Ai/Raid/{Karazhan/RaidKarazhanActionContext.h => Kara/KaraActionContext.h} (99%)
 rename src/Ai/Raid/{Karazhan/Action/RaidKarazhanActions.cpp => Kara/KaraActions.cpp} (99%)
 rename src/Ai/Raid/{Karazhan/Action/RaidKarazhanActions.h => Kara/KaraActions.h} (100%)
 rename src/Ai/Raid/{Karazhan/Util/RaidKarazhanHelpers.cpp => Kara/KaraHelpers.cpp} (99%)
 rename src/Ai/Raid/{Karazhan/Util/RaidKarazhanHelpers.h => Kara/KaraHelpers.h} (100%)
 rename src/Ai/Raid/{Karazhan/Multiplier/RaidKarazhanMultipliers.cpp => Kara/KaraMultipliers.cpp} (99%)
 rename src/Ai/Raid/{Karazhan/Multiplier/RaidKarazhanMultipliers.h => Kara/KaraMultipliers.h} (100%)
 rename src/Ai/Raid/{Karazhan/Strategy/RaidKarazhanStrategy.cpp => Kara/KaraStrategy.cpp} (99%)
 rename src/Ai/Raid/{Karazhan/Strategy/RaidKarazhanStrategy.h => Kara/KaraStrategy.h} (100%)
 rename src/Ai/Raid/{Karazhan/RaidKarazhanTriggerContext.h => Kara/KaraTriggerContext.h} (99%)
 rename src/Ai/Raid/{Karazhan/Trigger/RaidKarazhanTriggers.cpp => Kara/KaraTriggers.cpp} (99%)
 rename src/Ai/Raid/{Karazhan/Trigger/RaidKarazhanTriggers.h => Kara/KaraTriggers.h} (100%)
 rename src/Ai/Raid/{MoltenCore/RaidMcActionContext.h => MC/MCActionContext.h} (99%)
 rename src/Ai/Raid/{MoltenCore/Action/RaidMcActions.cpp => MC/MCActions.cpp} (99%)
 rename src/Ai/Raid/{MoltenCore/Action/RaidMcActions.h => MC/MCActions.h} (100%)
 rename src/Ai/Raid/{MoltenCore/Util/RaidMcHelpers.h => MC/MCHelpers.h} (100%)
 rename src/Ai/Raid/{MoltenCore/Multiplier/RaidMcMultipliers.cpp => MC/MCMultipliers.cpp} (97%)
 rename src/Ai/Raid/{MoltenCore/Multiplier/RaidMcMultipliers.h => MC/MCMultipliers.h} (100%)
 rename src/Ai/Raid/{MoltenCore/Strategy/RaidMcStrategy.cpp => MC/MCStrategy.cpp} (98%)
 rename src/Ai/Raid/{MoltenCore/Strategy/RaidMcStrategy.h => MC/MCStrategy.h} (100%)
 rename src/Ai/Raid/{MoltenCore/RaidMcTriggerContext.h => MC/MCTriggerContext.h} (99%)
 rename src/Ai/Raid/{MoltenCore/Trigger/RaidMcTriggers.cpp => MC/MCTriggers.cpp} (95%)
 rename src/Ai/Raid/{MoltenCore/Trigger/RaidMcTriggers.h => MC/MCTriggers.h} (100%)
 rename src/Ai/Raid/{Magtheridon/RaidMagtheridonActionContext.h => Mag/MagActionContext.h} (98%)
 rename src/Ai/Raid/{Magtheridon/Action/RaidMagtheridonActions.cpp => Mag/MagActions.cpp} (99%)
 rename src/Ai/Raid/{Magtheridon/Action/RaidMagtheridonActions.h => Mag/MagActions.h} (98%)
 rename src/Ai/Raid/{Magtheridon/Util/RaidMagtheridonHelpers.cpp => Mag/MagHelpers.cpp} (99%)
 rename src/Ai/Raid/{Magtheridon/Util/RaidMagtheridonHelpers.h => Mag/MagHelpers.h} (100%)
 rename src/Ai/Raid/{Magtheridon/Multiplier/RaidMagtheridonMultipliers.cpp => Mag/MagMultipliers.cpp} (95%)
 rename src/Ai/Raid/{Magtheridon/Multiplier/RaidMagtheridonMultipliers.h => Mag/MagMultipliers.h} (100%)
 rename src/Ai/Raid/{Magtheridon/Strategy/RaidMagtheridonStrategy.cpp => Mag/MagStrategy.cpp} (96%)
 rename src/Ai/Raid/{Magtheridon/Strategy/RaidMagtheridonStrategy.h => Mag/MagStrategy.h} (100%)
 rename src/Ai/Raid/{Magtheridon/RaidMagtheridonTriggerContext.h => Mag/MagTriggerContext.h} (98%)
 rename src/Ai/Raid/{Magtheridon/Trigger/RaidMagtheridonTriggers.cpp => Mag/MagTriggers.cpp} (98%)
 rename src/Ai/Raid/{Magtheridon/Trigger/RaidMagtheridonTriggers.h => Mag/MagTriggers.h} (100%)
 rename src/Ai/Raid/{Naxxramas/Action/RaidNaxxActions.h => Naxx/Action/NaxxActions.h} (99%)
 rename src/Ai/Raid/{Naxxramas/Action/RaidNaxxActions_Anubrekhan.cpp => Naxx/Action/NaxxActions_Anubrekhan.cpp} (98%)
 rename src/Ai/Raid/{Naxxramas/Action/RaidNaxxActions_Faerlina.cpp => Naxx/Action/NaxxActions_Faerlina.cpp} (60%)
 rename src/Ai/Raid/{Naxxramas/Action/RaidNaxxActions_FourHorsemen.cpp => Naxx/Action/NaxxActions_FourHorsemen.cpp} (98%)
 rename src/Ai/Raid/{Naxxramas/Action/RaidNaxxActions_Gluth.cpp => Naxx/Action/NaxxActions_Gluth.cpp} (99%)
 rename src/Ai/Raid/{Naxxramas/Action/RaidNaxxActions_Gothik.cpp => Naxx/Action/NaxxActions_Gothik.cpp} (59%)
 rename src/Ai/Raid/{Naxxramas/Action/RaidNaxxActions_Grobbulus.cpp => Naxx/Action/NaxxActions_Grobbulus.cpp} (97%)
 rename src/Ai/Raid/{Naxxramas/Action/RaidNaxxActions_Heigan.cpp => Naxx/Action/NaxxActions_Heigan.cpp} (97%)
 rename src/Ai/Raid/{Naxxramas/Action/RaidNaxxActions_Kelthuzad.cpp => Naxx/Action/NaxxActions_Kelthuzad.cpp} (99%)
 rename src/Ai/Raid/{Naxxramas/Action/RaidNaxxActions_Loatheb.cpp => Naxx/Action/NaxxActions_Loatheb.cpp} (98%)
 rename src/Ai/Raid/{Naxxramas/Action/RaidNaxxActions_Maexxna.cpp => Naxx/Action/NaxxActions_Maexxna.cpp} (59%)
 rename src/Ai/Raid/{Naxxramas/Action/RaidNaxxActions_Noth.cpp => Naxx/Action/NaxxActions_Noth.cpp} (57%)
 rename src/Ai/Raid/{Naxxramas/Action/RaidNaxxActions_Patchwerk.cpp => Naxx/Action/NaxxActions_Patchwerk.cpp} (97%)
 rename src/Ai/Raid/{Naxxramas/Action/RaidNaxxActions_Razuvious.cpp => Naxx/Action/NaxxActions_Razuvious.cpp} (99%)
 rename src/Ai/Raid/{Naxxramas/Action/RaidNaxxActions_Sapphiron.cpp => Naxx/Action/NaxxActions_Sapphiron.cpp} (97%)
 rename src/Ai/Raid/{Naxxramas/Action/RaidNaxxActions_Shared.cpp => Naxx/Action/NaxxActions_Shared.cpp} (93%)
 rename src/Ai/Raid/{Naxxramas/Action/RaidNaxxActions_Thaddius.cpp => Naxx/Action/NaxxActions_Thaddius.cpp} (98%)
 rename src/Ai/Raid/{Naxxramas/RaidNaxxActionContext.h => Naxx/NaxxActionContext.h} (99%)
 rename src/Ai/Raid/{Naxxramas/Util/RaidNaxxBossHelper.h => Naxx/NaxxBossHelper.h} (99%)
 rename src/Ai/Raid/{Naxxramas/Multiplier/RaidNaxxMultipliers.cpp => Naxx/NaxxMultipliers.cpp} (99%)
 rename src/Ai/Raid/{Naxxramas/Multiplier/RaidNaxxMultipliers.h => Naxx/NaxxMultipliers.h} (98%)
 rename src/Ai/Raid/{Naxxramas/Util/RaidNaxxSpellIds.h => Naxx/NaxxSpellIds.h} (100%)
 rename src/Ai/Raid/{Naxxramas/Strategy/RaidNaxxStrategy.cpp => Naxx/NaxxStrategy.cpp} (98%)
 rename src/Ai/Raid/{Naxxramas/Strategy/RaidNaxxStrategy.h => Naxx/NaxxStrategy.h} (100%)
 rename src/Ai/Raid/{Naxxramas/RaidNaxxTriggerContext.h => Naxx/NaxxTriggerContext.h} (99%)
 rename src/Ai/Raid/{Naxxramas/Trigger/RaidNaxxTriggers.cpp => Naxx/NaxxTriggers.cpp} (99%)
 rename src/Ai/Raid/{Naxxramas/Trigger/RaidNaxxTriggers.h => Naxx/NaxxTriggers.h} (99%)
 rename src/Ai/Raid/{ObsidianSanctum/RaidOsActionContext.h => OS/OSActionContext.h} (98%)
 rename src/Ai/Raid/{ObsidianSanctum/Action/RaidOsActions.cpp => OS/OSActions.cpp} (99%)
 rename src/Ai/Raid/{ObsidianSanctum/Action/RaidOsActions.h => OS/OSActions.h} (100%)
 rename src/Ai/Raid/{ObsidianSanctum/Multiplier/RaidOsMultipliers.cpp => OS/OSMultipliers.cpp} (94%)
 rename src/Ai/Raid/{ObsidianSanctum/Multiplier/RaidOsMultipliers.h => OS/OSMultipliers.h} (100%)
 rename src/Ai/Raid/{ObsidianSanctum/Strategy/RaidOsStrategy.cpp => OS/OSStrategy.cpp} (95%)
 rename src/Ai/Raid/{ObsidianSanctum/Strategy/RaidOsStrategy.h => OS/OSStrategy.h} (100%)
 rename src/Ai/Raid/{ObsidianSanctum/RaidOsTriggerContext.h => OS/OSTriggerContext.h} (98%)
 rename src/Ai/Raid/{ObsidianSanctum/Trigger/RaidOsTriggers.cpp => OS/OSTriggers.cpp} (99%)
 rename src/Ai/Raid/{ObsidianSanctum/Trigger/RaidOsTriggers.h => OS/OSTriggers.h} (100%)
 rename src/Ai/Raid/{Onyxia/RaidOnyxiaActionContext.h => Ony/OnyActionContext.h} (97%)
 rename src/Ai/Raid/{Onyxia/Action/RaidOnyxiaActions.cpp => Ony/OnyActions.cpp} (99%)
 rename src/Ai/Raid/{Onyxia/Action/RaidOnyxiaActions.h => Ony/OnyActions.h} (100%)
 rename src/Ai/Raid/{Onyxia/Strategy/RaidOnyxiaStrategy.cpp => Ony/OnyStrategy.cpp} (96%)
 rename src/Ai/Raid/{Onyxia/Strategy/RaidOnyxiaStrategy.h => Ony/OnyStrategy.h} (100%)
 rename src/Ai/Raid/{Onyxia/RaidOnyxiaTriggerContext.h => Ony/OnyTriggerContext.h} (97%)
 rename src/Ai/Raid/{Onyxia/Trigger/RaidOnyxiaTriggers.cpp => Ony/OnyTriggers.cpp} (99%)
 rename src/Ai/Raid/{Onyxia/Trigger/RaidOnyxiaTriggers.h => Ony/OnyTriggers.h} (100%)
 rename src/Ai/Raid/{SerpentshrineCavern/RaidSSCActionContext.h => SSC/SSCActionContext.h} (99%)
 rename src/Ai/Raid/{SerpentshrineCavern/Action/RaidSSCActions.cpp => SSC/SSCActions.cpp} (99%)
 rename src/Ai/Raid/{SerpentshrineCavern/Action/RaidSSCActions.h => SSC/SSCActions.h} (100%)
 rename src/Ai/Raid/{SerpentshrineCavern/Util/RaidSSCHelpers.cpp => SSC/SSCHelpers.cpp} (99%)
 rename src/Ai/Raid/{SerpentshrineCavern/Util/RaidSSCHelpers.h => SSC/SSCHelpers.h} (100%)
 rename src/Ai/Raid/{SerpentshrineCavern/Multiplier/RaidSSCMultipliers.cpp => SSC/SSCMultipliers.cpp} (99%)
 rename src/Ai/Raid/{SerpentshrineCavern/Multiplier/RaidSSCMultipliers.h => SSC/SSCMultipliers.h} (100%)
 rename src/Ai/Raid/{SerpentshrineCavern/Strategy/RaidSSCStrategy.cpp => SSC/SSCStrategy.cpp} (99%)
 rename src/Ai/Raid/{SerpentshrineCavern/Strategy/RaidSSCStrategy.h => SSC/SSCStrategy.h} (100%)
 rename src/Ai/Raid/{SerpentshrineCavern/RaidSSCTriggerContext.h => SSC/SSCTriggerContext.h} (99%)
 rename src/Ai/Raid/{SerpentshrineCavern/Trigger/RaidSSCTriggers.cpp => SSC/SSCTriggers.cpp} (99%)
 rename src/Ai/Raid/{SerpentshrineCavern/Trigger/RaidSSCTriggers.h => SSC/SSCTriggers.h} (100%)
 rename src/Ai/Raid/{TempestKeep/RaidTempestKeepActionContext.h => TK/TKActionContext.h} (99%)
 rename src/Ai/Raid/{TempestKeep/Action/RaidTempestKeepActions.cpp => TK/TKActions.cpp} (99%)
 rename src/Ai/Raid/{TempestKeep/Action/RaidTempestKeepActions.h => TK/TKActions.h} (99%)
 rename src/Ai/Raid/{TempestKeep/Multiplier/RaidTempestKeepMultipliers.cpp => TK/TKMultipliers.cpp} (98%)
 rename src/Ai/Raid/{TempestKeep/Multiplier/RaidTempestKeepMultipliers.h => TK/TKMultipliers.h} (100%)
 rename src/Ai/Raid/{TempestKeep/Strategy/RaidTempestKeepStrategy.cpp => TK/TKStrategy.cpp} (99%)
 rename src/Ai/Raid/{TempestKeep/Strategy/RaidTempestKeepStrategy.h => TK/TKStrategy.h} (100%)
 rename src/Ai/Raid/{TempestKeep/RaidTempestKeepTriggerContext.h => TK/TKTriggerContext.h} (99%)
 rename src/Ai/Raid/{TempestKeep/Trigger/RaidTempestKeepTriggers.cpp => TK/TKTriggers.cpp} (99%)
 rename src/Ai/Raid/{TempestKeep/Trigger/RaidTempestKeepTriggers.h => TK/TKTriggers.h} (100%)
 rename src/Ai/Raid/{TempestKeep/Util/RaidTempestKeepHelpers.cpp => TK/Util/TKHelpers.cpp} (99%)
 rename src/Ai/Raid/{TempestKeep/Util/RaidTempestKeepHelpers.h => TK/Util/TKHelpers.h} (100%)
 rename src/Ai/Raid/{TempestKeep/Util/RaidTempestKeepKaelthasBossAI.h => TK/Util/TKKaelthasBossAI.h} (100%)
 rename src/Ai/Raid/{TempestKeep/Util/RaidTempestKeepScripts.cpp => TK/Util/TKScripts.cpp} (97%)
 rename src/Ai/Raid/{Ulduar/RaidUlduarActionContext.h => Uld/UldActionContext.h} (99%)
 rename src/Ai/Raid/{Ulduar/Action/RaidUlduarActions.cpp => Uld/UldActions.cpp} (99%)
 rename src/Ai/Raid/{Ulduar/Action/RaidUlduarActions.h => Uld/UldActions.h} (99%)
 rename src/Ai/Raid/{Ulduar/Strategy/RaidUlduarStrategy.cpp => Uld/UldStrategy.cpp} (99%)
 rename src/Ai/Raid/{Ulduar/Strategy/RaidUlduarStrategy.h => Uld/UldStrategy.h} (100%)
 rename src/Ai/Raid/{Ulduar/RaidUlduarTriggerContext.h => Uld/UldTriggerContext.h} (99%)
 rename src/Ai/Raid/{Ulduar/Trigger/RaidUlduarTriggers.cpp => Uld/UldTriggers.cpp} (99%)
 rename src/Ai/Raid/{Ulduar/Trigger/RaidUlduarTriggers.h => Uld/UldTriggers.h} (99%)
 rename src/Ai/Raid/{Ulduar/Util/RaidUlduarBossHelper.cpp => Uld/Util/UldBossHelper.cpp} (99%)
 rename src/Ai/Raid/{Ulduar/Util/RaidUlduarBossHelper.h => Uld/Util/UldBossHelper.h} (100%)
 rename src/Ai/Raid/{Ulduar/Util/RaidUlduarScripts.h => Uld/Util/UldScripts.h} (100%)
 rename src/Ai/Raid/{VaultOfArchavon/RaidVoAActionContext.h => VoA/VoAActionContext.h} (98%)
 rename src/Ai/Raid/{VaultOfArchavon/Action/RaidVoAActions.cpp => VoA/VoAActions.cpp} (99%)
 rename src/Ai/Raid/{VaultOfArchavon/Action/RaidVoAActions.h => VoA/VoAActions.h} (100%)
 rename src/Ai/Raid/{VaultOfArchavon/Strategy/RaidVoAStrategy.cpp => VoA/VoAStrategy.cpp} (97%)
 rename src/Ai/Raid/{VaultOfArchavon/Strategy/RaidVoAStrategy.h => VoA/VoAStrategy.h} (100%)
 rename src/Ai/Raid/{VaultOfArchavon/RaidVoATriggerContext.h => VoA/VoATriggerContext.h} (98%)
 rename src/Ai/Raid/{VaultOfArchavon/Trigger/RaidVoATriggers.cpp => VoA/VoATriggers.cpp} (99%)
 rename src/Ai/Raid/{VaultOfArchavon/Trigger/RaidVoATriggers.h => VoA/VoATriggers.h} (100%)
 rename src/Ai/Raid/{ZulAman/RaidZulAmanActionContext.h => ZA/ZAActionContext.h} (99%)
 rename src/Ai/Raid/{ZulAman/Action/RaidZulAmanActions.cpp => ZA/ZAActions.cpp} (99%)
 rename src/Ai/Raid/{ZulAman/Action/RaidZulAmanActions.h => ZA/ZAActions.h} (100%)
 rename src/Ai/Raid/{ZulAman/Util/RaidZulAmanHelpers.cpp => ZA/ZAHelpers.cpp} (99%)
 rename src/Ai/Raid/{ZulAman/Util/RaidZulAmanHelpers.h => ZA/ZAHelpers.h} (100%)
 rename src/Ai/Raid/{ZulAman/Multiplier/RaidZulAmanMultipliers.cpp => ZA/ZAMultipliers.cpp} (99%)
 rename src/Ai/Raid/{ZulAman/Multiplier/RaidZulAmanMultipliers.h => ZA/ZAMultipliers.h} (100%)
 rename src/Ai/Raid/{ZulAman/Strategy/RaidZulAmanStrategy.cpp => ZA/ZAStrategy.cpp} (98%)
 rename src/Ai/Raid/{ZulAman/Strategy/RaidZulAmanStrategy.h => ZA/ZAStrategy.h} (100%)
 rename src/Ai/Raid/{ZulAman/RaidZulAmanTriggerContext.h => ZA/ZATriggerContext.h} (99%)
 rename src/Ai/Raid/{ZulAman/Trigger/RaidZulAmanTriggers.cpp => ZA/ZATriggers.cpp} (98%)
 rename src/Ai/Raid/{ZulAman/Trigger/RaidZulAmanTriggers.h => ZA/ZATriggers.h} (100%)

diff --git a/src/Ai/Class/Dk/Action/DKActions.cpp b/src/Ai/Class/Dk/DKActions.cpp
similarity index 100%
rename from src/Ai/Class/Dk/Action/DKActions.cpp
rename to src/Ai/Class/Dk/DKActions.cpp
diff --git a/src/Ai/Class/Dk/Action/DKActions.h b/src/Ai/Class/Dk/DKActions.h
similarity index 100%
rename from src/Ai/Class/Dk/Action/DKActions.h
rename to src/Ai/Class/Dk/DKActions.h
diff --git a/src/Ai/Class/Dk/Trigger/DKTriggers.cpp b/src/Ai/Class/Dk/DKTriggers.cpp
similarity index 100%
rename from src/Ai/Class/Dk/Trigger/DKTriggers.cpp
rename to src/Ai/Class/Dk/DKTriggers.cpp
diff --git a/src/Ai/Class/Dk/Trigger/DKTriggers.h b/src/Ai/Class/Dk/DKTriggers.h
similarity index 100%
rename from src/Ai/Class/Dk/Trigger/DKTriggers.h
rename to src/Ai/Class/Dk/DKTriggers.h
diff --git a/src/Ai/Class/Druid/Trigger/DruidTriggers.cpp b/src/Ai/Class/Druid/DruidTriggers.cpp
similarity index 100%
rename from src/Ai/Class/Druid/Trigger/DruidTriggers.cpp
rename to src/Ai/Class/Druid/DruidTriggers.cpp
diff --git a/src/Ai/Class/Druid/Trigger/DruidTriggers.h b/src/Ai/Class/Druid/DruidTriggers.h
similarity index 100%
rename from src/Ai/Class/Druid/Trigger/DruidTriggers.h
rename to src/Ai/Class/Druid/DruidTriggers.h
diff --git a/src/Ai/Class/Hunter/Action/HunterActions.cpp b/src/Ai/Class/Hunter/HunterActions.cpp
similarity index 100%
rename from src/Ai/Class/Hunter/Action/HunterActions.cpp
rename to src/Ai/Class/Hunter/HunterActions.cpp
diff --git a/src/Ai/Class/Hunter/Action/HunterActions.h b/src/Ai/Class/Hunter/HunterActions.h
similarity index 100%
rename from src/Ai/Class/Hunter/Action/HunterActions.h
rename to src/Ai/Class/Hunter/HunterActions.h
diff --git a/src/Ai/Class/Hunter/Trigger/HunterTriggers.cpp b/src/Ai/Class/Hunter/HunterTriggers.cpp
similarity index 100%
rename from src/Ai/Class/Hunter/Trigger/HunterTriggers.cpp
rename to src/Ai/Class/Hunter/HunterTriggers.cpp
diff --git a/src/Ai/Class/Hunter/Trigger/HunterTriggers.h b/src/Ai/Class/Hunter/HunterTriggers.h
similarity index 100%
rename from src/Ai/Class/Hunter/Trigger/HunterTriggers.h
rename to src/Ai/Class/Hunter/HunterTriggers.h
diff --git a/src/Ai/Class/Mage/Action/MageActions.cpp b/src/Ai/Class/Mage/MageActions.cpp
similarity index 100%
rename from src/Ai/Class/Mage/Action/MageActions.cpp
rename to src/Ai/Class/Mage/MageActions.cpp
diff --git a/src/Ai/Class/Mage/Action/MageActions.h b/src/Ai/Class/Mage/MageActions.h
similarity index 100%
rename from src/Ai/Class/Mage/Action/MageActions.h
rename to src/Ai/Class/Mage/MageActions.h
diff --git a/src/Ai/Class/Mage/Trigger/MageTriggers.cpp b/src/Ai/Class/Mage/MageTriggers.cpp
similarity index 100%
rename from src/Ai/Class/Mage/Trigger/MageTriggers.cpp
rename to src/Ai/Class/Mage/MageTriggers.cpp
diff --git a/src/Ai/Class/Mage/Trigger/MageTriggers.h b/src/Ai/Class/Mage/MageTriggers.h
similarity index 100%
rename from src/Ai/Class/Mage/Trigger/MageTriggers.h
rename to src/Ai/Class/Mage/MageTriggers.h
diff --git a/src/Ai/Class/Paladin/Action/PaladinActions.cpp b/src/Ai/Class/Paladin/Actions/PaladinActions.cpp
similarity index 100%
rename from src/Ai/Class/Paladin/Action/PaladinActions.cpp
rename to src/Ai/Class/Paladin/Actions/PaladinActions.cpp
diff --git a/src/Ai/Class/Paladin/Action/PaladinActions.h b/src/Ai/Class/Paladin/Actions/PaladinActions.h
similarity index 100%
rename from src/Ai/Class/Paladin/Action/PaladinActions.h
rename to src/Ai/Class/Paladin/Actions/PaladinActions.h
diff --git a/src/Ai/Class/Paladin/Action/PaladinGreaterBlessingAction.cpp b/src/Ai/Class/Paladin/Actions/PaladinGreaterBlessingAction.cpp
similarity index 100%
rename from src/Ai/Class/Paladin/Action/PaladinGreaterBlessingAction.cpp
rename to src/Ai/Class/Paladin/Actions/PaladinGreaterBlessingAction.cpp
diff --git a/src/Ai/Class/Paladin/Action/PaladinGreaterBlessingAction.h b/src/Ai/Class/Paladin/Actions/PaladinGreaterBlessingAction.h
similarity index 100%
rename from src/Ai/Class/Paladin/Action/PaladinGreaterBlessingAction.h
rename to src/Ai/Class/Paladin/Actions/PaladinGreaterBlessingAction.h
diff --git a/src/Ai/Class/Paladin/Util/PaladinHelper.h b/src/Ai/Class/Paladin/PaladinHelper.h
similarity index 100%
rename from src/Ai/Class/Paladin/Util/PaladinHelper.h
rename to src/Ai/Class/Paladin/PaladinHelper.h
diff --git a/src/Ai/Class/Paladin/Trigger/PaladinTriggers.cpp b/src/Ai/Class/Paladin/PaladinTriggers.cpp
similarity index 100%
rename from src/Ai/Class/Paladin/Trigger/PaladinTriggers.cpp
rename to src/Ai/Class/Paladin/PaladinTriggers.cpp
diff --git a/src/Ai/Class/Paladin/Trigger/PaladinTriggers.h b/src/Ai/Class/Paladin/PaladinTriggers.h
similarity index 100%
rename from src/Ai/Class/Paladin/Trigger/PaladinTriggers.h
rename to src/Ai/Class/Paladin/PaladinTriggers.h
diff --git a/src/Ai/Class/Priest/Action/PriestActions.cpp b/src/Ai/Class/Priest/PriestActions.cpp
similarity index 100%
rename from src/Ai/Class/Priest/Action/PriestActions.cpp
rename to src/Ai/Class/Priest/PriestActions.cpp
diff --git a/src/Ai/Class/Priest/Action/PriestActions.h b/src/Ai/Class/Priest/PriestActions.h
similarity index 100%
rename from src/Ai/Class/Priest/Action/PriestActions.h
rename to src/Ai/Class/Priest/PriestActions.h
diff --git a/src/Ai/Class/Priest/Trigger/PriestTriggers.cpp b/src/Ai/Class/Priest/PriestTriggers.cpp
similarity index 100%
rename from src/Ai/Class/Priest/Trigger/PriestTriggers.cpp
rename to src/Ai/Class/Priest/PriestTriggers.cpp
diff --git a/src/Ai/Class/Priest/Trigger/PriestTriggers.h b/src/Ai/Class/Priest/PriestTriggers.h
similarity index 100%
rename from src/Ai/Class/Priest/Trigger/PriestTriggers.h
rename to src/Ai/Class/Priest/PriestTriggers.h
diff --git a/src/Ai/Class/Rogue/Trigger/RogueTriggers.cpp b/src/Ai/Class/Rogue/RogueTriggers.cpp
similarity index 100%
rename from src/Ai/Class/Rogue/Trigger/RogueTriggers.cpp
rename to src/Ai/Class/Rogue/RogueTriggers.cpp
diff --git a/src/Ai/Class/Rogue/Trigger/RogueTriggers.h b/src/Ai/Class/Rogue/RogueTriggers.h
similarity index 100%
rename from src/Ai/Class/Rogue/Trigger/RogueTriggers.h
rename to src/Ai/Class/Rogue/RogueTriggers.h
diff --git a/src/Ai/Class/Shaman/Action/ShamanActions.cpp b/src/Ai/Class/Shaman/ShamanActions.cpp
similarity index 100%
rename from src/Ai/Class/Shaman/Action/ShamanActions.cpp
rename to src/Ai/Class/Shaman/ShamanActions.cpp
diff --git a/src/Ai/Class/Shaman/Action/ShamanActions.h b/src/Ai/Class/Shaman/ShamanActions.h
similarity index 100%
rename from src/Ai/Class/Shaman/Action/ShamanActions.h
rename to src/Ai/Class/Shaman/ShamanActions.h
diff --git a/src/Ai/Class/Shaman/Trigger/ShamanTriggers.cpp b/src/Ai/Class/Shaman/ShamanTriggers.cpp
similarity index 100%
rename from src/Ai/Class/Shaman/Trigger/ShamanTriggers.cpp
rename to src/Ai/Class/Shaman/ShamanTriggers.cpp
diff --git a/src/Ai/Class/Shaman/Trigger/ShamanTriggers.h b/src/Ai/Class/Shaman/ShamanTriggers.h
similarity index 100%
rename from src/Ai/Class/Shaman/Trigger/ShamanTriggers.h
rename to src/Ai/Class/Shaman/ShamanTriggers.h
diff --git a/src/Ai/Class/Warlock/Action/WarlockActions.cpp b/src/Ai/Class/Warlock/WarlockActions.cpp
similarity index 100%
rename from src/Ai/Class/Warlock/Action/WarlockActions.cpp
rename to src/Ai/Class/Warlock/WarlockActions.cpp
diff --git a/src/Ai/Class/Warlock/Action/WarlockActions.h b/src/Ai/Class/Warlock/WarlockActions.h
similarity index 100%
rename from src/Ai/Class/Warlock/Action/WarlockActions.h
rename to src/Ai/Class/Warlock/WarlockActions.h
diff --git a/src/Ai/Class/Warlock/Trigger/WarlockTriggers.cpp b/src/Ai/Class/Warlock/WarlockTriggers.cpp
similarity index 100%
rename from src/Ai/Class/Warlock/Trigger/WarlockTriggers.cpp
rename to src/Ai/Class/Warlock/WarlockTriggers.cpp
diff --git a/src/Ai/Class/Warlock/Trigger/WarlockTriggers.h b/src/Ai/Class/Warlock/WarlockTriggers.h
similarity index 100%
rename from src/Ai/Class/Warlock/Trigger/WarlockTriggers.h
rename to src/Ai/Class/Warlock/WarlockTriggers.h
diff --git a/src/Ai/Class/Warrior/Action/WarriorActions.cpp b/src/Ai/Class/Warrior/WarriorActions.cpp
similarity index 100%
rename from src/Ai/Class/Warrior/Action/WarriorActions.cpp
rename to src/Ai/Class/Warrior/WarriorActions.cpp
diff --git a/src/Ai/Class/Warrior/Action/WarriorActions.h b/src/Ai/Class/Warrior/WarriorActions.h
similarity index 100%
rename from src/Ai/Class/Warrior/Action/WarriorActions.h
rename to src/Ai/Class/Warrior/WarriorActions.h
diff --git a/src/Ai/Class/Warrior/Trigger/WarriorTriggers.cpp b/src/Ai/Class/Warrior/WarriorTriggers.cpp
similarity index 100%
rename from src/Ai/Class/Warrior/Trigger/WarriorTriggers.cpp
rename to src/Ai/Class/Warrior/WarriorTriggers.cpp
diff --git a/src/Ai/Class/Warrior/Trigger/WarriorTriggers.h b/src/Ai/Class/Warrior/WarriorTriggers.h
similarity index 100%
rename from src/Ai/Class/Warrior/Trigger/WarriorTriggers.h
rename to src/Ai/Class/Warrior/WarriorTriggers.h
diff --git a/src/Ai/Dungeon/AuchenaiCrypts/AuchenaiCryptsActionContext.h b/src/Ai/Dungeon/AC/ACActionContext.h
similarity index 97%
rename from src/Ai/Dungeon/AuchenaiCrypts/AuchenaiCryptsActionContext.h
rename to src/Ai/Dungeon/AC/ACActionContext.h
index 4eea58716..40921e361 100644
--- a/src/Ai/Dungeon/AuchenaiCrypts/AuchenaiCryptsActionContext.h
+++ b/src/Ai/Dungeon/AC/ACActionContext.h
@@ -3,7 +3,7 @@
 
 #include "AiObjectContext.h"
 #include "Action.h"
-#include "AuchenaiCryptsActions.h"
+#include "ACActions.h"
 
 class TbcDungeonAuchenaiCryptsActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Dungeon/AuchenaiCrypts/Action/AuchenaiCryptsActions.cpp b/src/Ai/Dungeon/AC/ACActions.cpp
similarity index 98%
rename from src/Ai/Dungeon/AuchenaiCrypts/Action/AuchenaiCryptsActions.cpp
rename to src/Ai/Dungeon/AC/ACActions.cpp
index 2ec7907c7..a5646d877 100644
--- a/src/Ai/Dungeon/AuchenaiCrypts/Action/AuchenaiCryptsActions.cpp
+++ b/src/Ai/Dungeon/AC/ACActions.cpp
@@ -1,7 +1,7 @@
 #include "Playerbots.h"
 #include "AiFactory.h"
-#include "AuchenaiCryptsTriggers.h"
-#include "AuchenaiCryptsActions.h"
+#include "ACTriggers.h"
+#include "ACActions.h"
 
 // Shirrak the Dead Watcher
 
diff --git a/src/Ai/Dungeon/AuchenaiCrypts/Action/AuchenaiCryptsActions.h b/src/Ai/Dungeon/AC/ACActions.h
similarity index 96%
rename from src/Ai/Dungeon/AuchenaiCrypts/Action/AuchenaiCryptsActions.h
rename to src/Ai/Dungeon/AC/ACActions.h
index 4764efb65..50240ae0b 100644
--- a/src/Ai/Dungeon/AuchenaiCrypts/Action/AuchenaiCryptsActions.h
+++ b/src/Ai/Dungeon/AC/ACActions.h
@@ -3,7 +3,7 @@
 
 #include "AttackAction.h"
 #include "MovementActions.h"
-#include "AuchenaiCryptsTriggers.h"
+#include "ACTriggers.h"
 
 // Shirrak the Dead Watcher
 
diff --git a/src/Ai/Dungeon/AuchenaiCrypts/Multiplier/AuchenaiCryptsMultipliers.cpp b/src/Ai/Dungeon/AC/ACMultipliers.cpp
similarity index 92%
rename from src/Ai/Dungeon/AuchenaiCrypts/Multiplier/AuchenaiCryptsMultipliers.cpp
rename to src/Ai/Dungeon/AC/ACMultipliers.cpp
index 2f74a5a58..b457e9038 100644
--- a/src/Ai/Dungeon/AuchenaiCrypts/Multiplier/AuchenaiCryptsMultipliers.cpp
+++ b/src/Ai/Dungeon/AC/ACMultipliers.cpp
@@ -1,6 +1,6 @@
-#include "AuchenaiCryptsMultipliers.h"
-#include "AuchenaiCryptsActions.h"
-#include "AuchenaiCryptsTriggers.h"
+#include "ACMultipliers.h"
+#include "ACActions.h"
+#include "ACTriggers.h"
 #include "MovementActions.h"
 #include "ReachTargetActions.h"
 #include "FollowActions.h"
diff --git a/src/Ai/Dungeon/AuchenaiCrypts/Multiplier/AuchenaiCryptsMultipliers.h b/src/Ai/Dungeon/AC/ACMultipliers.h
similarity index 100%
rename from src/Ai/Dungeon/AuchenaiCrypts/Multiplier/AuchenaiCryptsMultipliers.h
rename to src/Ai/Dungeon/AC/ACMultipliers.h
diff --git a/src/Ai/Dungeon/AuchenaiCrypts/Strategy/AuchenaiCryptsStrategy.cpp b/src/Ai/Dungeon/AC/ACStrategy.cpp
similarity index 86%
rename from src/Ai/Dungeon/AuchenaiCrypts/Strategy/AuchenaiCryptsStrategy.cpp
rename to src/Ai/Dungeon/AC/ACStrategy.cpp
index f975d46bb..c19fe9d47 100644
--- a/src/Ai/Dungeon/AuchenaiCrypts/Strategy/AuchenaiCryptsStrategy.cpp
+++ b/src/Ai/Dungeon/AC/ACStrategy.cpp
@@ -1,6 +1,6 @@
-#include "AuchenaiCryptsTriggers.h"
-#include "AuchenaiCryptsStrategy.h"
-#include "AuchenaiCryptsMultipliers.h"
+#include "ACTriggers.h"
+#include "ACStrategy.h"
+#include "ACMultipliers.h"
 
 void TbcDungeonAuchenaiCryptsStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
diff --git a/src/Ai/Dungeon/AuchenaiCrypts/Strategy/AuchenaiCryptsStrategy.h b/src/Ai/Dungeon/AC/ACStrategy.h
similarity index 100%
rename from src/Ai/Dungeon/AuchenaiCrypts/Strategy/AuchenaiCryptsStrategy.h
rename to src/Ai/Dungeon/AC/ACStrategy.h
diff --git a/src/Ai/Dungeon/AuchenaiCrypts/AuchenaiCryptsTriggerContext.h b/src/Ai/Dungeon/AC/ACTriggerContext.h
similarity index 97%
rename from src/Ai/Dungeon/AuchenaiCrypts/AuchenaiCryptsTriggerContext.h
rename to src/Ai/Dungeon/AC/ACTriggerContext.h
index 95f15f16a..f9c7299b4 100644
--- a/src/Ai/Dungeon/AuchenaiCrypts/AuchenaiCryptsTriggerContext.h
+++ b/src/Ai/Dungeon/AC/ACTriggerContext.h
@@ -3,7 +3,7 @@
 
 #include "AiObjectContext.h"
 #include "TriggerContext.h"
-#include "AuchenaiCryptsTriggers.h"
+#include "ACTriggers.h"
 
 class TbcDungeonAuchenaiCryptsTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Dungeon/AuchenaiCrypts/Trigger/AuchenaiCryptsTriggers.cpp b/src/Ai/Dungeon/AC/ACTriggers.cpp
similarity index 96%
rename from src/Ai/Dungeon/AuchenaiCrypts/Trigger/AuchenaiCryptsTriggers.cpp
rename to src/Ai/Dungeon/AC/ACTriggers.cpp
index 372614d2f..38ddc9635 100644
--- a/src/Ai/Dungeon/AuchenaiCrypts/Trigger/AuchenaiCryptsTriggers.cpp
+++ b/src/Ai/Dungeon/AC/ACTriggers.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "AuchenaiCryptsTriggers.h"
+#include "ACTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Dungeon/AuchenaiCrypts/Trigger/AuchenaiCryptsTriggers.h b/src/Ai/Dungeon/AC/ACTriggers.h
similarity index 100%
rename from src/Ai/Dungeon/AuchenaiCrypts/Trigger/AuchenaiCryptsTriggers.h
rename to src/Ai/Dungeon/AC/ACTriggers.h
diff --git a/src/Ai/Dungeon/OldKingdom/OldKingdomActionContext.h b/src/Ai/Dungeon/AK/AKActionContext.h
similarity index 96%
rename from src/Ai/Dungeon/OldKingdom/OldKingdomActionContext.h
rename to src/Ai/Dungeon/AK/AKActionContext.h
index 19426c579..e462de443 100644
--- a/src/Ai/Dungeon/OldKingdom/OldKingdomActionContext.h
+++ b/src/Ai/Dungeon/AK/AKActionContext.h
@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "OldKingdomActions.h"
+#include "AKActions.h"
 
 class WotlkDungeonOKActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Dungeon/OldKingdom/Action/OldKingdomActions.cpp b/src/Ai/Dungeon/AK/AKActions.cpp
similarity index 98%
rename from src/Ai/Dungeon/OldKingdom/Action/OldKingdomActions.cpp
rename to src/Ai/Dungeon/AK/AKActions.cpp
index 8a5250a8d..edb80788c 100644
--- a/src/Ai/Dungeon/OldKingdom/Action/OldKingdomActions.cpp
+++ b/src/Ai/Dungeon/AK/AKActions.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "OldKingdomActions.h"
+#include "AKActions.h"
 
 bool AttackNadoxGuardianAction::Execute(Event /*event*/)
 {
diff --git a/src/Ai/Dungeon/OldKingdom/Action/OldKingdomActions.h b/src/Ai/Dungeon/AK/AKActions.h
similarity index 96%
rename from src/Ai/Dungeon/OldKingdom/Action/OldKingdomActions.h
rename to src/Ai/Dungeon/AK/AKActions.h
index cba518784..62223022c 100644
--- a/src/Ai/Dungeon/OldKingdom/Action/OldKingdomActions.h
+++ b/src/Ai/Dungeon/AK/AKActions.h
@@ -5,7 +5,7 @@
 #include "AttackAction.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "OldKingdomTriggers.h"
+#include "AKTriggers.h"
 
 class AttackNadoxGuardianAction : public AttackAction
 {
diff --git a/src/Ai/Dungeon/OldKingdom/Multiplier/OldKingdomMultipliers.cpp b/src/Ai/Dungeon/AK/AKMultipliers.cpp
similarity index 94%
rename from src/Ai/Dungeon/OldKingdom/Multiplier/OldKingdomMultipliers.cpp
rename to src/Ai/Dungeon/AK/AKMultipliers.cpp
index dbca52316..4c979cf54 100644
--- a/src/Ai/Dungeon/OldKingdom/Multiplier/OldKingdomMultipliers.cpp
+++ b/src/Ai/Dungeon/AK/AKMultipliers.cpp
@@ -1,9 +1,9 @@
-#include "OldKingdomMultipliers.h"
-#include "OldKingdomActions.h"
+#include "AKMultipliers.h"
+#include "AKActions.h"
 #include "GenericSpellActions.h"
 #include "ChooseTargetActions.h"
 #include "MovementActions.h"
-#include "OldKingdomTriggers.h"
+#include "AKTriggers.h"
 #include "Action.h"
 
 float ElderNadoxMultiplier::GetValue(Action* action)
diff --git a/src/Ai/Dungeon/OldKingdom/Multiplier/OldKingdomMultipliers.h b/src/Ai/Dungeon/AK/AKMultipliers.h
similarity index 100%
rename from src/Ai/Dungeon/OldKingdom/Multiplier/OldKingdomMultipliers.h
rename to src/Ai/Dungeon/AK/AKMultipliers.h
diff --git a/src/Ai/Dungeon/OldKingdom/Strategy/OldKingdomStrategy.cpp b/src/Ai/Dungeon/AK/AKStrategy.cpp
similarity index 95%
rename from src/Ai/Dungeon/OldKingdom/Strategy/OldKingdomStrategy.cpp
rename to src/Ai/Dungeon/AK/AKStrategy.cpp
index 484ea6ac4..181a6ef7a 100644
--- a/src/Ai/Dungeon/OldKingdom/Strategy/OldKingdomStrategy.cpp
+++ b/src/Ai/Dungeon/AK/AKStrategy.cpp
@@ -1,5 +1,5 @@
-#include "OldKingdomStrategy.h"
-#include "OldKingdomMultipliers.h"
+#include "AKStrategy.h"
+#include "AKMultipliers.h"
 
 void WotlkDungeonOKStrategy::InitTriggers(std::vector<TriggerNode*> &triggers)
 {
diff --git a/src/Ai/Dungeon/OldKingdom/Strategy/OldKingdomStrategy.h b/src/Ai/Dungeon/AK/AKStrategy.h
similarity index 100%
rename from src/Ai/Dungeon/OldKingdom/Strategy/OldKingdomStrategy.h
rename to src/Ai/Dungeon/AK/AKStrategy.h
diff --git a/src/Ai/Dungeon/OldKingdom/OldKingdomTriggerContext.h b/src/Ai/Dungeon/AK/AKTriggerContext.h
similarity index 96%
rename from src/Ai/Dungeon/OldKingdom/OldKingdomTriggerContext.h
rename to src/Ai/Dungeon/AK/AKTriggerContext.h
index 4c25b9a95..72d8e6076 100644
--- a/src/Ai/Dungeon/OldKingdom/OldKingdomTriggerContext.h
+++ b/src/Ai/Dungeon/AK/AKTriggerContext.h
@@ -3,7 +3,7 @@
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
-#include "OldKingdomTriggers.h"
+#include "AKTriggers.h"
 
 class WotlkDungeonOKTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Dungeon/OldKingdom/Trigger/OldKingdomTriggers.cpp b/src/Ai/Dungeon/AK/AKTriggers.cpp
similarity index 97%
rename from src/Ai/Dungeon/OldKingdom/Trigger/OldKingdomTriggers.cpp
rename to src/Ai/Dungeon/AK/AKTriggers.cpp
index 6b72f656a..9d945edc7 100644
--- a/src/Ai/Dungeon/OldKingdom/Trigger/OldKingdomTriggers.cpp
+++ b/src/Ai/Dungeon/AK/AKTriggers.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "OldKingdomTriggers.h"
+#include "AKTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Dungeon/OldKingdom/Trigger/OldKingdomTriggers.h b/src/Ai/Dungeon/AK/AKTriggers.h
similarity index 100%
rename from src/Ai/Dungeon/OldKingdom/Trigger/OldKingdomTriggers.h
rename to src/Ai/Dungeon/AK/AKTriggers.h
diff --git a/src/Ai/Dungeon/AzjolNerub/AzjolNerubActionContext.h b/src/Ai/Dungeon/AN/ANActionContext.h
similarity index 96%
rename from src/Ai/Dungeon/AzjolNerub/AzjolNerubActionContext.h
rename to src/Ai/Dungeon/AN/ANActionContext.h
index 6306643ba..11a5c4fe5 100644
--- a/src/Ai/Dungeon/AzjolNerub/AzjolNerubActionContext.h
+++ b/src/Ai/Dungeon/AN/ANActionContext.h
@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "AzjolNerubActions.h"
+#include "ANActions.h"
 
 class WotlkDungeonANActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Dungeon/AzjolNerub/Action/AzjolNerubActions.cpp b/src/Ai/Dungeon/AN/ANActions.cpp
similarity index 99%
rename from src/Ai/Dungeon/AzjolNerub/Action/AzjolNerubActions.cpp
rename to src/Ai/Dungeon/AN/ANActions.cpp
index 42026cecf..985ab473e 100644
--- a/src/Ai/Dungeon/AzjolNerub/Action/AzjolNerubActions.cpp
+++ b/src/Ai/Dungeon/AN/ANActions.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "AzjolNerubActions.h"
+#include "ANActions.h"
 
 bool AttackWebWrapAction::isUseful() { return !botAI->IsHeal(bot); }
 bool AttackWebWrapAction::Execute(Event /*event*/)
diff --git a/src/Ai/Dungeon/AzjolNerub/Action/AzjolNerubActions.h b/src/Ai/Dungeon/AN/ANActions.h
similarity index 96%
rename from src/Ai/Dungeon/AzjolNerub/Action/AzjolNerubActions.h
rename to src/Ai/Dungeon/AN/ANActions.h
index ef388cbdb..69bcc15b7 100644
--- a/src/Ai/Dungeon/AzjolNerub/Action/AzjolNerubActions.h
+++ b/src/Ai/Dungeon/AN/ANActions.h
@@ -5,7 +5,7 @@
 #include "AttackAction.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "AzjolNerubTriggers.h"
+#include "ANTriggers.h"
 
 class AttackWebWrapAction : public AttackAction
 {
diff --git a/src/Ai/Dungeon/AzjolNerub/Multiplier/AzjolNerubMultipliers.cpp b/src/Ai/Dungeon/AN/ANMultipliers.cpp
similarity index 93%
rename from src/Ai/Dungeon/AzjolNerub/Multiplier/AzjolNerubMultipliers.cpp
rename to src/Ai/Dungeon/AN/ANMultipliers.cpp
index 6cd6673dc..035f64bb1 100644
--- a/src/Ai/Dungeon/AzjolNerub/Multiplier/AzjolNerubMultipliers.cpp
+++ b/src/Ai/Dungeon/AN/ANMultipliers.cpp
@@ -1,9 +1,9 @@
-#include "AzjolNerubMultipliers.h"
-#include "AzjolNerubActions.h"
+#include "ANMultipliers.h"
+#include "ANActions.h"
 #include "GenericSpellActions.h"
 #include "ChooseTargetActions.h"
 #include "MovementActions.h"
-#include "AzjolNerubTriggers.h"
+#include "ANTriggers.h"
 #include "Action.h"
 
 float KrikthirMultiplier::GetValue(Action* action)
diff --git a/src/Ai/Dungeon/AzjolNerub/Multiplier/AzjolNerubMultipliers.h b/src/Ai/Dungeon/AN/ANMultipliers.h
similarity index 100%
rename from src/Ai/Dungeon/AzjolNerub/Multiplier/AzjolNerubMultipliers.h
rename to src/Ai/Dungeon/AN/ANMultipliers.h
diff --git a/src/Ai/Dungeon/AzjolNerub/Strategy/AzjolNerubStrategy.cpp b/src/Ai/Dungeon/AN/ANStrategy.cpp
similarity index 94%
rename from src/Ai/Dungeon/AzjolNerub/Strategy/AzjolNerubStrategy.cpp
rename to src/Ai/Dungeon/AN/ANStrategy.cpp
index dbbb8f5bf..7353e9499 100644
--- a/src/Ai/Dungeon/AzjolNerub/Strategy/AzjolNerubStrategy.cpp
+++ b/src/Ai/Dungeon/AN/ANStrategy.cpp
@@ -1,5 +1,5 @@
-#include "AzjolNerubStrategy.h"
-#include "AzjolNerubMultipliers.h"
+#include "ANStrategy.h"
+#include "ANMultipliers.h"
 
 void WotlkDungeonANStrategy::InitTriggers(std::vector<TriggerNode*> &triggers)
 {
diff --git a/src/Ai/Dungeon/AzjolNerub/Strategy/AzjolNerubStrategy.h b/src/Ai/Dungeon/AN/ANStrategy.h
similarity index 100%
rename from src/Ai/Dungeon/AzjolNerub/Strategy/AzjolNerubStrategy.h
rename to src/Ai/Dungeon/AN/ANStrategy.h
diff --git a/src/Ai/Dungeon/AzjolNerub/AzjolNerubTriggerContext.h b/src/Ai/Dungeon/AN/ANTriggerContext.h
similarity index 97%
rename from src/Ai/Dungeon/AzjolNerub/AzjolNerubTriggerContext.h
rename to src/Ai/Dungeon/AN/ANTriggerContext.h
index a41cebfc6..95131501d 100644
--- a/src/Ai/Dungeon/AzjolNerub/AzjolNerubTriggerContext.h
+++ b/src/Ai/Dungeon/AN/ANTriggerContext.h
@@ -3,7 +3,7 @@
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
-#include "AzjolNerubTriggers.h"
+#include "ANTriggers.h"
 
 class WotlkDungeonANTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Dungeon/AzjolNerub/Trigger/AzjolNerubTriggers.cpp b/src/Ai/Dungeon/AN/ANTriggers.cpp
similarity index 98%
rename from src/Ai/Dungeon/AzjolNerub/Trigger/AzjolNerubTriggers.cpp
rename to src/Ai/Dungeon/AN/ANTriggers.cpp
index f9ef4ff95..c9bbde463 100644
--- a/src/Ai/Dungeon/AzjolNerub/Trigger/AzjolNerubTriggers.cpp
+++ b/src/Ai/Dungeon/AN/ANTriggers.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "AzjolNerubTriggers.h"
+#include "ANTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Dungeon/AzjolNerub/Trigger/AzjolNerubTriggers.h b/src/Ai/Dungeon/AN/ANTriggers.h
similarity index 100%
rename from src/Ai/Dungeon/AzjolNerub/Trigger/AzjolNerubTriggers.h
rename to src/Ai/Dungeon/AN/ANTriggers.h
diff --git a/src/Ai/Dungeon/CullingOfStratholme/CullingOfStratholmeActionContext.h b/src/Ai/Dungeon/CoS/CoSActionContext.h
similarity index 94%
rename from src/Ai/Dungeon/CullingOfStratholme/CullingOfStratholmeActionContext.h
rename to src/Ai/Dungeon/CoS/CoSActionContext.h
index 0e12c908c..782c0202b 100644
--- a/src/Ai/Dungeon/CullingOfStratholme/CullingOfStratholmeActionContext.h
+++ b/src/Ai/Dungeon/CoS/CoSActionContext.h
@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "CullingOfStratholmeActions.h"
+#include "CoSActions.h"
 
 class WotlkDungeonCoSActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Dungeon/CullingOfStratholme/Action/CullingOfStratholmeActions.cpp b/src/Ai/Dungeon/CoS/CoSActions.cpp
similarity index 97%
rename from src/Ai/Dungeon/CullingOfStratholme/Action/CullingOfStratholmeActions.cpp
rename to src/Ai/Dungeon/CoS/CoSActions.cpp
index b2732c3cf..91b76b51b 100644
--- a/src/Ai/Dungeon/CullingOfStratholme/Action/CullingOfStratholmeActions.cpp
+++ b/src/Ai/Dungeon/CoS/CoSActions.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "CullingOfStratholmeActions.h"
+#include "CoSActions.h"
 
 bool ExplodeGhoulSpreadAction::Execute(Event /*event*/)
 {
diff --git a/src/Ai/Dungeon/CullingOfStratholme/Action/CullingOfStratholmeActions.h b/src/Ai/Dungeon/CoS/CoSActions.h
similarity index 93%
rename from src/Ai/Dungeon/CullingOfStratholme/Action/CullingOfStratholmeActions.h
rename to src/Ai/Dungeon/CoS/CoSActions.h
index 989cb6ab0..98ece6eb5 100644
--- a/src/Ai/Dungeon/CullingOfStratholme/Action/CullingOfStratholmeActions.h
+++ b/src/Ai/Dungeon/CoS/CoSActions.h
@@ -6,7 +6,7 @@
 #include "GenericSpellActions.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "CullingOfStratholmeTriggers.h"
+#include "CoSTriggers.h"
 
 class ExplodeGhoulSpreadAction : public MovementAction
 {
diff --git a/src/Ai/Dungeon/CullingOfStratholme/Multiplier/CullingOfStratholmeMultipliers.cpp b/src/Ai/Dungeon/CoS/CoSMultipliers.cpp
similarity index 76%
rename from src/Ai/Dungeon/CullingOfStratholme/Multiplier/CullingOfStratholmeMultipliers.cpp
rename to src/Ai/Dungeon/CoS/CoSMultipliers.cpp
index 1fbbc6b3e..9a5852f48 100644
--- a/src/Ai/Dungeon/CullingOfStratholme/Multiplier/CullingOfStratholmeMultipliers.cpp
+++ b/src/Ai/Dungeon/CoS/CoSMultipliers.cpp
@@ -1,9 +1,9 @@
-#include "CullingOfStratholmeMultipliers.h"
-#include "CullingOfStratholmeActions.h"
+#include "CoSMultipliers.h"
+#include "CoSActions.h"
 #include "GenericSpellActions.h"
 #include "ChooseTargetActions.h"
 #include "MovementActions.h"
-#include "CullingOfStratholmeTriggers.h"
+#include "CoSTriggers.h"
 #include "Action.h"
 
 float EpochMultiplier::GetValue(Action* action)
diff --git a/src/Ai/Dungeon/CullingOfStratholme/Multiplier/CullingOfStratholmeMultipliers.h b/src/Ai/Dungeon/CoS/CoSMultipliers.h
similarity index 100%
rename from src/Ai/Dungeon/CullingOfStratholme/Multiplier/CullingOfStratholmeMultipliers.h
rename to src/Ai/Dungeon/CoS/CoSMultipliers.h
diff --git a/src/Ai/Dungeon/CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.cpp b/src/Ai/Dungeon/CoS/CoSStrategy.cpp
similarity index 90%
rename from src/Ai/Dungeon/CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.cpp
rename to src/Ai/Dungeon/CoS/CoSStrategy.cpp
index 90765bded..f51a35255 100644
--- a/src/Ai/Dungeon/CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.cpp
+++ b/src/Ai/Dungeon/CoS/CoSStrategy.cpp
@@ -1,5 +1,5 @@
-#include "CullingOfStratholmeStrategy.h"
-#include "CullingOfStratholmeMultipliers.h"
+#include "CoSStrategy.h"
+#include "CoSMultipliers.h"
 
 void WotlkDungeonCoSStrategy::InitTriggers(std::vector<TriggerNode*> &triggers)
 {
diff --git a/src/Ai/Dungeon/CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.h b/src/Ai/Dungeon/CoS/CoSStrategy.h
similarity index 100%
rename from src/Ai/Dungeon/CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.h
rename to src/Ai/Dungeon/CoS/CoSStrategy.h
diff --git a/src/Ai/Dungeon/CullingOfStratholme/CullingOfStratholmeTriggerContext.h b/src/Ai/Dungeon/CoS/CoSTriggerContext.h
similarity index 94%
rename from src/Ai/Dungeon/CullingOfStratholme/CullingOfStratholmeTriggerContext.h
rename to src/Ai/Dungeon/CoS/CoSTriggerContext.h
index 6e35eac85..302d99381 100644
--- a/src/Ai/Dungeon/CullingOfStratholme/CullingOfStratholmeTriggerContext.h
+++ b/src/Ai/Dungeon/CoS/CoSTriggerContext.h
@@ -3,7 +3,7 @@
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
-#include "CullingOfStratholmeTriggers.h"
+#include "CoSTriggers.h"
 
 class WotlkDungeonCoSTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Dungeon/CullingOfStratholme/Trigger/CullingOfStratholmeTriggers.cpp b/src/Ai/Dungeon/CoS/CoSTriggers.cpp
similarity index 95%
rename from src/Ai/Dungeon/CullingOfStratholme/Trigger/CullingOfStratholmeTriggers.cpp
rename to src/Ai/Dungeon/CoS/CoSTriggers.cpp
index cb67ad077..60b195a8c 100644
--- a/src/Ai/Dungeon/CullingOfStratholme/Trigger/CullingOfStratholmeTriggers.cpp
+++ b/src/Ai/Dungeon/CoS/CoSTriggers.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "CullingOfStratholmeTriggers.h"
+#include "CoSTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Dungeon/CullingOfStratholme/Trigger/CullingOfStratholmeTriggers.h b/src/Ai/Dungeon/CoS/CoSTriggers.h
similarity index 100%
rename from src/Ai/Dungeon/CullingOfStratholme/Trigger/CullingOfStratholmeTriggers.h
rename to src/Ai/Dungeon/CoS/CoSTriggers.h
diff --git a/src/Ai/Dungeon/DraktharonKeep/DrakTharonKeepActionContext.h b/src/Ai/Dungeon/DTK/DTKActionContext.h
similarity index 98%
rename from src/Ai/Dungeon/DraktharonKeep/DrakTharonKeepActionContext.h
rename to src/Ai/Dungeon/DTK/DTKActionContext.h
index 1435eedbe..61c163292 100644
--- a/src/Ai/Dungeon/DraktharonKeep/DrakTharonKeepActionContext.h
+++ b/src/Ai/Dungeon/DTK/DTKActionContext.h
@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "DrakTharonKeepActions.h"
+#include "DTKActions.h"
 
 class WotlkDungeonDTKActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Dungeon/DraktharonKeep/Action/DrakTharonKeepActions.cpp b/src/Ai/Dungeon/DTK/DTKActions.cpp
similarity index 99%
rename from src/Ai/Dungeon/DraktharonKeep/Action/DrakTharonKeepActions.cpp
rename to src/Ai/Dungeon/DTK/DTKActions.cpp
index 07e23699e..52258a601 100644
--- a/src/Ai/Dungeon/DraktharonKeep/Action/DrakTharonKeepActions.cpp
+++ b/src/Ai/Dungeon/DTK/DTKActions.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "DrakTharonKeepActions.h"
+#include "DTKActions.h"
 
 bool CorpseExplodeSpreadAction::Execute(Event /*event*/)
 {
diff --git a/src/Ai/Dungeon/DraktharonKeep/Action/DrakTharonKeepActions.h b/src/Ai/Dungeon/DTK/DTKActions.h
similarity index 98%
rename from src/Ai/Dungeon/DraktharonKeep/Action/DrakTharonKeepActions.h
rename to src/Ai/Dungeon/DTK/DTKActions.h
index 8c59a7c24..5eaca264a 100644
--- a/src/Ai/Dungeon/DraktharonKeep/Action/DrakTharonKeepActions.h
+++ b/src/Ai/Dungeon/DTK/DTKActions.h
@@ -6,7 +6,7 @@
 #include "GenericSpellActions.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "DrakTharonKeepTriggers.h"
+#include "DTKTriggers.h"
 
 const Position NOVOS_PARTY_POSITION = Position(-378.852f, -760.349f, 28.587f);
 
diff --git a/src/Ai/Dungeon/DraktharonKeep/Multiplier/DrakTharonKeepMultipliers.cpp b/src/Ai/Dungeon/DTK/DTKMultipliers.cpp
similarity index 93%
rename from src/Ai/Dungeon/DraktharonKeep/Multiplier/DrakTharonKeepMultipliers.cpp
rename to src/Ai/Dungeon/DTK/DTKMultipliers.cpp
index 8fd119dc4..866a5c602 100644
--- a/src/Ai/Dungeon/DraktharonKeep/Multiplier/DrakTharonKeepMultipliers.cpp
+++ b/src/Ai/Dungeon/DTK/DTKMultipliers.cpp
@@ -1,9 +1,9 @@
-#include "DrakTharonKeepMultipliers.h"
-#include "DrakTharonKeepActions.h"
+#include "DTKMultipliers.h"
+#include "DTKActions.h"
 #include "GenericSpellActions.h"
 #include "ChooseTargetActions.h"
 #include "MovementActions.h"
-#include "DrakTharonKeepTriggers.h"
+#include "DTKTriggers.h"
 #include "Action.h"
 
 float NovosMultiplier::GetValue(Action* action)
diff --git a/src/Ai/Dungeon/DraktharonKeep/Multiplier/DrakTharonKeepMultipliers.h b/src/Ai/Dungeon/DTK/DTKMultipliers.h
similarity index 100%
rename from src/Ai/Dungeon/DraktharonKeep/Multiplier/DrakTharonKeepMultipliers.h
rename to src/Ai/Dungeon/DTK/DTKMultipliers.h
diff --git a/src/Ai/Dungeon/DraktharonKeep/Strategy/DrakTharonKeepStrategy.cpp b/src/Ai/Dungeon/DTK/DTKStrategy.cpp
similarity index 95%
rename from src/Ai/Dungeon/DraktharonKeep/Strategy/DrakTharonKeepStrategy.cpp
rename to src/Ai/Dungeon/DTK/DTKStrategy.cpp
index 791a0ea71..96590672c 100644
--- a/src/Ai/Dungeon/DraktharonKeep/Strategy/DrakTharonKeepStrategy.cpp
+++ b/src/Ai/Dungeon/DTK/DTKStrategy.cpp
@@ -1,5 +1,5 @@
-#include "DrakTharonKeepStrategy.h"
-#include "DrakTharonKeepMultipliers.h"
+#include "DTKStrategy.h"
+#include "DTKMultipliers.h"
 
 void WotlkDungeonDTKStrategy::InitTriggers(std::vector<TriggerNode*> &triggers)
 {
diff --git a/src/Ai/Dungeon/DraktharonKeep/Strategy/DrakTharonKeepStrategy.h b/src/Ai/Dungeon/DTK/DTKStrategy.h
similarity index 100%
rename from src/Ai/Dungeon/DraktharonKeep/Strategy/DrakTharonKeepStrategy.h
rename to src/Ai/Dungeon/DTK/DTKStrategy.h
diff --git a/src/Ai/Dungeon/DraktharonKeep/DrakTharonKeepTriggerContext.h b/src/Ai/Dungeon/DTK/DTKTriggerContext.h
similarity index 97%
rename from src/Ai/Dungeon/DraktharonKeep/DrakTharonKeepTriggerContext.h
rename to src/Ai/Dungeon/DTK/DTKTriggerContext.h
index ff7739107..954c1da05 100644
--- a/src/Ai/Dungeon/DraktharonKeep/DrakTharonKeepTriggerContext.h
+++ b/src/Ai/Dungeon/DTK/DTKTriggerContext.h
@@ -3,7 +3,7 @@
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
-#include "DrakTharonKeepTriggers.h"
+#include "DTKTriggers.h"
 
 class WotlkDungeonDTKTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Dungeon/DraktharonKeep/Trigger/DrakTharonKeepTriggers.cpp b/src/Ai/Dungeon/DTK/DTKTriggers.cpp
similarity index 97%
rename from src/Ai/Dungeon/DraktharonKeep/Trigger/DrakTharonKeepTriggers.cpp
rename to src/Ai/Dungeon/DTK/DTKTriggers.cpp
index 406f4d433..9af9cccb4 100644
--- a/src/Ai/Dungeon/DraktharonKeep/Trigger/DrakTharonKeepTriggers.cpp
+++ b/src/Ai/Dungeon/DTK/DTKTriggers.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "DrakTharonKeepTriggers.h"
+#include "DTKTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Dungeon/DraktharonKeep/Trigger/DrakTharonKeepTriggers.h b/src/Ai/Dungeon/DTK/DTKTriggers.h
similarity index 100%
rename from src/Ai/Dungeon/DraktharonKeep/Trigger/DrakTharonKeepTriggers.h
rename to src/Ai/Dungeon/DTK/DTKTriggers.h
diff --git a/src/Ai/Dungeon/DungeonStrategyContext.h b/src/Ai/Dungeon/DungeonStrategyContext.h
index 07e5fe505..e2365ea75 100644
--- a/src/Ai/Dungeon/DungeonStrategyContext.h
+++ b/src/Ai/Dungeon/DungeonStrategyContext.h
@@ -2,22 +2,22 @@
 #define _PLAYERBOT_DUNGEONSTRATEGYCONTEXT_H
 
 #include "Strategy.h"
-#include "AuchenaiCrypts/Strategy/AuchenaiCryptsStrategy.h"
-#include "UtgardeKeep/Strategy/UtgardeKeepStrategy.h"
-#include "Nexus/Strategy/NexusStrategy.h"
-#include "AzjolNerub/Strategy/AzjolNerubStrategy.h"
-#include "OldKingdom/Strategy/OldKingdomStrategy.h"
-#include "DraktharonKeep/Strategy/DrakTharonKeepStrategy.h"
-#include "VioletHold/Strategy/VioletHoldStrategy.h"
-#include "Gundrak/Strategy/GundrakStrategy.h"
-#include "HallsOfStone/Strategy/HallsOfStoneStrategy.h"
-#include "HallsOfLightning/Strategy/HallsOfLightningStrategy.h"
-#include "Oculus/Strategy/OculusStrategy.h"
-#include "UtgardePinnacle/Strategy/UtgardePinnacleStrategy.h"
-#include "CullingOfStratholme/Strategy/CullingOfStratholmeStrategy.h"
-#include "ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.h"
-#include "PitOfSaron/Strategy/PitOfSaronStrategy.h"
-#include "TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.h"
+#include "ACStrategy.h"
+#include "UKStrategy.h"
+#include "NexStrategy.h"
+#include "ANStrategy.h"
+#include "AKStrategy.h"
+#include "DTKStrategy.h"
+#include "VHStrategy.h"
+#include "GDStrategy.h"
+#include "HoSStrategy.h"
+#include "HoLStrategy.h"
+#include "OCStrategy.h"
+#include "UPStrategy.h"
+#include "CoSStrategy.h"
+#include "FoSStrategy.h"
+#include "PoSStrategy.h"
+#include "TOCStrategy.h"
 
 /*
 Full list/TODO:
diff --git a/src/Ai/Dungeon/ForgeOfSouls/ForgeOfSoulsActionContext.h b/src/Ai/Dungeon/FoS/FoSActionContext.h
similarity index 97%
rename from src/Ai/Dungeon/ForgeOfSouls/ForgeOfSoulsActionContext.h
rename to src/Ai/Dungeon/FoS/FoSActionContext.h
index 4797b69c1..1a87e2647 100644
--- a/src/Ai/Dungeon/ForgeOfSouls/ForgeOfSoulsActionContext.h
+++ b/src/Ai/Dungeon/FoS/FoSActionContext.h
@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "ForgeOfSoulsActions.h"
+#include "FoSActions.h"
 
 class WotlkDungeonFoSActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Dungeon/ForgeOfSouls/Action/ForgeOfSoulsActions.cpp b/src/Ai/Dungeon/FoS/FoSActions.cpp
similarity index 99%
rename from src/Ai/Dungeon/ForgeOfSouls/Action/ForgeOfSoulsActions.cpp
rename to src/Ai/Dungeon/FoS/FoSActions.cpp
index cb29453e0..34c377dff 100644
--- a/src/Ai/Dungeon/ForgeOfSouls/Action/ForgeOfSoulsActions.cpp
+++ b/src/Ai/Dungeon/FoS/FoSActions.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "ForgeOfSoulsActions.h"
+#include "FoSActions.h"
 
 bool MoveFromBronjahmAction::Execute(Event /*event*/)
 {
diff --git a/src/Ai/Dungeon/ForgeOfSouls/Action/ForgeOfSoulsActions.h b/src/Ai/Dungeon/FoS/FoSActions.h
similarity index 97%
rename from src/Ai/Dungeon/ForgeOfSouls/Action/ForgeOfSoulsActions.h
rename to src/Ai/Dungeon/FoS/FoSActions.h
index d9b762be6..f91c93a21 100644
--- a/src/Ai/Dungeon/ForgeOfSouls/Action/ForgeOfSoulsActions.h
+++ b/src/Ai/Dungeon/FoS/FoSActions.h
@@ -5,7 +5,7 @@
 #include "AttackAction.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "ForgeOfSoulsTriggers.h"
+#include "FoSTriggers.h"
 
 const Position BRONJAHM_TANK_POSITION = Position(5297.920f, 2506.698f, 686.068f);
 
diff --git a/src/Ai/Dungeon/ForgeOfSouls/Multiplier/ForgeOfSoulsMultipliers.cpp b/src/Ai/Dungeon/FoS/FoSMultipliers.cpp
similarity index 88%
rename from src/Ai/Dungeon/ForgeOfSouls/Multiplier/ForgeOfSoulsMultipliers.cpp
rename to src/Ai/Dungeon/FoS/FoSMultipliers.cpp
index 7873e7c1d..ceed84ea7 100644
--- a/src/Ai/Dungeon/ForgeOfSouls/Multiplier/ForgeOfSoulsMultipliers.cpp
+++ b/src/Ai/Dungeon/FoS/FoSMultipliers.cpp
@@ -1,10 +1,10 @@
-#include "ForgeOfSoulsMultipliers.h"
-#include "ForgeOfSoulsActions.h"
+#include "FoSMultipliers.h"
+#include "FoSActions.h"
 #include "GenericSpellActions.h"
 #include "ChooseTargetActions.h"
 #include "MovementActions.h"
-#include "ForgeOfSoulsTriggers.h"
-#include "ForgeOfSoulsActions.h"
+#include "FoSTriggers.h"
+#include "FoSActions.h"
 
 float BronjahmMultiplier::GetValue(Action* action) {
     Unit* boss = AI_VALUE2(Unit *, "find target", "bronjahm");
diff --git a/src/Ai/Dungeon/ForgeOfSouls/Multiplier/ForgeOfSoulsMultipliers.h b/src/Ai/Dungeon/FoS/FoSMultipliers.h
similarity index 100%
rename from src/Ai/Dungeon/ForgeOfSouls/Multiplier/ForgeOfSoulsMultipliers.h
rename to src/Ai/Dungeon/FoS/FoSMultipliers.h
diff --git a/src/Ai/Dungeon/ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.cpp b/src/Ai/Dungeon/FoS/FoSStrategy.cpp
similarity index 91%
rename from src/Ai/Dungeon/ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.cpp
rename to src/Ai/Dungeon/FoS/FoSStrategy.cpp
index 9ff321982..d359fe414 100644
--- a/src/Ai/Dungeon/ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.cpp
+++ b/src/Ai/Dungeon/FoS/FoSStrategy.cpp
@@ -1,5 +1,5 @@
-#include "ForgeOfSoulsStrategy.h"
-#include "ForgeOfSoulsMultipliers.h"
+#include "FoSStrategy.h"
+#include "FoSMultipliers.h"
 
 void WotlkDungeonFoSStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
diff --git a/src/Ai/Dungeon/ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.h b/src/Ai/Dungeon/FoS/FoSStrategy.h
similarity index 100%
rename from src/Ai/Dungeon/ForgeOfSouls/Strategy/ForgeOfSoulsStrategy.h
rename to src/Ai/Dungeon/FoS/FoSStrategy.h
diff --git a/src/Ai/Dungeon/ForgeOfSouls/ForgeOfSoulsTriggerContext.h b/src/Ai/Dungeon/FoS/FoSTriggerContext.h
similarity index 97%
rename from src/Ai/Dungeon/ForgeOfSouls/ForgeOfSoulsTriggerContext.h
rename to src/Ai/Dungeon/FoS/FoSTriggerContext.h
index 129124127..aa8a0d4af 100644
--- a/src/Ai/Dungeon/ForgeOfSouls/ForgeOfSoulsTriggerContext.h
+++ b/src/Ai/Dungeon/FoS/FoSTriggerContext.h
@@ -3,7 +3,7 @@
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
-#include "ForgeOfSoulsTriggers.h"
+#include "FoSTriggers.h"
 
 class WotlkDungeonFoSTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Dungeon/ForgeOfSouls/Trigger/ForgeOfSoulsTriggers.cpp b/src/Ai/Dungeon/FoS/FoSTriggers.cpp
similarity index 97%
rename from src/Ai/Dungeon/ForgeOfSouls/Trigger/ForgeOfSoulsTriggers.cpp
rename to src/Ai/Dungeon/FoS/FoSTriggers.cpp
index eb8e66e11..f124ab35d 100644
--- a/src/Ai/Dungeon/ForgeOfSouls/Trigger/ForgeOfSoulsTriggers.cpp
+++ b/src/Ai/Dungeon/FoS/FoSTriggers.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "ForgeOfSoulsTriggers.h"
+#include "FoSTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Dungeon/ForgeOfSouls/Trigger/ForgeOfSoulsTriggers.h b/src/Ai/Dungeon/FoS/FoSTriggers.h
similarity index 100%
rename from src/Ai/Dungeon/ForgeOfSouls/Trigger/ForgeOfSoulsTriggers.h
rename to src/Ai/Dungeon/FoS/FoSTriggers.h
diff --git a/src/Ai/Dungeon/Gundrak/GundrakActionContext.h b/src/Ai/Dungeon/GD/GDActionContext.h
similarity index 96%
rename from src/Ai/Dungeon/Gundrak/GundrakActionContext.h
rename to src/Ai/Dungeon/GD/GDActionContext.h
index 746fed394..3dd4f7164 100644
--- a/src/Ai/Dungeon/Gundrak/GundrakActionContext.h
+++ b/src/Ai/Dungeon/GD/GDActionContext.h
@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "GundrakActions.h"
+#include "GDActions.h"
 
 class WotlkDungeonGDActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Dungeon/Gundrak/Action/GundrakActions.cpp b/src/Ai/Dungeon/GD/GDActions.cpp
similarity index 98%
rename from src/Ai/Dungeon/Gundrak/Action/GundrakActions.cpp
rename to src/Ai/Dungeon/GD/GDActions.cpp
index 7dbcb6d66..4cada90e3 100644
--- a/src/Ai/Dungeon/Gundrak/Action/GundrakActions.cpp
+++ b/src/Ai/Dungeon/GD/GDActions.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "GundrakActions.h"
+#include "GDActions.h"
 
 bool AvoidPoisonNovaAction::Execute(Event /*event*/)
 {
diff --git a/src/Ai/Dungeon/Gundrak/Action/GundrakActions.h b/src/Ai/Dungeon/GD/GDActions.h
similarity index 96%
rename from src/Ai/Dungeon/Gundrak/Action/GundrakActions.h
rename to src/Ai/Dungeon/GD/GDActions.h
index 095cc5cfa..17070ac1e 100644
--- a/src/Ai/Dungeon/Gundrak/Action/GundrakActions.h
+++ b/src/Ai/Dungeon/GD/GDActions.h
@@ -5,7 +5,7 @@
 #include "AttackAction.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "GundrakTriggers.h"
+#include "GDTriggers.h"
 
 class AvoidPoisonNovaAction : public MovementAction
 {
diff --git a/src/Ai/Dungeon/Gundrak/Multiplier/GundrakMultipliers.cpp b/src/Ai/Dungeon/GD/GDMultipliers.cpp
similarity index 94%
rename from src/Ai/Dungeon/Gundrak/Multiplier/GundrakMultipliers.cpp
rename to src/Ai/Dungeon/GD/GDMultipliers.cpp
index 2d4404255..c9780f286 100644
--- a/src/Ai/Dungeon/Gundrak/Multiplier/GundrakMultipliers.cpp
+++ b/src/Ai/Dungeon/GD/GDMultipliers.cpp
@@ -1,9 +1,9 @@
-#include "GundrakMultipliers.h"
-#include "GundrakActions.h"
+#include "GDMultipliers.h"
+#include "GDActions.h"
 #include "GenericSpellActions.h"
 #include "ChooseTargetActions.h"
 #include "MovementActions.h"
-#include "GundrakTriggers.h"
+#include "GDTriggers.h"
 #include "Action.h"
 
 float SladranMultiplier::GetValue(Action* action)
diff --git a/src/Ai/Dungeon/Gundrak/Multiplier/GundrakMultipliers.h b/src/Ai/Dungeon/GD/GDMultipliers.h
similarity index 100%
rename from src/Ai/Dungeon/Gundrak/Multiplier/GundrakMultipliers.h
rename to src/Ai/Dungeon/GD/GDMultipliers.h
diff --git a/src/Ai/Dungeon/Gundrak/Strategy/GundrakStrategy.cpp b/src/Ai/Dungeon/GD/GDStrategy.cpp
similarity index 94%
rename from src/Ai/Dungeon/Gundrak/Strategy/GundrakStrategy.cpp
rename to src/Ai/Dungeon/GD/GDStrategy.cpp
index c8244e2ca..a092c3041 100644
--- a/src/Ai/Dungeon/Gundrak/Strategy/GundrakStrategy.cpp
+++ b/src/Ai/Dungeon/GD/GDStrategy.cpp
@@ -1,5 +1,5 @@
-#include "GundrakStrategy.h"
-#include "GundrakMultipliers.h"
+#include "GDStrategy.h"
+#include "GDMultipliers.h"
 
 void WotlkDungeonGDStrategy::InitTriggers(std::vector<TriggerNode*> &triggers)
 {
diff --git a/src/Ai/Dungeon/Gundrak/Strategy/GundrakStrategy.h b/src/Ai/Dungeon/GD/GDStrategy.h
similarity index 100%
rename from src/Ai/Dungeon/Gundrak/Strategy/GundrakStrategy.h
rename to src/Ai/Dungeon/GD/GDStrategy.h
diff --git a/src/Ai/Dungeon/Gundrak/GundrakTriggerContext.h b/src/Ai/Dungeon/GD/GDTriggerContext.h
similarity index 96%
rename from src/Ai/Dungeon/Gundrak/GundrakTriggerContext.h
rename to src/Ai/Dungeon/GD/GDTriggerContext.h
index 4d0e5dee8..e85e61a1d 100644
--- a/src/Ai/Dungeon/Gundrak/GundrakTriggerContext.h
+++ b/src/Ai/Dungeon/GD/GDTriggerContext.h
@@ -3,7 +3,7 @@
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
-#include "GundrakTriggers.h"
+#include "GDTriggers.h"
 
 class WotlkDungeonGDTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Dungeon/Gundrak/Trigger/GundrakTriggers.cpp b/src/Ai/Dungeon/GD/GDTriggers.cpp
similarity index 97%
rename from src/Ai/Dungeon/Gundrak/Trigger/GundrakTriggers.cpp
rename to src/Ai/Dungeon/GD/GDTriggers.cpp
index b3e98cfdb..13107e920 100644
--- a/src/Ai/Dungeon/Gundrak/Trigger/GundrakTriggers.cpp
+++ b/src/Ai/Dungeon/GD/GDTriggers.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "GundrakTriggers.h"
+#include "GDTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Dungeon/Gundrak/Trigger/GundrakTriggers.h b/src/Ai/Dungeon/GD/GDTriggers.h
similarity index 100%
rename from src/Ai/Dungeon/Gundrak/Trigger/GundrakTriggers.h
rename to src/Ai/Dungeon/GD/GDTriggers.h
diff --git a/src/Ai/Dungeon/HallsOfReflection/TODO b/src/Ai/Dungeon/HallsOfReflection/TODO
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/Ai/Dungeon/HallsOfLightning/HallsOfLightningActionContext.h b/src/Ai/Dungeon/HoL/HoLActionContext.h
similarity index 98%
rename from src/Ai/Dungeon/HallsOfLightning/HallsOfLightningActionContext.h
rename to src/Ai/Dungeon/HoL/HoLActionContext.h
index c3073d492..f17380c9a 100644
--- a/src/Ai/Dungeon/HallsOfLightning/HallsOfLightningActionContext.h
+++ b/src/Ai/Dungeon/HoL/HoLActionContext.h
@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "HallsOfLightningActions.h"
+#include "HoLActions.h"
 
 class WotlkDungeonHoLActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Dungeon/HallsOfLightning/Action/HallsOfLightningActions.cpp b/src/Ai/Dungeon/HoL/HoLActions.cpp
similarity index 99%
rename from src/Ai/Dungeon/HallsOfLightning/Action/HallsOfLightningActions.cpp
rename to src/Ai/Dungeon/HoL/HoLActions.cpp
index 7dcf64333..f665e475d 100644
--- a/src/Ai/Dungeon/HallsOfLightning/Action/HallsOfLightningActions.cpp
+++ b/src/Ai/Dungeon/HoL/HoLActions.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "HallsOfLightningActions.h"
+#include "HoLActions.h"
 
 bool BjarngrimTargetAction::Execute(Event /*event*/)
 {
diff --git a/src/Ai/Dungeon/HallsOfLightning/Action/HallsOfLightningActions.h b/src/Ai/Dungeon/HoL/HoLActions.h
similarity index 98%
rename from src/Ai/Dungeon/HallsOfLightning/Action/HallsOfLightningActions.h
rename to src/Ai/Dungeon/HoL/HoLActions.h
index fe81aa448..80bb51c22 100644
--- a/src/Ai/Dungeon/HallsOfLightning/Action/HallsOfLightningActions.h
+++ b/src/Ai/Dungeon/HoL/HoLActions.h
@@ -5,7 +5,7 @@
 #include "AttackAction.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "HallsOfLightningTriggers.h"
+#include "HoLTriggers.h"
 
 const Position IONAR_TANK_POSITION = Position(1078.860f, -261.928f, 61.226f);
 const Position DISPERSE_POSITION = Position(1161.152f, -261.584f, 53.223f);
diff --git a/src/Ai/Dungeon/HallsOfLightning/Multiplier/HallsOfLightningMultipliers.cpp b/src/Ai/Dungeon/HoL/HoLMultipliers.cpp
similarity index 96%
rename from src/Ai/Dungeon/HallsOfLightning/Multiplier/HallsOfLightningMultipliers.cpp
rename to src/Ai/Dungeon/HoL/HoLMultipliers.cpp
index 3bf9fcfd6..3fdc645e9 100644
--- a/src/Ai/Dungeon/HallsOfLightning/Multiplier/HallsOfLightningMultipliers.cpp
+++ b/src/Ai/Dungeon/HoL/HoLMultipliers.cpp
@@ -1,9 +1,9 @@
-#include "HallsOfLightningMultipliers.h"
-#include "HallsOfLightningActions.h"
+#include "HoLMultipliers.h"
+#include "HoLActions.h"
 #include "GenericSpellActions.h"
 #include "ChooseTargetActions.h"
 #include "MovementActions.h"
-#include "HallsOfLightningTriggers.h"
+#include "HoLTriggers.h"
 #include "Action.h"
 
 #include "WarriorActions.h"
diff --git a/src/Ai/Dungeon/HallsOfLightning/Multiplier/HallsOfLightningMultipliers.h b/src/Ai/Dungeon/HoL/HoLMultipliers.h
similarity index 100%
rename from src/Ai/Dungeon/HallsOfLightning/Multiplier/HallsOfLightningMultipliers.h
rename to src/Ai/Dungeon/HoL/HoLMultipliers.h
diff --git a/src/Ai/Dungeon/HallsOfLightning/Strategy/HallsOfLightningStrategy.cpp b/src/Ai/Dungeon/HoL/HoLStrategy.cpp
similarity index 95%
rename from src/Ai/Dungeon/HallsOfLightning/Strategy/HallsOfLightningStrategy.cpp
rename to src/Ai/Dungeon/HoL/HoLStrategy.cpp
index 1266fb0b9..e977fd3b5 100644
--- a/src/Ai/Dungeon/HallsOfLightning/Strategy/HallsOfLightningStrategy.cpp
+++ b/src/Ai/Dungeon/HoL/HoLStrategy.cpp
@@ -1,5 +1,5 @@
-#include "HallsOfLightningStrategy.h"
-#include "HallsOfLightningMultipliers.h"
+#include "HoLStrategy.h"
+#include "HoLMultipliers.h"
 
 void WotlkDungeonHoLStrategy::InitTriggers(std::vector<TriggerNode*> &triggers)
 {
diff --git a/src/Ai/Dungeon/HallsOfLightning/Strategy/HallsOfLightningStrategy.h b/src/Ai/Dungeon/HoL/HoLStrategy.h
similarity index 100%
rename from src/Ai/Dungeon/HallsOfLightning/Strategy/HallsOfLightningStrategy.h
rename to src/Ai/Dungeon/HoL/HoLStrategy.h
diff --git a/src/Ai/Dungeon/HallsOfLightning/HallsOfLightningTriggerContext.h b/src/Ai/Dungeon/HoL/HoLTriggerContext.h
similarity index 98%
rename from src/Ai/Dungeon/HallsOfLightning/HallsOfLightningTriggerContext.h
rename to src/Ai/Dungeon/HoL/HoLTriggerContext.h
index 74cd0cd73..999abaa24 100644
--- a/src/Ai/Dungeon/HallsOfLightning/HallsOfLightningTriggerContext.h
+++ b/src/Ai/Dungeon/HoL/HoLTriggerContext.h
@@ -3,7 +3,7 @@
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
-#include "HallsOfLightningTriggers.h"
+#include "HoLTriggers.h"
 
 class WotlkDungeonHoLTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Dungeon/HallsOfLightning/Trigger/HallsOfLightningTriggers.cpp b/src/Ai/Dungeon/HoL/HoLTriggers.cpp
similarity index 98%
rename from src/Ai/Dungeon/HallsOfLightning/Trigger/HallsOfLightningTriggers.cpp
rename to src/Ai/Dungeon/HoL/HoLTriggers.cpp
index da88807ca..6b63ce5f5 100644
--- a/src/Ai/Dungeon/HallsOfLightning/Trigger/HallsOfLightningTriggers.cpp
+++ b/src/Ai/Dungeon/HoL/HoLTriggers.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "HallsOfLightningTriggers.h"
+#include "HoLTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Dungeon/HallsOfLightning/Trigger/HallsOfLightningTriggers.h b/src/Ai/Dungeon/HoL/HoLTriggers.h
similarity index 100%
rename from src/Ai/Dungeon/HallsOfLightning/Trigger/HallsOfLightningTriggers.h
rename to src/Ai/Dungeon/HoL/HoLTriggers.h
diff --git a/src/Ai/Dungeon/HallsOfStone/HallsOfStoneActionContext.h b/src/Ai/Dungeon/HoS/HoSActionContext.h
similarity index 95%
rename from src/Ai/Dungeon/HallsOfStone/HallsOfStoneActionContext.h
rename to src/Ai/Dungeon/HoS/HoSActionContext.h
index 40b469b40..44ccfafcd 100644
--- a/src/Ai/Dungeon/HallsOfStone/HallsOfStoneActionContext.h
+++ b/src/Ai/Dungeon/HoS/HoSActionContext.h
@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "HallsOfStoneActions.h"
+#include "HoSActions.h"
 
 class WotlkDungeonHoSActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Dungeon/HallsOfStone/Action/HallsOfStoneActions.cpp b/src/Ai/Dungeon/HoS/HoSActions.cpp
similarity index 97%
rename from src/Ai/Dungeon/HallsOfStone/Action/HallsOfStoneActions.cpp
rename to src/Ai/Dungeon/HoS/HoSActions.cpp
index 51f1072b5..556553f8f 100644
--- a/src/Ai/Dungeon/HallsOfStone/Action/HallsOfStoneActions.cpp
+++ b/src/Ai/Dungeon/HoS/HoSActions.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "HallsOfStoneActions.h"
+#include "HoSActions.h"
 
 bool ShatterSpreadAction::Execute(Event /*event*/)
 {
diff --git a/src/Ai/Dungeon/HallsOfStone/Action/HallsOfStoneActions.h b/src/Ai/Dungeon/HoS/HoSActions.h
similarity index 94%
rename from src/Ai/Dungeon/HallsOfStone/Action/HallsOfStoneActions.h
rename to src/Ai/Dungeon/HoS/HoSActions.h
index ad7058afd..a564a968e 100644
--- a/src/Ai/Dungeon/HallsOfStone/Action/HallsOfStoneActions.h
+++ b/src/Ai/Dungeon/HoS/HoSActions.h
@@ -5,7 +5,7 @@
 #include "AttackAction.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "HallsOfStoneTriggers.h"
+#include "HoSTriggers.h"
 
 class ShatterSpreadAction : public MovementAction
 {
diff --git a/src/Ai/Dungeon/HallsOfStone/Multiplier/HallsOfStoneMultipliers.cpp b/src/Ai/Dungeon/HoS/HoSMultipliers.cpp
similarity index 92%
rename from src/Ai/Dungeon/HallsOfStone/Multiplier/HallsOfStoneMultipliers.cpp
rename to src/Ai/Dungeon/HoS/HoSMultipliers.cpp
index 443905bbb..3813b1388 100644
--- a/src/Ai/Dungeon/HallsOfStone/Multiplier/HallsOfStoneMultipliers.cpp
+++ b/src/Ai/Dungeon/HoS/HoSMultipliers.cpp
@@ -1,9 +1,9 @@
-#include "HallsOfStoneMultipliers.h"
-#include "HallsOfStoneActions.h"
+#include "HoSMultipliers.h"
+#include "HoSActions.h"
 #include "GenericSpellActions.h"
 #include "ChooseTargetActions.h"
 #include "MovementActions.h"
-#include "HallsOfStoneTriggers.h"
+#include "HoSTriggers.h"
 #include "Action.h"
 
 float KrystallusMultiplier::GetValue(Action* action)
diff --git a/src/Ai/Dungeon/HallsOfStone/Multiplier/HallsOfStoneMultipliers.h b/src/Ai/Dungeon/HoS/HoSMultipliers.h
similarity index 100%
rename from src/Ai/Dungeon/HallsOfStone/Multiplier/HallsOfStoneMultipliers.h
rename to src/Ai/Dungeon/HoS/HoSMultipliers.h
diff --git a/src/Ai/Dungeon/HallsOfStone/Strategy/HallsOfStoneStrategy.cpp b/src/Ai/Dungeon/HoS/HoSStrategy.cpp
similarity index 93%
rename from src/Ai/Dungeon/HallsOfStone/Strategy/HallsOfStoneStrategy.cpp
rename to src/Ai/Dungeon/HoS/HoSStrategy.cpp
index 47006a9e4..7a83c309d 100644
--- a/src/Ai/Dungeon/HallsOfStone/Strategy/HallsOfStoneStrategy.cpp
+++ b/src/Ai/Dungeon/HoS/HoSStrategy.cpp
@@ -1,5 +1,5 @@
-#include "HallsOfStoneStrategy.h"
-#include "HallsOfStoneMultipliers.h"
+#include "HoSStrategy.h"
+#include "HoSMultipliers.h"
 
 void WotlkDungeonHoSStrategy::InitTriggers(std::vector<TriggerNode*> &triggers)
 {
diff --git a/src/Ai/Dungeon/HallsOfStone/Strategy/HallsOfStoneStrategy.h b/src/Ai/Dungeon/HoS/HoSStrategy.h
similarity index 100%
rename from src/Ai/Dungeon/HallsOfStone/Strategy/HallsOfStoneStrategy.h
rename to src/Ai/Dungeon/HoS/HoSStrategy.h
diff --git a/src/Ai/Dungeon/HallsOfStone/HallsOfStoneTriggerContext.h b/src/Ai/Dungeon/HoS/HoSTriggerContext.h
similarity index 95%
rename from src/Ai/Dungeon/HallsOfStone/HallsOfStoneTriggerContext.h
rename to src/Ai/Dungeon/HoS/HoSTriggerContext.h
index bd3d6dd01..c6da70b69 100644
--- a/src/Ai/Dungeon/HallsOfStone/HallsOfStoneTriggerContext.h
+++ b/src/Ai/Dungeon/HoS/HoSTriggerContext.h
@@ -3,7 +3,7 @@
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
-#include "HallsOfStoneTriggers.h"
+#include "HoSTriggers.h"
 
 class WotlkDungeonHoSTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Dungeon/HallsOfStone/Trigger/HallsOfStoneTriggers.cpp b/src/Ai/Dungeon/HoS/HoSTriggers.cpp
similarity index 95%
rename from src/Ai/Dungeon/HallsOfStone/Trigger/HallsOfStoneTriggers.cpp
rename to src/Ai/Dungeon/HoS/HoSTriggers.cpp
index 2e6e37b86..78b37e0ce 100644
--- a/src/Ai/Dungeon/HallsOfStone/Trigger/HallsOfStoneTriggers.cpp
+++ b/src/Ai/Dungeon/HoS/HoSTriggers.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "HallsOfStoneTriggers.h"
+#include "HoSTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Dungeon/HallsOfStone/Trigger/HallsOfStoneTriggers.h b/src/Ai/Dungeon/HoS/HoSTriggers.h
similarity index 100%
rename from src/Ai/Dungeon/HallsOfStone/Trigger/HallsOfStoneTriggers.h
rename to src/Ai/Dungeon/HoS/HoSTriggers.h
diff --git a/src/Ai/Dungeon/Nexus/NexusActionContext.h b/src/Ai/Dungeon/Nex/NexActionContext.h
similarity index 98%
rename from src/Ai/Dungeon/Nexus/NexusActionContext.h
rename to src/Ai/Dungeon/Nex/NexActionContext.h
index c02422625..e8d91ba75 100644
--- a/src/Ai/Dungeon/Nexus/NexusActionContext.h
+++ b/src/Ai/Dungeon/Nex/NexActionContext.h
@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "NexusActions.h"
+#include "NexActions.h"
 
 class WotlkDungeonNexActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Dungeon/Nexus/Action/NexusActions.cpp b/src/Ai/Dungeon/Nex/NexActions.cpp
similarity index 99%
rename from src/Ai/Dungeon/Nexus/Action/NexusActions.cpp
rename to src/Ai/Dungeon/Nex/NexActions.cpp
index 12b546b5e..1dacc803e 100644
--- a/src/Ai/Dungeon/Nexus/Action/NexusActions.cpp
+++ b/src/Ai/Dungeon/Nex/NexActions.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "NexusActions.h"
+#include "NexActions.h"
 
 bool MoveFromWhirlwindAction::Execute(Event /*event*/)
 {
diff --git a/src/Ai/Dungeon/Nexus/Action/NexusActions.h b/src/Ai/Dungeon/Nex/NexActions.h
similarity index 98%
rename from src/Ai/Dungeon/Nexus/Action/NexusActions.h
rename to src/Ai/Dungeon/Nex/NexActions.h
index 96790c367..672cf0778 100644
--- a/src/Ai/Dungeon/Nexus/Action/NexusActions.h
+++ b/src/Ai/Dungeon/Nex/NexActions.h
@@ -5,7 +5,7 @@
 #include "AttackAction.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "NexusTriggers.h"
+#include "NexTriggers.h"
 
 class MoveFromWhirlwindAction : public MovementAction
 {
diff --git a/src/Ai/Dungeon/Nexus/Multiplier/NexusMultipliers.cpp b/src/Ai/Dungeon/Nex/NexMultipliers.cpp
similarity index 97%
rename from src/Ai/Dungeon/Nexus/Multiplier/NexusMultipliers.cpp
rename to src/Ai/Dungeon/Nex/NexMultipliers.cpp
index 7adc79b45..129b8a098 100644
--- a/src/Ai/Dungeon/Nexus/Multiplier/NexusMultipliers.cpp
+++ b/src/Ai/Dungeon/Nex/NexMultipliers.cpp
@@ -1,9 +1,9 @@
-#include "NexusMultipliers.h"
-#include "NexusActions.h"
+#include "NexMultipliers.h"
+#include "NexActions.h"
 #include "GenericSpellActions.h"
 #include "ChooseTargetActions.h"
 #include "MovementActions.h"
-#include "NexusTriggers.h"
+#include "NexTriggers.h"
 
 float FactionCommanderMultiplier::GetValue(Action* action)
 {
diff --git a/src/Ai/Dungeon/Nexus/Multiplier/NexusMultipliers.h b/src/Ai/Dungeon/Nex/NexMultipliers.h
similarity index 100%
rename from src/Ai/Dungeon/Nexus/Multiplier/NexusMultipliers.h
rename to src/Ai/Dungeon/Nex/NexMultipliers.h
diff --git a/src/Ai/Dungeon/Nexus/Strategy/NexusStrategy.cpp b/src/Ai/Dungeon/Nex/NexStrategy.cpp
similarity index 97%
rename from src/Ai/Dungeon/Nexus/Strategy/NexusStrategy.cpp
rename to src/Ai/Dungeon/Nex/NexStrategy.cpp
index e633ba982..7f2e773d7 100644
--- a/src/Ai/Dungeon/Nexus/Strategy/NexusStrategy.cpp
+++ b/src/Ai/Dungeon/Nex/NexStrategy.cpp
@@ -1,5 +1,5 @@
-#include "NexusStrategy.h"
-#include "NexusMultipliers.h"
+#include "NexStrategy.h"
+#include "NexMultipliers.h"
 
 void WotlkDungeonNexStrategy::InitTriggers(std::vector<TriggerNode*> &triggers)
 {
diff --git a/src/Ai/Dungeon/Nexus/Strategy/NexusStrategy.h b/src/Ai/Dungeon/Nex/NexStrategy.h
similarity index 100%
rename from src/Ai/Dungeon/Nexus/Strategy/NexusStrategy.h
rename to src/Ai/Dungeon/Nex/NexStrategy.h
diff --git a/src/Ai/Dungeon/Nexus/NexusTriggerContext.h b/src/Ai/Dungeon/Nex/NexTriggerContext.h
similarity index 98%
rename from src/Ai/Dungeon/Nexus/NexusTriggerContext.h
rename to src/Ai/Dungeon/Nex/NexTriggerContext.h
index 38ebbcb3d..706215c2f 100644
--- a/src/Ai/Dungeon/Nexus/NexusTriggerContext.h
+++ b/src/Ai/Dungeon/Nex/NexTriggerContext.h
@@ -3,7 +3,7 @@
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
-#include "NexusTriggers.h"
+#include "NexTriggers.h"
 
 class WotlkDungeonNexTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Dungeon/Nexus/Trigger/NexusTriggers.cpp b/src/Ai/Dungeon/Nex/NexTriggers.cpp
similarity index 99%
rename from src/Ai/Dungeon/Nexus/Trigger/NexusTriggers.cpp
rename to src/Ai/Dungeon/Nex/NexTriggers.cpp
index 02be3f70e..45febf0df 100644
--- a/src/Ai/Dungeon/Nexus/Trigger/NexusTriggers.cpp
+++ b/src/Ai/Dungeon/Nex/NexTriggers.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "NexusTriggers.h"
+#include "NexTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Dungeon/Nexus/Trigger/NexusTriggers.h b/src/Ai/Dungeon/Nex/NexTriggers.h
similarity index 100%
rename from src/Ai/Dungeon/Nexus/Trigger/NexusTriggers.h
rename to src/Ai/Dungeon/Nex/NexTriggers.h
diff --git a/src/Ai/Dungeon/Oculus/OculusActionContext.h b/src/Ai/Dungeon/OC/OCActionContext.h
similarity index 98%
rename from src/Ai/Dungeon/Oculus/OculusActionContext.h
rename to src/Ai/Dungeon/OC/OCActionContext.h
index fa5036e54..fefeecd44 100644
--- a/src/Ai/Dungeon/Oculus/OculusActionContext.h
+++ b/src/Ai/Dungeon/OC/OCActionContext.h
@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "OculusActions.h"
+#include "OCActions.h"
 
 class WotlkDungeonOccActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Dungeon/Oculus/Action/OculusActions.cpp b/src/Ai/Dungeon/OC/OCActions.cpp
similarity index 99%
rename from src/Ai/Dungeon/Oculus/Action/OculusActions.cpp
rename to src/Ai/Dungeon/OC/OCActions.cpp
index 385451003..babfff206 100644
--- a/src/Ai/Dungeon/Oculus/Action/OculusActions.cpp
+++ b/src/Ai/Dungeon/OC/OCActions.cpp
@@ -1,6 +1,6 @@
-#include "OculusTriggers.h"
+#include "OCTriggers.h"
 #include "Playerbots.h"
-#include "OculusActions.h"
+#include "OCActions.h"
 #include "LastSpellCastValue.h"
 
 bool AvoidUnstableSphereAction::Execute(Event /*event*/)
diff --git a/src/Ai/Dungeon/Oculus/Action/OculusActions.h b/src/Ai/Dungeon/OC/OCActions.h
similarity index 100%
rename from src/Ai/Dungeon/Oculus/Action/OculusActions.h
rename to src/Ai/Dungeon/OC/OCActions.h
diff --git a/src/Ai/Dungeon/Oculus/Multiplier/OculusMultipliers.cpp b/src/Ai/Dungeon/OC/OCMultipliers.cpp
similarity index 97%
rename from src/Ai/Dungeon/Oculus/Multiplier/OculusMultipliers.cpp
rename to src/Ai/Dungeon/OC/OCMultipliers.cpp
index f8fcdd3f1..a8a21e693 100644
--- a/src/Ai/Dungeon/Oculus/Multiplier/OculusMultipliers.cpp
+++ b/src/Ai/Dungeon/OC/OCMultipliers.cpp
@@ -1,9 +1,9 @@
-#include "OculusMultipliers.h"
-#include "OculusActions.h"
+#include "OCMultipliers.h"
+#include "OCActions.h"
 #include "GenericSpellActions.h"
 #include "ChooseTargetActions.h"
 #include "MovementActions.h"
-#include "OculusTriggers.h"
+#include "OCTriggers.h"
 #include "FollowActions.h"
 #include "ReachTargetActions.h"
 #include "Playerbots.h"
diff --git a/src/Ai/Dungeon/Oculus/Multiplier/OculusMultipliers.h b/src/Ai/Dungeon/OC/OCMultipliers.h
similarity index 100%
rename from src/Ai/Dungeon/Oculus/Multiplier/OculusMultipliers.h
rename to src/Ai/Dungeon/OC/OCMultipliers.h
diff --git a/src/Ai/Dungeon/Oculus/Strategy/OculusStrategy.cpp b/src/Ai/Dungeon/OC/OCStrategy.cpp
similarity index 96%
rename from src/Ai/Dungeon/Oculus/Strategy/OculusStrategy.cpp
rename to src/Ai/Dungeon/OC/OCStrategy.cpp
index 4c558469e..a96cab926 100644
--- a/src/Ai/Dungeon/Oculus/Strategy/OculusStrategy.cpp
+++ b/src/Ai/Dungeon/OC/OCStrategy.cpp
@@ -1,5 +1,5 @@
-#include "OculusStrategy.h"
-#include "OculusMultipliers.h"
+#include "OCStrategy.h"
+#include "OCMultipliers.h"
 
 void WotlkDungeonOccStrategy::InitTriggers(std::vector<TriggerNode*> &triggers)
 {
diff --git a/src/Ai/Dungeon/Oculus/Strategy/OculusStrategy.h b/src/Ai/Dungeon/OC/OCStrategy.h
similarity index 100%
rename from src/Ai/Dungeon/Oculus/Strategy/OculusStrategy.h
rename to src/Ai/Dungeon/OC/OCStrategy.h
diff --git a/src/Ai/Dungeon/Oculus/OculusTriggerContext.h b/src/Ai/Dungeon/OC/OCTriggerContext.h
similarity index 98%
rename from src/Ai/Dungeon/Oculus/OculusTriggerContext.h
rename to src/Ai/Dungeon/OC/OCTriggerContext.h
index ccd2d8ca1..da92923d9 100644
--- a/src/Ai/Dungeon/Oculus/OculusTriggerContext.h
+++ b/src/Ai/Dungeon/OC/OCTriggerContext.h
@@ -3,7 +3,7 @@
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
-#include "OculusTriggers.h"
+#include "OCTriggers.h"
 
 class WotlkDungeonOccTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Dungeon/Oculus/Trigger/OculusTriggers.cpp b/src/Ai/Dungeon/OC/OCTriggers.cpp
similarity index 98%
rename from src/Ai/Dungeon/Oculus/Trigger/OculusTriggers.cpp
rename to src/Ai/Dungeon/OC/OCTriggers.cpp
index 9cc8288f3..e80a82bf8 100644
--- a/src/Ai/Dungeon/Oculus/Trigger/OculusTriggers.cpp
+++ b/src/Ai/Dungeon/OC/OCTriggers.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "OculusTriggers.h"
+#include "OCTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 #include "Unit.h"
diff --git a/src/Ai/Dungeon/Oculus/Trigger/OculusTriggers.h b/src/Ai/Dungeon/OC/OCTriggers.h
similarity index 100%
rename from src/Ai/Dungeon/Oculus/Trigger/OculusTriggers.h
rename to src/Ai/Dungeon/OC/OCTriggers.h
diff --git a/src/Ai/Dungeon/PitOfSaron/PitOfSaronActionContext.h b/src/Ai/Dungeon/PoS/PoSActionContext.h
similarity index 95%
rename from src/Ai/Dungeon/PitOfSaron/PitOfSaronActionContext.h
rename to src/Ai/Dungeon/PoS/PoSActionContext.h
index 816202a8a..b2bf1a16a 100644
--- a/src/Ai/Dungeon/PitOfSaron/PitOfSaronActionContext.h
+++ b/src/Ai/Dungeon/PoS/PoSActionContext.h
@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "PitOfSaronActions.h"
+#include "PoSActions.h"
 
 class WotlkDungeonPoSActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Dungeon/PitOfSaron/Action/PitOfSaronActions.cpp b/src/Ai/Dungeon/PoS/PoSActions.cpp
similarity index 99%
rename from src/Ai/Dungeon/PitOfSaron/Action/PitOfSaronActions.cpp
rename to src/Ai/Dungeon/PoS/PoSActions.cpp
index 201a44199..60edaa012 100644
--- a/src/Ai/Dungeon/PitOfSaron/Action/PitOfSaronActions.cpp
+++ b/src/Ai/Dungeon/PoS/PoSActions.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "PitOfSaronActions.h"
+#include "PoSActions.h"
 
 bool IckAndKrickAction::Execute(Event /*event*/)
 {
diff --git a/src/Ai/Dungeon/PitOfSaron/Action/PitOfSaronActions.h b/src/Ai/Dungeon/PoS/PoSActions.h
similarity index 96%
rename from src/Ai/Dungeon/PitOfSaron/Action/PitOfSaronActions.h
rename to src/Ai/Dungeon/PoS/PoSActions.h
index a467766f1..b61b863b4 100644
--- a/src/Ai/Dungeon/PitOfSaron/Action/PitOfSaronActions.h
+++ b/src/Ai/Dungeon/PoS/PoSActions.h
@@ -5,7 +5,7 @@
 #include "AttackAction.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "PitOfSaronTriggers.h"
+#include "PoSTriggers.h"
 
 const Position ICKANDKRICK_TANK_POSITION = Position(816.8508f, 102.331505f, 509.1586f);
 
diff --git a/src/Ai/Dungeon/PitOfSaron/Multiplier/PitOfSaronMultipliers.cpp b/src/Ai/Dungeon/PoS/PoSMultipliers.cpp
similarity index 93%
rename from src/Ai/Dungeon/PitOfSaron/Multiplier/PitOfSaronMultipliers.cpp
rename to src/Ai/Dungeon/PoS/PoSMultipliers.cpp
index 00de758c1..c112e08d6 100644
--- a/src/Ai/Dungeon/PitOfSaron/Multiplier/PitOfSaronMultipliers.cpp
+++ b/src/Ai/Dungeon/PoS/PoSMultipliers.cpp
@@ -1,9 +1,9 @@
-#include "PitOfSaronMultipliers.h"
-#include "PitOfSaronActions.h"
+#include "PoSMultipliers.h"
+#include "PoSActions.h"
 #include "GenericSpellActions.h"
 #include "ChooseTargetActions.h"
 #include "MovementActions.h"
-#include "PitOfSaronTriggers.h"
+#include "PoSTriggers.h"
 
 float IckAndKrickMultiplier::GetValue(Action* action)
 {
diff --git a/src/Ai/Dungeon/PitOfSaron/Multiplier/PitOfSaronMultipliers.h b/src/Ai/Dungeon/PoS/PoSMultipliers.h
similarity index 100%
rename from src/Ai/Dungeon/PitOfSaron/Multiplier/PitOfSaronMultipliers.h
rename to src/Ai/Dungeon/PoS/PoSMultipliers.h
diff --git a/src/Ai/Dungeon/PitOfSaron/Strategy/PitOfSaronStrategy.cpp b/src/Ai/Dungeon/PoS/PoSStrategy.cpp
similarity index 87%
rename from src/Ai/Dungeon/PitOfSaron/Strategy/PitOfSaronStrategy.cpp
rename to src/Ai/Dungeon/PoS/PoSStrategy.cpp
index 641af0a6d..4af650021 100644
--- a/src/Ai/Dungeon/PitOfSaron/Strategy/PitOfSaronStrategy.cpp
+++ b/src/Ai/Dungeon/PoS/PoSStrategy.cpp
@@ -1,5 +1,5 @@
-#include "PitOfSaronStrategy.h"
-#include "PitOfSaronMultipliers.h"
+#include "PoSStrategy.h"
+#include "PoSMultipliers.h"
 
 void WotlkDungeonPoSStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
diff --git a/src/Ai/Dungeon/PitOfSaron/Strategy/PitOfSaronStrategy.h b/src/Ai/Dungeon/PoS/PoSStrategy.h
similarity index 100%
rename from src/Ai/Dungeon/PitOfSaron/Strategy/PitOfSaronStrategy.h
rename to src/Ai/Dungeon/PoS/PoSStrategy.h
diff --git a/src/Ai/Dungeon/PitOfSaron/PitOfSaronTriggerContext.h b/src/Ai/Dungeon/PoS/PoSTriggerContext.h
similarity index 95%
rename from src/Ai/Dungeon/PitOfSaron/PitOfSaronTriggerContext.h
rename to src/Ai/Dungeon/PoS/PoSTriggerContext.h
index a31bff949..b6f3b2cf0 100644
--- a/src/Ai/Dungeon/PitOfSaron/PitOfSaronTriggerContext.h
+++ b/src/Ai/Dungeon/PoS/PoSTriggerContext.h
@@ -3,7 +3,7 @@
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
-#include "PitOfSaronTriggers.h"
+#include "PoSTriggers.h"
 
 class WotlkDungeonPoSTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Dungeon/PitOfSaron/Trigger/PitOfSaronTriggers.cpp b/src/Ai/Dungeon/PoS/PoSTriggers.cpp
similarity index 92%
rename from src/Ai/Dungeon/PitOfSaron/Trigger/PitOfSaronTriggers.cpp
rename to src/Ai/Dungeon/PoS/PoSTriggers.cpp
index f744302cd..f43b68a89 100644
--- a/src/Ai/Dungeon/PitOfSaron/Trigger/PitOfSaronTriggers.cpp
+++ b/src/Ai/Dungeon/PoS/PoSTriggers.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "PitOfSaronTriggers.h"
+#include "PoSTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Dungeon/PitOfSaron/Trigger/PitOfSaronTriggers.h b/src/Ai/Dungeon/PoS/PoSTriggers.h
similarity index 100%
rename from src/Ai/Dungeon/PitOfSaron/Trigger/PitOfSaronTriggers.h
rename to src/Ai/Dungeon/PoS/PoSTriggers.h
diff --git a/src/Ai/Dungeon/TrialOfTheChampion/TrialOfTheChampionActionContext.h b/src/Ai/Dungeon/TOC/TOCActionContext.h
similarity index 96%
rename from src/Ai/Dungeon/TrialOfTheChampion/TrialOfTheChampionActionContext.h
rename to src/Ai/Dungeon/TOC/TOCActionContext.h
index 21f877f24..ae6804b86 100644
--- a/src/Ai/Dungeon/TrialOfTheChampion/TrialOfTheChampionActionContext.h
+++ b/src/Ai/Dungeon/TOC/TOCActionContext.h
@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "TrialOfTheChampionActions.h"
+#include "TOCActions.h"
 
 class WotlkDungeonToCActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Dungeon/TrialOfTheChampion/Action/TrialOfTheChampionActions.cpp b/src/Ai/Dungeon/TOC/TOCActions.cpp
similarity index 99%
rename from src/Ai/Dungeon/TrialOfTheChampion/Action/TrialOfTheChampionActions.cpp
rename to src/Ai/Dungeon/TOC/TOCActions.cpp
index f3b071fe0..9938ed5bd 100644
--- a/src/Ai/Dungeon/TrialOfTheChampion/Action/TrialOfTheChampionActions.cpp
+++ b/src/Ai/Dungeon/TOC/TOCActions.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "TrialOfTheChampionActions.h"
+#include "TOCActions.h"
 #include "NearestNpcsValue.h"
 #include "ObjectAccessor.h"
 #include "Vehicle.h"
diff --git a/src/Ai/Dungeon/TrialOfTheChampion/Action/TrialOfTheChampionActions.h b/src/Ai/Dungeon/TOC/TOCActions.h
similarity index 97%
rename from src/Ai/Dungeon/TrialOfTheChampion/Action/TrialOfTheChampionActions.h
rename to src/Ai/Dungeon/TOC/TOCActions.h
index ab2c18ae8..ad1c0fa26 100644
--- a/src/Ai/Dungeon/TrialOfTheChampion/Action/TrialOfTheChampionActions.h
+++ b/src/Ai/Dungeon/TOC/TOCActions.h
@@ -5,7 +5,7 @@
 #include "AttackAction.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "TrialOfTheChampionTriggers.h"
+#include "TOCTriggers.h"
 #include "MovementActions.h"
 #include "LastMovementValue.h"
 #include "ObjectGuid.h"
diff --git a/src/Ai/Dungeon/TrialOfTheChampion/Multiplier/TrialOfTheChampionMultipliers.cpp b/src/Ai/Dungeon/TOC/TOCMultipliers.cpp
similarity index 59%
rename from src/Ai/Dungeon/TrialOfTheChampion/Multiplier/TrialOfTheChampionMultipliers.cpp
rename to src/Ai/Dungeon/TOC/TOCMultipliers.cpp
index c090ef68b..b2a724109 100644
--- a/src/Ai/Dungeon/TrialOfTheChampion/Multiplier/TrialOfTheChampionMultipliers.cpp
+++ b/src/Ai/Dungeon/TOC/TOCMultipliers.cpp
@@ -1,9 +1,9 @@
-#include "TrialOfTheChampionMultipliers.h"
-#include "TrialOfTheChampionActions.h"
+#include "TOCMultipliers.h"
+#include "TOCActions.h"
 #include "GenericSpellActions.h"
 #include "ChooseTargetActions.h"
 #include "MovementActions.h"
-#include "TrialOfTheChampionTriggers.h"
+#include "TOCTriggers.h"
 #include "Action.h"
 
 //float tocMultiplier::GetValue(Action* action) { return 1.0f; }
diff --git a/src/Ai/Dungeon/TrialOfTheChampion/Multiplier/TrialOfTheChampionMultipliers.h b/src/Ai/Dungeon/TOC/TOCMultipliers.h
similarity index 100%
rename from src/Ai/Dungeon/TrialOfTheChampion/Multiplier/TrialOfTheChampionMultipliers.h
rename to src/Ai/Dungeon/TOC/TOCMultipliers.h
diff --git a/src/Ai/Dungeon/TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.cpp b/src/Ai/Dungeon/TOC/TOCStrategy.cpp
similarity index 94%
rename from src/Ai/Dungeon/TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.cpp
rename to src/Ai/Dungeon/TOC/TOCStrategy.cpp
index 0912a912c..62ae7fb8d 100644
--- a/src/Ai/Dungeon/TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.cpp
+++ b/src/Ai/Dungeon/TOC/TOCStrategy.cpp
@@ -1,4 +1,4 @@
-#include "TrialOfTheChampionStrategy.h"
+#include "TOCStrategy.h"
 
 void WotlkDungeonToCStrategy::InitTriggers(std::vector<TriggerNode*> &triggers)
 {
diff --git a/src/Ai/Dungeon/TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.h b/src/Ai/Dungeon/TOC/TOCStrategy.h
similarity index 92%
rename from src/Ai/Dungeon/TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.h
rename to src/Ai/Dungeon/TOC/TOCStrategy.h
index 12416d5ad..4a0c7c783 100644
--- a/src/Ai/Dungeon/TrialOfTheChampion/Strategy/TrialOfTheChampionStrategy.h
+++ b/src/Ai/Dungeon/TOC/TOCStrategy.h
@@ -4,7 +4,7 @@
 #include "AiObjectContext.h"
 #include "Multiplier.h"
 #include "Strategy.h"
-#include "TrialOfTheChampionMultipliers.h"
+#include "TOCMultipliers.h"
 
 class WotlkDungeonToCStrategy : public Strategy
 {
diff --git a/src/Ai/Dungeon/TrialOfTheChampion/TrialOfTheChampionTriggerContext.h b/src/Ai/Dungeon/TOC/TOCTriggerContext.h
similarity index 96%
rename from src/Ai/Dungeon/TrialOfTheChampion/TrialOfTheChampionTriggerContext.h
rename to src/Ai/Dungeon/TOC/TOCTriggerContext.h
index f1b55c523..2e27aeeef 100644
--- a/src/Ai/Dungeon/TrialOfTheChampion/TrialOfTheChampionTriggerContext.h
+++ b/src/Ai/Dungeon/TOC/TOCTriggerContext.h
@@ -3,7 +3,7 @@
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
-#include "TrialOfTheChampionTriggers.h"
+#include "TOCTriggers.h"
 
 class WotlkDungeonToCTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Dungeon/TrialOfTheChampion/Trigger/TrialOfTheChampionTriggers.cpp b/src/Ai/Dungeon/TOC/TOCTriggers.cpp
similarity index 97%
rename from src/Ai/Dungeon/TrialOfTheChampion/Trigger/TrialOfTheChampionTriggers.cpp
rename to src/Ai/Dungeon/TOC/TOCTriggers.cpp
index 6c388382e..2f6894043 100644
--- a/src/Ai/Dungeon/TrialOfTheChampion/Trigger/TrialOfTheChampionTriggers.cpp
+++ b/src/Ai/Dungeon/TOC/TOCTriggers.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "TrialOfTheChampionTriggers.h"
+#include "TOCTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Dungeon/TrialOfTheChampion/Trigger/TrialOfTheChampionTriggers.h b/src/Ai/Dungeon/TOC/TOCTriggers.h
similarity index 100%
rename from src/Ai/Dungeon/TrialOfTheChampion/Trigger/TrialOfTheChampionTriggers.h
rename to src/Ai/Dungeon/TOC/TOCTriggers.h
diff --git a/src/Ai/Dungeon/TbcDungeonActionContext.h b/src/Ai/Dungeon/TbcDungeonActionContext.h
index 8c3547224..6b4bf72a8 100644
--- a/src/Ai/Dungeon/TbcDungeonActionContext.h
+++ b/src/Ai/Dungeon/TbcDungeonActionContext.h
@@ -1,6 +1,6 @@
 #ifndef _PLAYERBOT_TBCDUNGEONACTIONCONTEXT_H
 #define _PLAYERBOT_TBCDUNGEONACTIONCONTEXT_H
 
-#include "AuchenaiCrypts/AuchenaiCryptsActionContext.h"
+#include "ACActionContext.h"
 
 #endif
diff --git a/src/Ai/Dungeon/TbcDungeonTriggerContext.h b/src/Ai/Dungeon/TbcDungeonTriggerContext.h
index 9a680b7af..f28933999 100644
--- a/src/Ai/Dungeon/TbcDungeonTriggerContext.h
+++ b/src/Ai/Dungeon/TbcDungeonTriggerContext.h
@@ -1,6 +1,6 @@
 #ifndef _PLAYERBOT_TBCDUNGEONTRIGGERCONTEXT_H
 #define _PLAYERBOT_TBCDUNGEONTRIGGERCONTEXT_H
 
-#include "AuchenaiCrypts/AuchenaiCryptsTriggerContext.h"
+#include "ACTriggerContext.h"
 
 #endif
diff --git a/src/Ai/Dungeon/UtgardeKeep/UtgardeKeepActionContext.h b/src/Ai/Dungeon/UK/UKActionContext.h
similarity index 98%
rename from src/Ai/Dungeon/UtgardeKeep/UtgardeKeepActionContext.h
rename to src/Ai/Dungeon/UK/UKActionContext.h
index 0e51e56b4..b52aa1846 100644
--- a/src/Ai/Dungeon/UtgardeKeep/UtgardeKeepActionContext.h
+++ b/src/Ai/Dungeon/UK/UKActionContext.h
@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "UtgardeKeepActions.h"
+#include "UKActions.h"
 
 class WotlkDungeonUKActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Dungeon/UtgardeKeep/Action/UtgardeKeepActions.cpp b/src/Ai/Dungeon/UK/UKActions.cpp
similarity index 98%
rename from src/Ai/Dungeon/UtgardeKeep/Action/UtgardeKeepActions.cpp
rename to src/Ai/Dungeon/UK/UKActions.cpp
index 85d8590ee..b11ff6746 100644
--- a/src/Ai/Dungeon/UtgardeKeep/Action/UtgardeKeepActions.cpp
+++ b/src/Ai/Dungeon/UK/UKActions.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "UtgardeKeepActions.h"
+#include "UKActions.h"
 
 bool AttackFrostTombAction::isUseful() { return !botAI->IsHeal(bot); }
 bool AttackFrostTombAction::Execute(Event /*event*/)
diff --git a/src/Ai/Dungeon/UtgardeKeep/Action/UtgardeKeepActions.h b/src/Ai/Dungeon/UK/UKActions.h
similarity index 97%
rename from src/Ai/Dungeon/UtgardeKeep/Action/UtgardeKeepActions.h
rename to src/Ai/Dungeon/UK/UKActions.h
index c9c77d520..c7d4c59d4 100644
--- a/src/Ai/Dungeon/UtgardeKeep/Action/UtgardeKeepActions.h
+++ b/src/Ai/Dungeon/UK/UKActions.h
@@ -5,7 +5,7 @@
 #include "AttackAction.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "UtgardeKeepTriggers.h"
+#include "UKTriggers.h"
 
 class AttackFrostTombAction : public AttackAction
 {
diff --git a/src/Ai/Dungeon/UtgardeKeep/Multiplier/UtgardeKeepMultipliers.cpp b/src/Ai/Dungeon/UK/UKMultipliers.cpp
similarity index 96%
rename from src/Ai/Dungeon/UtgardeKeep/Multiplier/UtgardeKeepMultipliers.cpp
rename to src/Ai/Dungeon/UK/UKMultipliers.cpp
index e9a411dac..98f5528f2 100644
--- a/src/Ai/Dungeon/UtgardeKeep/Multiplier/UtgardeKeepMultipliers.cpp
+++ b/src/Ai/Dungeon/UK/UKMultipliers.cpp
@@ -1,8 +1,8 @@
-#include "UtgardeKeepMultipliers.h"
-#include "UtgardeKeepActions.h"
+#include "UKMultipliers.h"
+#include "UKActions.h"
 #include "GenericSpellActions.h"
 #include "ChooseTargetActions.h"
-#include "UtgardeKeepTriggers.h"
+#include "UKTriggers.h"
 
 float PrinceKelesethMultiplier::GetValue(Action* action)
 {
diff --git a/src/Ai/Dungeon/UtgardeKeep/Multiplier/UtgardeKeepMultipliers.h b/src/Ai/Dungeon/UK/UKMultipliers.h
similarity index 100%
rename from src/Ai/Dungeon/UtgardeKeep/Multiplier/UtgardeKeepMultipliers.h
rename to src/Ai/Dungeon/UK/UKMultipliers.h
diff --git a/src/Ai/Dungeon/UtgardeKeep/Strategy/UtgardeKeepStrategy.cpp b/src/Ai/Dungeon/UK/UKStrategy.cpp
similarity index 96%
rename from src/Ai/Dungeon/UtgardeKeep/Strategy/UtgardeKeepStrategy.cpp
rename to src/Ai/Dungeon/UK/UKStrategy.cpp
index 562cb8ec5..b298edbc1 100644
--- a/src/Ai/Dungeon/UtgardeKeep/Strategy/UtgardeKeepStrategy.cpp
+++ b/src/Ai/Dungeon/UK/UKStrategy.cpp
@@ -1,5 +1,5 @@
-#include "UtgardeKeepStrategy.h"
-#include "UtgardeKeepMultipliers.h"
+#include "UKStrategy.h"
+#include "UKMultipliers.h"
 
 void WotlkDungeonUKStrategy::InitTriggers(std::vector<TriggerNode*> &triggers)
 {
diff --git a/src/Ai/Dungeon/UtgardeKeep/Strategy/UtgardeKeepStrategy.h b/src/Ai/Dungeon/UK/UKStrategy.h
similarity index 100%
rename from src/Ai/Dungeon/UtgardeKeep/Strategy/UtgardeKeepStrategy.h
rename to src/Ai/Dungeon/UK/UKStrategy.h
diff --git a/src/Ai/Dungeon/UtgardeKeep/UtgardeKeepTriggerContext.h b/src/Ai/Dungeon/UK/UKTriggerContext.h
similarity index 98%
rename from src/Ai/Dungeon/UtgardeKeep/UtgardeKeepTriggerContext.h
rename to src/Ai/Dungeon/UK/UKTriggerContext.h
index 52ec95dae..59bc18972 100644
--- a/src/Ai/Dungeon/UtgardeKeep/UtgardeKeepTriggerContext.h
+++ b/src/Ai/Dungeon/UK/UKTriggerContext.h
@@ -3,7 +3,7 @@
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
-#include "UtgardeKeepTriggers.h"
+#include "UKTriggers.h"
 
 class WotlkDungeonUKTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Dungeon/UtgardeKeep/Trigger/UtgardeKeepTriggers.cpp b/src/Ai/Dungeon/UK/UKTriggers.cpp
similarity index 98%
rename from src/Ai/Dungeon/UtgardeKeep/Trigger/UtgardeKeepTriggers.cpp
rename to src/Ai/Dungeon/UK/UKTriggers.cpp
index e19234bd0..4fda7a0a3 100644
--- a/src/Ai/Dungeon/UtgardeKeep/Trigger/UtgardeKeepTriggers.cpp
+++ b/src/Ai/Dungeon/UK/UKTriggers.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "UtgardeKeepTriggers.h"
+#include "UKTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Dungeon/UtgardeKeep/Trigger/UtgardeKeepTriggers.h b/src/Ai/Dungeon/UK/UKTriggers.h
similarity index 100%
rename from src/Ai/Dungeon/UtgardeKeep/Trigger/UtgardeKeepTriggers.h
rename to src/Ai/Dungeon/UK/UKTriggers.h
diff --git a/src/Ai/Dungeon/UtgardePinnacle/UtgardePinnacleActionContext.h b/src/Ai/Dungeon/UP/UPActionContext.h
similarity index 96%
rename from src/Ai/Dungeon/UtgardePinnacle/UtgardePinnacleActionContext.h
rename to src/Ai/Dungeon/UP/UPActionContext.h
index 9e7532b9a..bab3c83b2 100644
--- a/src/Ai/Dungeon/UtgardePinnacle/UtgardePinnacleActionContext.h
+++ b/src/Ai/Dungeon/UP/UPActionContext.h
@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "UtgardePinnacleActions.h"
+#include "UPActions.h"
 
 class WotlkDungeonUPActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Dungeon/UtgardePinnacle/Action/UtgardePinnacleActions.cpp b/src/Ai/Dungeon/UP/UPActions.cpp
similarity index 98%
rename from src/Ai/Dungeon/UtgardePinnacle/Action/UtgardePinnacleActions.cpp
rename to src/Ai/Dungeon/UP/UPActions.cpp
index 8025f1aac..802da7262 100644
--- a/src/Ai/Dungeon/UtgardePinnacle/Action/UtgardePinnacleActions.cpp
+++ b/src/Ai/Dungeon/UP/UPActions.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "UtgardePinnacleActions.h"
+#include "UPActions.h"
 
 bool AvoidFreezingCloudAction::Execute(Event /*event*/)
 {
diff --git a/src/Ai/Dungeon/UtgardePinnacle/Action/UtgardePinnacleActions.h b/src/Ai/Dungeon/UP/UPActions.h
similarity index 94%
rename from src/Ai/Dungeon/UtgardePinnacle/Action/UtgardePinnacleActions.h
rename to src/Ai/Dungeon/UP/UPActions.h
index 38e90dd15..444b0e184 100644
--- a/src/Ai/Dungeon/UtgardePinnacle/Action/UtgardePinnacleActions.h
+++ b/src/Ai/Dungeon/UP/UPActions.h
@@ -5,7 +5,7 @@
 #include "AttackAction.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "UtgardePinnacleTriggers.h"
+#include "UPTriggers.h"
 
 class AvoidFreezingCloudAction : public MovementAction
 {
diff --git a/src/Ai/Dungeon/UtgardePinnacle/Multiplier/UtgardePinnacleMultipliers.cpp b/src/Ai/Dungeon/UP/UPMultipliers.cpp
similarity index 96%
rename from src/Ai/Dungeon/UtgardePinnacle/Multiplier/UtgardePinnacleMultipliers.cpp
rename to src/Ai/Dungeon/UP/UPMultipliers.cpp
index cc34cb6a4..bccf84028 100644
--- a/src/Ai/Dungeon/UtgardePinnacle/Multiplier/UtgardePinnacleMultipliers.cpp
+++ b/src/Ai/Dungeon/UP/UPMultipliers.cpp
@@ -1,9 +1,9 @@
-#include "UtgardePinnacleMultipliers.h"
-#include "UtgardePinnacleActions.h"
+#include "UPMultipliers.h"
+#include "UPActions.h"
 #include "GenericSpellActions.h"
 #include "ChooseTargetActions.h"
 #include "MovementActions.h"
-#include "UtgardePinnacleTriggers.h"
+#include "UPTriggers.h"
 #include "Action.h"
 
 float SkadiMultiplier::GetValue(Action* action)
diff --git a/src/Ai/Dungeon/UtgardePinnacle/Multiplier/UtgardePinnacleMultipliers.h b/src/Ai/Dungeon/UP/UPMultipliers.h
similarity index 100%
rename from src/Ai/Dungeon/UtgardePinnacle/Multiplier/UtgardePinnacleMultipliers.h
rename to src/Ai/Dungeon/UP/UPMultipliers.h
diff --git a/src/Ai/Dungeon/UtgardePinnacle/Strategy/UtgardePinnacleStrategy.cpp b/src/Ai/Dungeon/UP/UPStrategy.cpp
similarity index 92%
rename from src/Ai/Dungeon/UtgardePinnacle/Strategy/UtgardePinnacleStrategy.cpp
rename to src/Ai/Dungeon/UP/UPStrategy.cpp
index fe104f34f..392c23c2f 100644
--- a/src/Ai/Dungeon/UtgardePinnacle/Strategy/UtgardePinnacleStrategy.cpp
+++ b/src/Ai/Dungeon/UP/UPStrategy.cpp
@@ -1,5 +1,5 @@
-#include "UtgardePinnacleStrategy.h"
-#include "UtgardePinnacleMultipliers.h"
+#include "UPStrategy.h"
+#include "UPMultipliers.h"
 
 void WotlkDungeonUPStrategy::InitTriggers(std::vector<TriggerNode*> &triggers)
 {
diff --git a/src/Ai/Dungeon/UtgardePinnacle/Strategy/UtgardePinnacleStrategy.h b/src/Ai/Dungeon/UP/UPStrategy.h
similarity index 100%
rename from src/Ai/Dungeon/UtgardePinnacle/Strategy/UtgardePinnacleStrategy.h
rename to src/Ai/Dungeon/UP/UPStrategy.h
diff --git a/src/Ai/Dungeon/UtgardePinnacle/UtgardePinnacleTriggerContext.h b/src/Ai/Dungeon/UP/UPTriggerContext.h
similarity index 95%
rename from src/Ai/Dungeon/UtgardePinnacle/UtgardePinnacleTriggerContext.h
rename to src/Ai/Dungeon/UP/UPTriggerContext.h
index 527453f8b..ffcafad67 100644
--- a/src/Ai/Dungeon/UtgardePinnacle/UtgardePinnacleTriggerContext.h
+++ b/src/Ai/Dungeon/UP/UPTriggerContext.h
@@ -3,7 +3,7 @@
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
-#include "UtgardePinnacleTriggers.h"
+#include "UPTriggers.h"
 
 class WotlkDungeonUPTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Dungeon/UtgardePinnacle/Trigger/UtgardePinnacleTriggers.cpp b/src/Ai/Dungeon/UP/UPTriggers.cpp
similarity index 98%
rename from src/Ai/Dungeon/UtgardePinnacle/Trigger/UtgardePinnacleTriggers.cpp
rename to src/Ai/Dungeon/UP/UPTriggers.cpp
index dc35e8be0..4baeaa725 100644
--- a/src/Ai/Dungeon/UtgardePinnacle/Trigger/UtgardePinnacleTriggers.cpp
+++ b/src/Ai/Dungeon/UP/UPTriggers.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "UtgardePinnacleTriggers.h"
+#include "UPTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Dungeon/UtgardePinnacle/Trigger/UtgardePinnacleTriggers.h b/src/Ai/Dungeon/UP/UPTriggers.h
similarity index 100%
rename from src/Ai/Dungeon/UtgardePinnacle/Trigger/UtgardePinnacleTriggers.h
rename to src/Ai/Dungeon/UP/UPTriggers.h
diff --git a/src/Ai/Dungeon/VioletHold/VioletHoldActionContext.h b/src/Ai/Dungeon/VH/VHActionContext.h
similarity index 97%
rename from src/Ai/Dungeon/VioletHold/VioletHoldActionContext.h
rename to src/Ai/Dungeon/VH/VHActionContext.h
index 902332f15..783d49081 100644
--- a/src/Ai/Dungeon/VioletHold/VioletHoldActionContext.h
+++ b/src/Ai/Dungeon/VH/VHActionContext.h
@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "VioletHoldActions.h"
+#include "VHActions.h"
 
 class WotlkDungeonVHActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Dungeon/VioletHold/Action/VioletHoldActions.cpp b/src/Ai/Dungeon/VH/VHActions.cpp
similarity index 98%
rename from src/Ai/Dungeon/VioletHold/Action/VioletHoldActions.cpp
rename to src/Ai/Dungeon/VH/VHActions.cpp
index b61f84bdf..aa04fdb41 100644
--- a/src/Ai/Dungeon/VioletHold/Action/VioletHoldActions.cpp
+++ b/src/Ai/Dungeon/VH/VHActions.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "VioletHoldActions.h"
+#include "VHActions.h"
 
 bool AttackErekemAction::Execute(Event /*event*/)
 {
diff --git a/src/Ai/Dungeon/VioletHold/Action/VioletHoldActions.h b/src/Ai/Dungeon/VH/VHActions.h
similarity index 97%
rename from src/Ai/Dungeon/VioletHold/Action/VioletHoldActions.h
rename to src/Ai/Dungeon/VH/VHActions.h
index fc7ce9d29..64e5e74f5 100644
--- a/src/Ai/Dungeon/VioletHold/Action/VioletHoldActions.h
+++ b/src/Ai/Dungeon/VH/VHActions.h
@@ -6,7 +6,7 @@
 #include "GenericSpellActions.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "VioletHoldTriggers.h"
+#include "VHTriggers.h"
 
 class AttackErekemAction : public AttackAction
 {
diff --git a/src/Ai/Dungeon/VioletHold/Multiplier/VioletHoldMultipliers.cpp b/src/Ai/Dungeon/VH/VHMultipliers.cpp
similarity index 93%
rename from src/Ai/Dungeon/VioletHold/Multiplier/VioletHoldMultipliers.cpp
rename to src/Ai/Dungeon/VH/VHMultipliers.cpp
index 3d3a13cd0..d5f79324a 100644
--- a/src/Ai/Dungeon/VioletHold/Multiplier/VioletHoldMultipliers.cpp
+++ b/src/Ai/Dungeon/VH/VHMultipliers.cpp
@@ -1,9 +1,9 @@
-#include "VioletHoldMultipliers.h"
-#include "VioletHoldActions.h"
+#include "VHMultipliers.h"
+#include "VHActions.h"
 #include "GenericSpellActions.h"
 #include "ChooseTargetActions.h"
 #include "MovementActions.h"
-#include "VioletHoldTriggers.h"
+#include "VHTriggers.h"
 #include "Action.h"
 
 float ErekemMultiplier::GetValue(Action* action)
diff --git a/src/Ai/Dungeon/VioletHold/Multiplier/VioletHoldMultipliers.h b/src/Ai/Dungeon/VH/VHMultipliers.h
similarity index 100%
rename from src/Ai/Dungeon/VioletHold/Multiplier/VioletHoldMultipliers.h
rename to src/Ai/Dungeon/VH/VHMultipliers.h
diff --git a/src/Ai/Dungeon/VioletHold/Strategy/VioletHoldStrategy.cpp b/src/Ai/Dungeon/VH/VHStrategy.cpp
similarity index 95%
rename from src/Ai/Dungeon/VioletHold/Strategy/VioletHoldStrategy.cpp
rename to src/Ai/Dungeon/VH/VHStrategy.cpp
index ffc00e306..a30fa733a 100644
--- a/src/Ai/Dungeon/VioletHold/Strategy/VioletHoldStrategy.cpp
+++ b/src/Ai/Dungeon/VH/VHStrategy.cpp
@@ -1,5 +1,5 @@
-#include "VioletHoldStrategy.h"
-#include "VioletHoldMultipliers.h"
+#include "VHStrategy.h"
+#include "VHMultipliers.h"
 
 void WotlkDungeonVHStrategy::InitTriggers(std::vector<TriggerNode*> &triggers)
 {
diff --git a/src/Ai/Dungeon/VioletHold/Strategy/VioletHoldStrategy.h b/src/Ai/Dungeon/VH/VHStrategy.h
similarity index 100%
rename from src/Ai/Dungeon/VioletHold/Strategy/VioletHoldStrategy.h
rename to src/Ai/Dungeon/VH/VHStrategy.h
diff --git a/src/Ai/Dungeon/VioletHold/VioletHoldTriggerContext.h b/src/Ai/Dungeon/VH/VHTriggerContext.h
similarity index 97%
rename from src/Ai/Dungeon/VioletHold/VioletHoldTriggerContext.h
rename to src/Ai/Dungeon/VH/VHTriggerContext.h
index 45d298121..9106f2a13 100644
--- a/src/Ai/Dungeon/VioletHold/VioletHoldTriggerContext.h
+++ b/src/Ai/Dungeon/VH/VHTriggerContext.h
@@ -3,7 +3,7 @@
 
 #include "NamedObjectContext.h"
 #include "AiObjectContext.h"
-#include "VioletHoldTriggers.h"
+#include "VHTriggers.h"
 
 class WotlkDungeonVHTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Dungeon/VioletHold/Trigger/VioletHoldTriggers.cpp b/src/Ai/Dungeon/VH/VHTriggers.cpp
similarity index 97%
rename from src/Ai/Dungeon/VioletHold/Trigger/VioletHoldTriggers.cpp
rename to src/Ai/Dungeon/VH/VHTriggers.cpp
index 87284b0e4..26d05f96f 100644
--- a/src/Ai/Dungeon/VioletHold/Trigger/VioletHoldTriggers.cpp
+++ b/src/Ai/Dungeon/VH/VHTriggers.cpp
@@ -1,5 +1,5 @@
 #include "Playerbots.h"
-#include "VioletHoldTriggers.h"
+#include "VHTriggers.h"
 #include "AiObject.h"
 #include "AiObjectContext.h"
 
diff --git a/src/Ai/Dungeon/VioletHold/Trigger/VioletHoldTriggers.h b/src/Ai/Dungeon/VH/VHTriggers.h
similarity index 100%
rename from src/Ai/Dungeon/VioletHold/Trigger/VioletHoldTriggers.h
rename to src/Ai/Dungeon/VH/VHTriggers.h
diff --git a/src/Ai/Dungeon/WotlkDungeonActionContext.h b/src/Ai/Dungeon/WotlkDungeonActionContext.h
index c7202de61..b77f94fcc 100644
--- a/src/Ai/Dungeon/WotlkDungeonActionContext.h
+++ b/src/Ai/Dungeon/WotlkDungeonActionContext.h
@@ -1,21 +1,21 @@
 #ifndef _PLAYERBOT_WOTLKDUNGEONACTIONCONTEXT_H
 #define _PLAYERBOT_WOTLKDUNGEONACTIONCONTEXT_H
 
-#include "UtgardeKeep/UtgardeKeepActionContext.h"
-#include "Nexus/NexusActionContext.h"
-#include "AzjolNerub/AzjolNerubActionContext.h"
-#include "OldKingdom/OldKingdomActionContext.h"
-#include "DraktharonKeep/DrakTharonKeepActionContext.h"
-#include "VioletHold/VioletHoldActionContext.h"
-#include "Gundrak/GundrakActionContext.h"
-#include "HallsOfStone/HallsOfStoneActionContext.h"
-#include "HallsOfLightning/HallsOfLightningActionContext.h"
-#include "Oculus/OculusActionContext.h"
-#include "UtgardePinnacle/UtgardePinnacleActionContext.h"
-#include "CullingOfStratholme/CullingOfStratholmeActionContext.h"
-#include "ForgeOfSouls/ForgeOfSoulsActionContext.h"
-#include "PitOfSaron/PitOfSaronActionContext.h"
-#include "TrialOfTheChampion/TrialOfTheChampionActionContext.h"
+#include "UKActionContext.h"
+#include "NexActionContext.h"
+#include "ANActionContext.h"
+#include "AKActionContext.h"
+#include "DTKActionContext.h"
+#include "VHActionContext.h"
+#include "GDActionContext.h"
+#include "HoSActionContext.h"
+#include "HoLActionContext.h"
+#include "OCActionContext.h"
+#include "UPActionContext.h"
+#include "CoSActionContext.h"
+#include "FoSActionContext.h"
+#include "PoSActionContext.h"
+#include "TOCActionContext.h"
 // #include "HallsOfReflection/HallsOfReflectionActionContext.h"
 
 #endif
diff --git a/src/Ai/Dungeon/WotlkDungeonTriggerContext.h b/src/Ai/Dungeon/WotlkDungeonTriggerContext.h
index 630aecbd9..b07973d6b 100644
--- a/src/Ai/Dungeon/WotlkDungeonTriggerContext.h
+++ b/src/Ai/Dungeon/WotlkDungeonTriggerContext.h
@@ -1,21 +1,21 @@
 #ifndef _PLAYERBOT_WOTLKDUNGEONTRIGGERCONTEXT_H
 #define _PLAYERBOT_WOTLKDUNGEONTRIGGERCONTEXT_H
 
-#include "UtgardeKeep/UtgardeKeepTriggerContext.h"
-#include "Nexus/NexusTriggerContext.h"
-#include "AzjolNerub/AzjolNerubTriggerContext.h"
-#include "OldKingdom/OldKingdomTriggerContext.h"
-#include "DraktharonKeep/DrakTharonKeepTriggerContext.h"
-#include "VioletHold/VioletHoldTriggerContext.h"
-#include "Gundrak/GundrakTriggerContext.h"
-#include "HallsOfStone/HallsOfStoneTriggerContext.h"
-#include "HallsOfLightning/HallsOfLightningTriggerContext.h"
-#include "Oculus/OculusTriggerContext.h"
-#include "UtgardePinnacle/UtgardePinnacleTriggerContext.h"
-#include "CullingOfStratholme/CullingOfStratholmeTriggerContext.h"
-#include "ForgeOfSouls/ForgeOfSoulsTriggerContext.h"
-#include "PitOfSaron/PitOfSaronTriggerContext.h"
-#include "TrialOfTheChampion/TrialOfTheChampionTriggerContext.h"
+#include "UKTriggerContext.h"
+#include "NexTriggerContext.h"
+#include "ANTriggerContext.h"
+#include "AKTriggerContext.h"
+#include "DTKTriggerContext.h"
+#include "VHTriggerContext.h"
+#include "GDTriggerContext.h"
+#include "HoSTriggerContext.h"
+#include "HoLTriggerContext.h"
+#include "OCTriggerContext.h"
+#include "UPTriggerContext.h"
+#include "CoSTriggerContext.h"
+#include "FoSTriggerContext.h"
+#include "PoSTriggerContext.h"
+#include "TOCTriggerContext.h"
 // #include "HallsOfReflection/HallsOfReflectionTriggerContext.h"
 
 #endif
diff --git a/src/Ai/Raid/Aq20/RaidAq20ActionContext.h b/src/Ai/Raid/Aq20/Aq20ActionContext.h
similarity index 93%
rename from src/Ai/Raid/Aq20/RaidAq20ActionContext.h
rename to src/Ai/Raid/Aq20/Aq20ActionContext.h
index ea3afcf41..cde831f5c 100644
--- a/src/Ai/Raid/Aq20/RaidAq20ActionContext.h
+++ b/src/Ai/Raid/Aq20/Aq20ActionContext.h
@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "RaidAq20Actions.h"
+#include "Aq20Actions.h"
 
 class RaidAq20ActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Raid/Aq20/Action/RaidAq20Actions.cpp b/src/Ai/Raid/Aq20/Aq20Actions.cpp
similarity index 97%
rename from src/Ai/Raid/Aq20/Action/RaidAq20Actions.cpp
rename to src/Ai/Raid/Aq20/Aq20Actions.cpp
index 5d9b4aaa3..8f4d63801 100644
--- a/src/Ai/Raid/Aq20/Action/RaidAq20Actions.cpp
+++ b/src/Ai/Raid/Aq20/Aq20Actions.cpp
@@ -1,6 +1,6 @@
-#include "RaidAq20Actions.h"
+#include "Aq20Actions.h"
 
-#include "RaidAq20Utils.h"
+#include "Aq20Utils.h"
 
 bool Aq20UseCrystalAction::Execute(Event /*event*/)
 {
diff --git a/src/Ai/Raid/Aq20/Action/RaidAq20Actions.h b/src/Ai/Raid/Aq20/Aq20Actions.h
similarity index 100%
rename from src/Ai/Raid/Aq20/Action/RaidAq20Actions.h
rename to src/Ai/Raid/Aq20/Aq20Actions.h
diff --git a/src/Ai/Raid/Aq20/Strategy/RaidAq20Strategy.cpp b/src/Ai/Raid/Aq20/Aq20Strategy.cpp
similarity index 88%
rename from src/Ai/Raid/Aq20/Strategy/RaidAq20Strategy.cpp
rename to src/Ai/Raid/Aq20/Aq20Strategy.cpp
index 93e0462ca..a16c2b652 100644
--- a/src/Ai/Raid/Aq20/Strategy/RaidAq20Strategy.cpp
+++ b/src/Ai/Raid/Aq20/Aq20Strategy.cpp
@@ -1,4 +1,4 @@
-#include "RaidAq20Strategy.h"
+#include "Aq20Strategy.h"
 
 #include "Strategy.h"
 
diff --git a/src/Ai/Raid/Aq20/Strategy/RaidAq20Strategy.h b/src/Ai/Raid/Aq20/Aq20Strategy.h
similarity index 100%
rename from src/Ai/Raid/Aq20/Strategy/RaidAq20Strategy.h
rename to src/Ai/Raid/Aq20/Aq20Strategy.h
diff --git a/src/Ai/Raid/Aq20/RaidAq20TriggerContext.h b/src/Ai/Raid/Aq20/Aq20TriggerContext.h
similarity index 93%
rename from src/Ai/Raid/Aq20/RaidAq20TriggerContext.h
rename to src/Ai/Raid/Aq20/Aq20TriggerContext.h
index b0307ca6a..cdc101da1 100644
--- a/src/Ai/Raid/Aq20/RaidAq20TriggerContext.h
+++ b/src/Ai/Raid/Aq20/Aq20TriggerContext.h
@@ -2,7 +2,7 @@
 #define _PLAYERBOT_RAIDAQ20TRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
-#include "RaidAq20Triggers.h"
+#include "Aq20Triggers.h"
 
 class RaidAq20TriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Raid/Aq20/Trigger/RaidAq20Triggers.cpp b/src/Ai/Raid/Aq20/Aq20Triggers.cpp
similarity index 96%
rename from src/Ai/Raid/Aq20/Trigger/RaidAq20Triggers.cpp
rename to src/Ai/Raid/Aq20/Aq20Triggers.cpp
index 913cb2690..77bd0395d 100644
--- a/src/Ai/Raid/Aq20/Trigger/RaidAq20Triggers.cpp
+++ b/src/Ai/Raid/Aq20/Aq20Triggers.cpp
@@ -1,6 +1,6 @@
-#include "RaidAq20Triggers.h"
+#include "Aq20Triggers.h"
 
-#include "RaidAq20Utils.h"
+#include "Aq20Utils.h"
 
 bool Aq20MoveToCrystalTrigger::IsActive()
 {
diff --git a/src/Ai/Raid/Aq20/Trigger/RaidAq20Triggers.h b/src/Ai/Raid/Aq20/Aq20Triggers.h
similarity index 100%
rename from src/Ai/Raid/Aq20/Trigger/RaidAq20Triggers.h
rename to src/Ai/Raid/Aq20/Aq20Triggers.h
diff --git a/src/Ai/Raid/Aq20/Util/RaidAq20Utils.cpp b/src/Ai/Raid/Aq20/Aq20Utils.cpp
similarity index 97%
rename from src/Ai/Raid/Aq20/Util/RaidAq20Utils.cpp
rename to src/Ai/Raid/Aq20/Aq20Utils.cpp
index 41637af7b..e7c74d4f3 100644
--- a/src/Ai/Raid/Aq20/Util/RaidAq20Utils.cpp
+++ b/src/Ai/Raid/Aq20/Aq20Utils.cpp
@@ -1,4 +1,4 @@
-#include "RaidAq20Utils.h"
+#include "Aq20Utils.h"
 
 #include "SpellAuras.h"
 
diff --git a/src/Ai/Raid/Aq20/Util/RaidAq20Utils.h b/src/Ai/Raid/Aq20/Aq20Utils.h
similarity index 100%
rename from src/Ai/Raid/Aq20/Util/RaidAq20Utils.h
rename to src/Ai/Raid/Aq20/Aq20Utils.h
diff --git a/src/Ai/Raid/BlackTemple/RaidBlackTempleActionContext.h b/src/Ai/Raid/BT/BTActionContext.h
similarity index 99%
rename from src/Ai/Raid/BlackTemple/RaidBlackTempleActionContext.h
rename to src/Ai/Raid/BT/BTActionContext.h
index 8271449b5..7a962857e 100644
--- a/src/Ai/Raid/BlackTemple/RaidBlackTempleActionContext.h
+++ b/src/Ai/Raid/BT/BTActionContext.h
@@ -7,7 +7,7 @@
 #define _PLAYERBOT_RAIDBLACKTEMPLEACTIONCONTEXT_H
 
 #include "NamedObjectContext.h"
-#include "RaidBlackTempleActions.h"
+#include "BTActions.h"
 
 class RaidBlackTempleActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Raid/BlackTemple/Action/RaidBlackTempleActions.cpp b/src/Ai/Raid/BT/BTActions.cpp
similarity index 99%
rename from src/Ai/Raid/BlackTemple/Action/RaidBlackTempleActions.cpp
rename to src/Ai/Raid/BT/BTActions.cpp
index cd6c06892..42c33509e 100644
--- a/src/Ai/Raid/BlackTemple/Action/RaidBlackTempleActions.cpp
+++ b/src/Ai/Raid/BT/BTActions.cpp
@@ -3,13 +3,13 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidBlackTempleActions.h"
+#include "BTActions.h"
 
 #include <vector>
 
 #include "CreatureAI.h"
 #include "Playerbots.h"
-#include "RaidBlackTempleHelpers.h"
+#include "BTHelpers.h"
 #include "RaidBossHelpers.h"
 
 using namespace BlackTempleHelpers;
diff --git a/src/Ai/Raid/BlackTemple/Action/RaidBlackTempleActions.h b/src/Ai/Raid/BT/BTActions.h
similarity index 99%
rename from src/Ai/Raid/BlackTemple/Action/RaidBlackTempleActions.h
rename to src/Ai/Raid/BT/BTActions.h
index d4bc41d23..b4386f892 100644
--- a/src/Ai/Raid/BlackTemple/Action/RaidBlackTempleActions.h
+++ b/src/Ai/Raid/BT/BTActions.h
@@ -9,7 +9,7 @@
 #include "Action.h"
 #include "AttackAction.h"
 #include "MovementActions.h"
-#include "RaidBlackTempleHelpers.h"
+#include "BTHelpers.h"
 
 namespace BlackTempleHelpers
 {
diff --git a/src/Ai/Raid/BlackTemple/Util/RaidBlackTempleHelpers.cpp b/src/Ai/Raid/BT/BTHelpers.cpp
similarity index 99%
rename from src/Ai/Raid/BlackTemple/Util/RaidBlackTempleHelpers.cpp
rename to src/Ai/Raid/BT/BTHelpers.cpp
index 75b0be0ba..2ba4adca2 100644
--- a/src/Ai/Raid/BlackTemple/Util/RaidBlackTempleHelpers.cpp
+++ b/src/Ai/Raid/BT/BTHelpers.cpp
@@ -3,7 +3,7 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidBlackTempleHelpers.h"
+#include "BTHelpers.h"
 
 #include "Playerbots.h"
 #include "RaidBossHelpers.h"
diff --git a/src/Ai/Raid/BlackTemple/Util/RaidBlackTempleHelpers.h b/src/Ai/Raid/BT/BTHelpers.h
similarity index 100%
rename from src/Ai/Raid/BlackTemple/Util/RaidBlackTempleHelpers.h
rename to src/Ai/Raid/BT/BTHelpers.h
diff --git a/src/Ai/Raid/BlackTemple/Multiplier/RaidBlackTempleMultipliers.cpp b/src/Ai/Raid/BT/BTMultipliers.cpp
similarity index 99%
rename from src/Ai/Raid/BlackTemple/Multiplier/RaidBlackTempleMultipliers.cpp
rename to src/Ai/Raid/BT/BTMultipliers.cpp
index 94e5143a6..6e484e421 100644
--- a/src/Ai/Raid/BlackTemple/Multiplier/RaidBlackTempleMultipliers.cpp
+++ b/src/Ai/Raid/BT/BTMultipliers.cpp
@@ -3,7 +3,7 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidBlackTempleMultipliers.h"
+#include "BTMultipliers.h"
 
 #include "ChooseTargetActions.h"
 #include "DKActions.h"
@@ -15,8 +15,8 @@
 #include "MageActions.h"
 #include "PaladinActions.h"
 #include "PriestActions.h"
-#include "RaidBlackTempleActions.h"
-#include "RaidBlackTempleHelpers.h"
+#include "BTActions.h"
+#include "BTHelpers.h"
 #include "ReachTargetActions.h"
 #include "RogueActions.h"
 #include "ShamanActions.h"
diff --git a/src/Ai/Raid/BlackTemple/Multiplier/RaidBlackTempleMultipliers.h b/src/Ai/Raid/BT/BTMultipliers.h
similarity index 100%
rename from src/Ai/Raid/BlackTemple/Multiplier/RaidBlackTempleMultipliers.h
rename to src/Ai/Raid/BT/BTMultipliers.h
diff --git a/src/Ai/Raid/BlackTemple/Strategy/RaidBlackTempleStrategy.cpp b/src/Ai/Raid/BT/BTStrategy.cpp
similarity index 99%
rename from src/Ai/Raid/BlackTemple/Strategy/RaidBlackTempleStrategy.cpp
rename to src/Ai/Raid/BT/BTStrategy.cpp
index 157469895..3fd0adeff 100644
--- a/src/Ai/Raid/BlackTemple/Strategy/RaidBlackTempleStrategy.cpp
+++ b/src/Ai/Raid/BT/BTStrategy.cpp
@@ -3,9 +3,9 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidBlackTempleStrategy.h"
+#include "BTStrategy.h"
 
-#include "RaidBlackTempleMultipliers.h"
+#include "BTMultipliers.h"
 
 void RaidBlackTempleStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
diff --git a/src/Ai/Raid/BlackTemple/Strategy/RaidBlackTempleStrategy.h b/src/Ai/Raid/BT/BTStrategy.h
similarity index 100%
rename from src/Ai/Raid/BlackTemple/Strategy/RaidBlackTempleStrategy.h
rename to src/Ai/Raid/BT/BTStrategy.h
diff --git a/src/Ai/Raid/BlackTemple/RaidBlackTempleTriggerContext.h b/src/Ai/Raid/BT/BTTriggerContext.h
similarity index 99%
rename from src/Ai/Raid/BlackTemple/RaidBlackTempleTriggerContext.h
rename to src/Ai/Raid/BT/BTTriggerContext.h
index d9cc09489..ee10108ad 100644
--- a/src/Ai/Raid/BlackTemple/RaidBlackTempleTriggerContext.h
+++ b/src/Ai/Raid/BT/BTTriggerContext.h
@@ -7,7 +7,7 @@
 #define _PLAYERBOT_RAIDBLACKTEMPLETRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
-#include "RaidBlackTempleTriggers.h"
+#include "BTTriggers.h"
 
 class RaidBlackTempleTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Raid/BlackTemple/Trigger/RaidBlackTempleTriggers.cpp b/src/Ai/Raid/BT/BTTriggers.cpp
similarity index 99%
rename from src/Ai/Raid/BlackTemple/Trigger/RaidBlackTempleTriggers.cpp
rename to src/Ai/Raid/BT/BTTriggers.cpp
index 388e28d8b..6dc5e574c 100644
--- a/src/Ai/Raid/BlackTemple/Trigger/RaidBlackTempleTriggers.cpp
+++ b/src/Ai/Raid/BT/BTTriggers.cpp
@@ -3,12 +3,12 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidBlackTempleTriggers.h"
+#include "BTTriggers.h"
 
 #include "AiFactory.h"
 #include "Playerbots.h"
-#include "RaidBlackTempleActions.h"
-#include "RaidBlackTempleHelpers.h"
+#include "BTActions.h"
+#include "BTHelpers.h"
 #include "RaidBossHelpers.h"
 #include "SharedDefines.h"
 
diff --git a/src/Ai/Raid/BlackTemple/Trigger/RaidBlackTempleTriggers.h b/src/Ai/Raid/BT/BTTriggers.h
similarity index 100%
rename from src/Ai/Raid/BlackTemple/Trigger/RaidBlackTempleTriggers.h
rename to src/Ai/Raid/BT/BTTriggers.h
diff --git a/src/Ai/Raid/BlackwingLair/RaidBwlActionContext.h b/src/Ai/Raid/BWL/BWLActionContext.h
similarity index 97%
rename from src/Ai/Raid/BlackwingLair/RaidBwlActionContext.h
rename to src/Ai/Raid/BWL/BWLActionContext.h
index 4e46b1ca5..db93476fe 100644
--- a/src/Ai/Raid/BlackwingLair/RaidBwlActionContext.h
+++ b/src/Ai/Raid/BWL/BWLActionContext.h
@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "RaidBwlActions.h"
+#include "BWLActions.h"
 
 class RaidBwlActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Raid/BlackwingLair/Action/RaidBwlActions.cpp b/src/Ai/Raid/BWL/BWLActions.cpp
similarity index 95%
rename from src/Ai/Raid/BlackwingLair/Action/RaidBwlActions.cpp
rename to src/Ai/Raid/BWL/BWLActions.cpp
index 7a12c3b87..10c8dc4ae 100644
--- a/src/Ai/Raid/BlackwingLair/Action/RaidBwlActions.cpp
+++ b/src/Ai/Raid/BWL/BWLActions.cpp
@@ -1,7 +1,7 @@
-#include "RaidBwlActions.h"
+#include "BWLActions.h"
 
 #include "Playerbots.h"
-#include "RaidBwlHelpers.h"
+#include "BWLHelpers.h"
 
 using namespace BlackwingLairHelpers;
 
diff --git a/src/Ai/Raid/BlackwingLair/Action/RaidBwlActions.h b/src/Ai/Raid/BWL/BWLActions.h
similarity index 100%
rename from src/Ai/Raid/BlackwingLair/Action/RaidBwlActions.h
rename to src/Ai/Raid/BWL/BWLActions.h
diff --git a/src/Ai/Raid/BlackwingLair/Util/RaidBwlHelpers.cpp b/src/Ai/Raid/BWL/BWLHelpers.cpp
similarity index 91%
rename from src/Ai/Raid/BlackwingLair/Util/RaidBwlHelpers.cpp
rename to src/Ai/Raid/BWL/BWLHelpers.cpp
index cc0714bd1..c4536064f 100644
--- a/src/Ai/Raid/BlackwingLair/Util/RaidBwlHelpers.cpp
+++ b/src/Ai/Raid/BWL/BWLHelpers.cpp
@@ -1,4 +1,4 @@
-#include "RaidBwlHelpers.h"
+#include "BWLHelpers.h"
 
 namespace BlackwingLairHelpers
 {
diff --git a/src/Ai/Raid/BlackwingLair/Util/RaidBwlHelpers.h b/src/Ai/Raid/BWL/BWLHelpers.h
similarity index 100%
rename from src/Ai/Raid/BlackwingLair/Util/RaidBwlHelpers.h
rename to src/Ai/Raid/BWL/BWLHelpers.h
diff --git a/src/Ai/Raid/BlackwingLair/Strategy/RaidBwlStrategy.cpp b/src/Ai/Raid/BWL/BWLStrategy.cpp
similarity index 96%
rename from src/Ai/Raid/BlackwingLair/Strategy/RaidBwlStrategy.cpp
rename to src/Ai/Raid/BWL/BWLStrategy.cpp
index 76d0da5ef..1e69be6e8 100644
--- a/src/Ai/Raid/BlackwingLair/Strategy/RaidBwlStrategy.cpp
+++ b/src/Ai/Raid/BWL/BWLStrategy.cpp
@@ -1,4 +1,4 @@
-#include "RaidBwlStrategy.h"
+#include "BWLStrategy.h"
 
 void RaidBwlStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
diff --git a/src/Ai/Raid/BlackwingLair/Strategy/RaidBwlStrategy.h b/src/Ai/Raid/BWL/BWLStrategy.h
similarity index 100%
rename from src/Ai/Raid/BlackwingLair/Strategy/RaidBwlStrategy.h
rename to src/Ai/Raid/BWL/BWLStrategy.h
diff --git a/src/Ai/Raid/BlackwingLair/RaidBwlTriggerContext.h b/src/Ai/Raid/BWL/BWLTriggerContext.h
similarity index 97%
rename from src/Ai/Raid/BlackwingLair/RaidBwlTriggerContext.h
rename to src/Ai/Raid/BWL/BWLTriggerContext.h
index a2de3fd5a..e3b9b599d 100644
--- a/src/Ai/Raid/BlackwingLair/RaidBwlTriggerContext.h
+++ b/src/Ai/Raid/BWL/BWLTriggerContext.h
@@ -2,7 +2,7 @@
 #define _PLAYERBOT_RAIDBWLTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
-#include "RaidBwlTriggers.h"
+#include "BWLTriggers.h"
 
 class RaidBwlTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Raid/BlackwingLair/Trigger/RaidBwlTriggers.cpp b/src/Ai/Raid/BWL/BWLTriggers.cpp
similarity index 94%
rename from src/Ai/Raid/BlackwingLair/Trigger/RaidBwlTriggers.cpp
rename to src/Ai/Raid/BWL/BWLTriggers.cpp
index 500c81a92..c977563d0 100644
--- a/src/Ai/Raid/BlackwingLair/Trigger/RaidBwlTriggers.cpp
+++ b/src/Ai/Raid/BWL/BWLTriggers.cpp
@@ -1,7 +1,7 @@
-#include "RaidBwlTriggers.h"
+#include "BWLTriggers.h"
 
 #include "Playerbots.h"
-#include "RaidBwlHelpers.h"
+#include "BWLHelpers.h"
 
 using namespace BlackwingLairHelpers;
 
diff --git a/src/Ai/Raid/BlackwingLair/Trigger/RaidBwlTriggers.h b/src/Ai/Raid/BWL/BWLTriggers.h
similarity index 100%
rename from src/Ai/Raid/BlackwingLair/Trigger/RaidBwlTriggers.h
rename to src/Ai/Raid/BWL/BWLTriggers.h
diff --git a/src/Ai/Raid/EyeOfEternity/RaidEoEActionContext.h b/src/Ai/Raid/EoE/EoEActionContext.h
similarity index 97%
rename from src/Ai/Raid/EyeOfEternity/RaidEoEActionContext.h
rename to src/Ai/Raid/EoE/EoEActionContext.h
index 620610e91..230c417b4 100644
--- a/src/Ai/Raid/EyeOfEternity/RaidEoEActionContext.h
+++ b/src/Ai/Raid/EoE/EoEActionContext.h
@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "RaidEoEActions.h"
+#include "EoEActions.h"
 
 class RaidEoEActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Raid/EyeOfEternity/Action/RaidEoEActions.cpp b/src/Ai/Raid/EoE/EoEActions.cpp
similarity index 99%
rename from src/Ai/Raid/EyeOfEternity/Action/RaidEoEActions.cpp
rename to src/Ai/Raid/EoE/EoEActions.cpp
index b08db3f33..051c51344 100644
--- a/src/Ai/Raid/EyeOfEternity/Action/RaidEoEActions.cpp
+++ b/src/Ai/Raid/EoE/EoEActions.cpp
@@ -1,6 +1,6 @@
 #include "Playerbots.h"
-#include "RaidEoEActions.h"
-#include "RaidEoETriggers.h"
+#include "EoEActions.h"
+#include "EoETriggers.h"
 
 bool MalygosPositionAction::Execute(Event /*event*/)
 {
diff --git a/src/Ai/Raid/EyeOfEternity/Action/RaidEoEActions.h b/src/Ai/Raid/EoE/EoEActions.h
similarity index 100%
rename from src/Ai/Raid/EyeOfEternity/Action/RaidEoEActions.h
rename to src/Ai/Raid/EoE/EoEActions.h
diff --git a/src/Ai/Raid/EyeOfEternity/Multiplier/RaidEoEMultipliers.cpp b/src/Ai/Raid/EoE/EoEMultipliers.cpp
similarity index 95%
rename from src/Ai/Raid/EyeOfEternity/Multiplier/RaidEoEMultipliers.cpp
rename to src/Ai/Raid/EoE/EoEMultipliers.cpp
index a2d8a3f1d..490b31125 100644
--- a/src/Ai/Raid/EyeOfEternity/Multiplier/RaidEoEMultipliers.cpp
+++ b/src/Ai/Raid/EoE/EoEMultipliers.cpp
@@ -1,4 +1,4 @@
-#include "RaidEoEMultipliers.h"
+#include "EoEMultipliers.h"
 
 #include "ChooseTargetActions.h"
 #include "DKActions.h"
@@ -9,8 +9,8 @@
 #include "GenericSpellActions.h"
 #include "MovementActions.h"
 #include "PaladinActions.h"
-#include "RaidEoEActions.h"
-#include "RaidEoETriggers.h"
+#include "EoEActions.h"
+#include "EoETriggers.h"
 #include "ReachTargetActions.h"
 #include "ScriptedCreature.h"
 #include "WarriorActions.h"
diff --git a/src/Ai/Raid/EyeOfEternity/Multiplier/RaidEoEMultipliers.h b/src/Ai/Raid/EoE/EoEMultipliers.h
similarity index 100%
rename from src/Ai/Raid/EyeOfEternity/Multiplier/RaidEoEMultipliers.h
rename to src/Ai/Raid/EoE/EoEMultipliers.h
diff --git a/src/Ai/Raid/EyeOfEternity/Strategy/RaidEoEStrategy.cpp b/src/Ai/Raid/EoE/EoEStrategy.cpp
similarity index 91%
rename from src/Ai/Raid/EyeOfEternity/Strategy/RaidEoEStrategy.cpp
rename to src/Ai/Raid/EoE/EoEStrategy.cpp
index 3c0ff7ffd..273a9aecd 100644
--- a/src/Ai/Raid/EyeOfEternity/Strategy/RaidEoEStrategy.cpp
+++ b/src/Ai/Raid/EoE/EoEStrategy.cpp
@@ -1,5 +1,5 @@
-#include "RaidEoEStrategy.h"
-#include "RaidEoEMultipliers.h"
+#include "EoEStrategy.h"
+#include "EoEMultipliers.h"
 #include "Strategy.h"
 
 void RaidEoEStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
diff --git a/src/Ai/Raid/EyeOfEternity/Strategy/RaidEoEStrategy.h b/src/Ai/Raid/EoE/EoEStrategy.h
similarity index 100%
rename from src/Ai/Raid/EyeOfEternity/Strategy/RaidEoEStrategy.h
rename to src/Ai/Raid/EoE/EoEStrategy.h
diff --git a/src/Ai/Raid/EyeOfEternity/RaidEoETriggerContext.h b/src/Ai/Raid/EoE/EoETriggerContext.h
similarity index 95%
rename from src/Ai/Raid/EyeOfEternity/RaidEoETriggerContext.h
rename to src/Ai/Raid/EoE/EoETriggerContext.h
index c545e10eb..fee06ac20 100644
--- a/src/Ai/Raid/EyeOfEternity/RaidEoETriggerContext.h
+++ b/src/Ai/Raid/EoE/EoETriggerContext.h
@@ -2,7 +2,7 @@
 #define _PLAYERBOT_RAIDEOETRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
-#include "RaidEoETriggers.h"
+#include "EoETriggers.h"
 
 class RaidEoETriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Raid/EyeOfEternity/Trigger/RaidEoETriggers.cpp b/src/Ai/Raid/EoE/EoETriggers.cpp
similarity index 97%
rename from src/Ai/Raid/EyeOfEternity/Trigger/RaidEoETriggers.cpp
rename to src/Ai/Raid/EoE/EoETriggers.cpp
index f07456d04..e98244659 100644
--- a/src/Ai/Raid/EyeOfEternity/Trigger/RaidEoETriggers.cpp
+++ b/src/Ai/Raid/EoE/EoETriggers.cpp
@@ -1,4 +1,4 @@
-#include "RaidEoETriggers.h"
+#include "EoETriggers.h"
 
 #include "SharedDefines.h"
 
diff --git a/src/Ai/Raid/EyeOfEternity/Trigger/RaidEoETriggers.h b/src/Ai/Raid/EoE/EoETriggers.h
similarity index 100%
rename from src/Ai/Raid/EyeOfEternity/Trigger/RaidEoETriggers.h
rename to src/Ai/Raid/EoE/EoETriggers.h
diff --git a/src/Ai/Raid/GruulsLair/RaidGruulsLairActionContext.h b/src/Ai/Raid/Gruul/GruulActionContext.h
similarity index 99%
rename from src/Ai/Raid/GruulsLair/RaidGruulsLairActionContext.h
rename to src/Ai/Raid/Gruul/GruulActionContext.h
index 3850f58c6..1e39d5bfe 100644
--- a/src/Ai/Raid/GruulsLair/RaidGruulsLairActionContext.h
+++ b/src/Ai/Raid/Gruul/GruulActionContext.h
@@ -1,7 +1,7 @@
 #ifndef _PLAYERBOT_RAIDGRUULSLAIRACTIONCONTEXT_H
 #define _PLAYERBOT_RAIDGRUULSLAIRACTIONCONTEXT_H
 
-#include "RaidGruulsLairActions.h"
+#include "GruulActions.h"
 #include "NamedObjectContext.h"
 
 class RaidGruulsLairActionContext : public NamedObjectContext<Action>
diff --git a/src/Ai/Raid/GruulsLair/Action/RaidGruulsLairActions.cpp b/src/Ai/Raid/Gruul/GruulActions.cpp
similarity index 99%
rename from src/Ai/Raid/GruulsLair/Action/RaidGruulsLairActions.cpp
rename to src/Ai/Raid/Gruul/GruulActions.cpp
index d39d8a5ed..f4b8b5d30 100644
--- a/src/Ai/Raid/GruulsLair/Action/RaidGruulsLairActions.cpp
+++ b/src/Ai/Raid/Gruul/GruulActions.cpp
@@ -1,5 +1,5 @@
-#include "RaidGruulsLairActions.h"
-#include "RaidGruulsLairHelpers.h"
+#include "GruulActions.h"
+#include "GruulHelpers.h"
 #include "CreatureAI.h"
 #include "Playerbots.h"
 #include "RaidBossHelpers.h"
diff --git a/src/Ai/Raid/GruulsLair/Action/RaidGruulsLairActions.h b/src/Ai/Raid/Gruul/GruulActions.h
similarity index 100%
rename from src/Ai/Raid/GruulsLair/Action/RaidGruulsLairActions.h
rename to src/Ai/Raid/Gruul/GruulActions.h
diff --git a/src/Ai/Raid/GruulsLair/Util/RaidGruulsLairHelpers.cpp b/src/Ai/Raid/Gruul/GruulHelpers.cpp
similarity index 99%
rename from src/Ai/Raid/GruulsLair/Util/RaidGruulsLairHelpers.cpp
rename to src/Ai/Raid/Gruul/GruulHelpers.cpp
index 7195f0ebd..4c90f6e41 100644
--- a/src/Ai/Raid/GruulsLair/Util/RaidGruulsLairHelpers.cpp
+++ b/src/Ai/Raid/Gruul/GruulHelpers.cpp
@@ -1,4 +1,4 @@
-#include "RaidGruulsLairHelpers.h"
+#include "GruulHelpers.h"
 #include "AiFactory.h"
 #include "GroupReference.h"
 #include "Playerbots.h"
diff --git a/src/Ai/Raid/GruulsLair/Util/RaidGruulsLairHelpers.h b/src/Ai/Raid/Gruul/GruulHelpers.h
similarity index 100%
rename from src/Ai/Raid/GruulsLair/Util/RaidGruulsLairHelpers.h
rename to src/Ai/Raid/Gruul/GruulHelpers.h
diff --git a/src/Ai/Raid/GruulsLair/Multiplier/RaidGruulsLairMultipliers.cpp b/src/Ai/Raid/Gruul/GruulMultipliers.cpp
similarity index 96%
rename from src/Ai/Raid/GruulsLair/Multiplier/RaidGruulsLairMultipliers.cpp
rename to src/Ai/Raid/Gruul/GruulMultipliers.cpp
index 7c8fb731e..e5a02698f 100644
--- a/src/Ai/Raid/GruulsLair/Multiplier/RaidGruulsLairMultipliers.cpp
+++ b/src/Ai/Raid/Gruul/GruulMultipliers.cpp
@@ -1,6 +1,6 @@
-#include "RaidGruulsLairMultipliers.h"
-#include "RaidGruulsLairActions.h"
-#include "RaidGruulsLairHelpers.h"
+#include "GruulMultipliers.h"
+#include "GruulActions.h"
+#include "GruulHelpers.h"
 #include "ChooseTargetActions.h"
 #include "DruidBearActions.h"
 #include "DruidCatActions.h"
diff --git a/src/Ai/Raid/GruulsLair/Multiplier/RaidGruulsLairMultipliers.h b/src/Ai/Raid/Gruul/GruulMultipliers.h
similarity index 100%
rename from src/Ai/Raid/GruulsLair/Multiplier/RaidGruulsLairMultipliers.h
rename to src/Ai/Raid/Gruul/GruulMultipliers.h
diff --git a/src/Ai/Raid/GruulsLair/Strategy/RaidGruulsLairStrategy.cpp b/src/Ai/Raid/Gruul/GruulStrategy.cpp
similarity index 97%
rename from src/Ai/Raid/GruulsLair/Strategy/RaidGruulsLairStrategy.cpp
rename to src/Ai/Raid/Gruul/GruulStrategy.cpp
index 249c8e8a8..4f4297650 100644
--- a/src/Ai/Raid/GruulsLair/Strategy/RaidGruulsLairStrategy.cpp
+++ b/src/Ai/Raid/Gruul/GruulStrategy.cpp
@@ -1,5 +1,5 @@
-#include "RaidGruulsLairStrategy.h"
-#include "RaidGruulsLairMultipliers.h"
+#include "GruulStrategy.h"
+#include "GruulMultipliers.h"
 
 void RaidGruulsLairStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
diff --git a/src/Ai/Raid/GruulsLair/Strategy/RaidGruulsLairStrategy.h b/src/Ai/Raid/Gruul/GruulStrategy.h
similarity index 100%
rename from src/Ai/Raid/GruulsLair/Strategy/RaidGruulsLairStrategy.h
rename to src/Ai/Raid/Gruul/GruulStrategy.h
diff --git a/src/Ai/Raid/GruulsLair/RaidGruulsLairTriggerContext.h b/src/Ai/Raid/Gruul/GruulTriggerContext.h
similarity index 99%
rename from src/Ai/Raid/GruulsLair/RaidGruulsLairTriggerContext.h
rename to src/Ai/Raid/Gruul/GruulTriggerContext.h
index 35a0f138e..110a69e35 100644
--- a/src/Ai/Raid/GruulsLair/RaidGruulsLairTriggerContext.h
+++ b/src/Ai/Raid/Gruul/GruulTriggerContext.h
@@ -1,7 +1,7 @@
 #ifndef _PLAYERBOT_RAIDGRUULSLAIRTRIGGERCONTEXT_H
 #define _PLAYERBOT_RAIDGRUULSLAIRTRIGGERCONTEXT_H
 
-#include "RaidGruulsLairTriggers.h"
+#include "GruulTriggers.h"
 #include "NamedObjectContext.h"
 
 class RaidGruulsLairTriggerContext : public NamedObjectContext<Trigger>
diff --git a/src/Ai/Raid/GruulsLair/Trigger/RaidGruulsLairTriggers.cpp b/src/Ai/Raid/Gruul/GruulTriggers.cpp
similarity index 98%
rename from src/Ai/Raid/GruulsLair/Trigger/RaidGruulsLairTriggers.cpp
rename to src/Ai/Raid/Gruul/GruulTriggers.cpp
index 3caadb384..82c3e18ac 100644
--- a/src/Ai/Raid/GruulsLair/Trigger/RaidGruulsLairTriggers.cpp
+++ b/src/Ai/Raid/Gruul/GruulTriggers.cpp
@@ -1,5 +1,5 @@
-#include "RaidGruulsLairTriggers.h"
-#include "RaidGruulsLairHelpers.h"
+#include "GruulTriggers.h"
+#include "GruulHelpers.h"
 #include "Playerbots.h"
 
 using namespace GruulsLairHelpers;
diff --git a/src/Ai/Raid/GruulsLair/Trigger/RaidGruulsLairTriggers.h b/src/Ai/Raid/Gruul/GruulTriggers.h
similarity index 100%
rename from src/Ai/Raid/GruulsLair/Trigger/RaidGruulsLairTriggers.h
rename to src/Ai/Raid/Gruul/GruulTriggers.h
diff --git a/src/Ai/Raid/HyjalSummit/RaidHyjalSummitActionContext.h b/src/Ai/Raid/Hyjal/HyjalActionContext.h
similarity index 99%
rename from src/Ai/Raid/HyjalSummit/RaidHyjalSummitActionContext.h
rename to src/Ai/Raid/Hyjal/HyjalActionContext.h
index 02164df46..f19778500 100644
--- a/src/Ai/Raid/HyjalSummit/RaidHyjalSummitActionContext.h
+++ b/src/Ai/Raid/Hyjal/HyjalActionContext.h
@@ -6,7 +6,7 @@
 #ifndef _PLAYERBOT_RAIDHYJALSUMMITACTIONCONTEXT_H
 #define _PLAYERBOT_RAIDHYJALSUMMITACTIONCONTEXT_H
 
-#include "RaidHyjalSummitActions.h"
+#include "HyjalActions.h"
 #include "NamedObjectContext.h"
 
 class RaidHyjalSummitActionContext : public NamedObjectContext<Action>
diff --git a/src/Ai/Raid/HyjalSummit/Action/RaidHyjalSummitActions.cpp b/src/Ai/Raid/Hyjal/HyjalActions.cpp
similarity index 99%
rename from src/Ai/Raid/HyjalSummit/Action/RaidHyjalSummitActions.cpp
rename to src/Ai/Raid/Hyjal/HyjalActions.cpp
index 557f3e6b0..ec7a594a3 100644
--- a/src/Ai/Raid/HyjalSummit/Action/RaidHyjalSummitActions.cpp
+++ b/src/Ai/Raid/Hyjal/HyjalActions.cpp
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidHyjalSummitActions.h"
-#include "RaidHyjalSummitHelpers.h"
+#include "HyjalActions.h"
+#include "HyjalHelpers.h"
 #include "Playerbots.h"
 #include "RaidBossHelpers.h"
 #include "Timer.h"
diff --git a/src/Ai/Raid/HyjalSummit/Action/RaidHyjalSummitActions.h b/src/Ai/Raid/Hyjal/HyjalActions.h
similarity index 100%
rename from src/Ai/Raid/HyjalSummit/Action/RaidHyjalSummitActions.h
rename to src/Ai/Raid/Hyjal/HyjalActions.h
diff --git a/src/Ai/Raid/HyjalSummit/Multiplier/RaidHyjalSummitMultipliers.cpp b/src/Ai/Raid/Hyjal/HyjalMultipliers.cpp
similarity index 98%
rename from src/Ai/Raid/HyjalSummit/Multiplier/RaidHyjalSummitMultipliers.cpp
rename to src/Ai/Raid/Hyjal/HyjalMultipliers.cpp
index a9f666464..7ad9ea12f 100644
--- a/src/Ai/Raid/HyjalSummit/Multiplier/RaidHyjalSummitMultipliers.cpp
+++ b/src/Ai/Raid/Hyjal/HyjalMultipliers.cpp
@@ -3,9 +3,9 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidHyjalSummitMultipliers.h"
-#include "RaidHyjalSummitActions.h"
-#include "RaidHyjalSummitHelpers.h"
+#include "HyjalMultipliers.h"
+#include "HyjalActions.h"
+#include "HyjalHelpers.h"
 #include "AiFactory.h"
 #include "ChooseTargetActions.h"
 #include "DKActions.h"
diff --git a/src/Ai/Raid/HyjalSummit/Multiplier/RaidHyjalSummitMultipliers.h b/src/Ai/Raid/Hyjal/HyjalMultipliers.h
similarity index 100%
rename from src/Ai/Raid/HyjalSummit/Multiplier/RaidHyjalSummitMultipliers.h
rename to src/Ai/Raid/Hyjal/HyjalMultipliers.h
diff --git a/src/Ai/Raid/HyjalSummit/Strategy/RaidHyjalSummitStrategy.cpp b/src/Ai/Raid/Hyjal/HyjalStrategy.cpp
similarity index 98%
rename from src/Ai/Raid/HyjalSummit/Strategy/RaidHyjalSummitStrategy.cpp
rename to src/Ai/Raid/Hyjal/HyjalStrategy.cpp
index 77486fb48..66ff111c2 100644
--- a/src/Ai/Raid/HyjalSummit/Strategy/RaidHyjalSummitStrategy.cpp
+++ b/src/Ai/Raid/Hyjal/HyjalStrategy.cpp
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidHyjalSummitStrategy.h"
-#include "RaidHyjalSummitMultipliers.h"
+#include "HyjalStrategy.h"
+#include "HyjalMultipliers.h"
 
 void RaidHyjalSummitStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
diff --git a/src/Ai/Raid/HyjalSummit/Strategy/RaidHyjalSummitStrategy.h b/src/Ai/Raid/Hyjal/HyjalStrategy.h
similarity index 100%
rename from src/Ai/Raid/HyjalSummit/Strategy/RaidHyjalSummitStrategy.h
rename to src/Ai/Raid/Hyjal/HyjalStrategy.h
diff --git a/src/Ai/Raid/HyjalSummit/RaidHyjalSummitTriggerContext.h b/src/Ai/Raid/Hyjal/HyjalTriggerContext.h
similarity index 99%
rename from src/Ai/Raid/HyjalSummit/RaidHyjalSummitTriggerContext.h
rename to src/Ai/Raid/Hyjal/HyjalTriggerContext.h
index a7c564ee0..93aef5d9c 100644
--- a/src/Ai/Raid/HyjalSummit/RaidHyjalSummitTriggerContext.h
+++ b/src/Ai/Raid/Hyjal/HyjalTriggerContext.h
@@ -6,7 +6,7 @@
 #ifndef _PLAYERBOT_RAIDHYJALSUMMITTRIGGERCONTEXT_H
 #define _PLAYERBOT_RAIDHYJALSUMMITTRIGGERCONTEXT_H
 
-#include "RaidHyjalSummitTriggers.h"
+#include "HyjalTriggers.h"
 #include "NamedObjectContext.h"
 
 class RaidHyjalSummitTriggerContext : public NamedObjectContext<Trigger>
diff --git a/src/Ai/Raid/HyjalSummit/Trigger/RaidHyjalSummitTriggers.cpp b/src/Ai/Raid/Hyjal/HyjalTriggers.cpp
similarity index 98%
rename from src/Ai/Raid/HyjalSummit/Trigger/RaidHyjalSummitTriggers.cpp
rename to src/Ai/Raid/Hyjal/HyjalTriggers.cpp
index 3b9a6455d..403098cd8 100644
--- a/src/Ai/Raid/HyjalSummit/Trigger/RaidHyjalSummitTriggers.cpp
+++ b/src/Ai/Raid/Hyjal/HyjalTriggers.cpp
@@ -3,9 +3,9 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidHyjalSummitTriggers.h"
-#include "RaidHyjalSummitHelpers.h"
-#include "RaidHyjalSummitActions.h"
+#include "HyjalTriggers.h"
+#include "HyjalHelpers.h"
+#include "HyjalActions.h"
 #include "AiFactory.h"
 #include "Playerbots.h"
 #include "RaidBossHelpers.h"
diff --git a/src/Ai/Raid/HyjalSummit/Trigger/RaidHyjalSummitTriggers.h b/src/Ai/Raid/Hyjal/HyjalTriggers.h
similarity index 100%
rename from src/Ai/Raid/HyjalSummit/Trigger/RaidHyjalSummitTriggers.h
rename to src/Ai/Raid/Hyjal/HyjalTriggers.h
diff --git a/src/Ai/Raid/HyjalSummit/Util/RaidHyjalSummitHelpers.cpp b/src/Ai/Raid/Hyjal/Util/HyjalHelpers.cpp
similarity index 99%
rename from src/Ai/Raid/HyjalSummit/Util/RaidHyjalSummitHelpers.cpp
rename to src/Ai/Raid/Hyjal/Util/HyjalHelpers.cpp
index 04ed97cd0..d15bacf1b 100644
--- a/src/Ai/Raid/HyjalSummit/Util/RaidHyjalSummitHelpers.cpp
+++ b/src/Ai/Raid/Hyjal/Util/HyjalHelpers.cpp
@@ -3,7 +3,7 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidHyjalSummitHelpers.h"
+#include "HyjalHelpers.h"
 
 #include <algorithm>
 
diff --git a/src/Ai/Raid/HyjalSummit/Util/RaidHyjalSummitHelpers.h b/src/Ai/Raid/Hyjal/Util/HyjalHelpers.h
similarity index 100%
rename from src/Ai/Raid/HyjalSummit/Util/RaidHyjalSummitHelpers.h
rename to src/Ai/Raid/Hyjal/Util/HyjalHelpers.h
diff --git a/src/Ai/Raid/HyjalSummit/Util/RaidHyjalSummitScripts.cpp b/src/Ai/Raid/Hyjal/Util/HyjalScripts.cpp
similarity index 99%
rename from src/Ai/Raid/HyjalSummit/Util/RaidHyjalSummitScripts.cpp
rename to src/Ai/Raid/Hyjal/Util/HyjalScripts.cpp
index a1ccf4005..d3ccc19c9 100644
--- a/src/Ai/Raid/HyjalSummit/Util/RaidHyjalSummitScripts.cpp
+++ b/src/Ai/Raid/Hyjal/Util/HyjalScripts.cpp
@@ -3,7 +3,7 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidHyjalSummitHelpers.h"
+#include "HyjalHelpers.h"
 #include "AllCreatureScript.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
diff --git a/src/Ai/Raid/Karazhan/RaidKarazhanActionContext.h b/src/Ai/Raid/Kara/KaraActionContext.h
similarity index 99%
rename from src/Ai/Raid/Karazhan/RaidKarazhanActionContext.h
rename to src/Ai/Raid/Kara/KaraActionContext.h
index e555cd14d..63d64174f 100644
--- a/src/Ai/Raid/Karazhan/RaidKarazhanActionContext.h
+++ b/src/Ai/Raid/Kara/KaraActionContext.h
@@ -1,7 +1,7 @@
 #ifndef _PLAYERBOT_RAIDKARAZHANACTIONCONTEXT_H
 #define _PLAYERBOT_RAIDKARAZHANACTIONCONTEXT_H
 
-#include "RaidKarazhanActions.h"
+#include "KaraActions.h"
 #include "NamedObjectContext.h"
 
 class RaidKarazhanActionContext : public NamedObjectContext<Action>
diff --git a/src/Ai/Raid/Karazhan/Action/RaidKarazhanActions.cpp b/src/Ai/Raid/Kara/KaraActions.cpp
similarity index 99%
rename from src/Ai/Raid/Karazhan/Action/RaidKarazhanActions.cpp
rename to src/Ai/Raid/Kara/KaraActions.cpp
index 9fc25827e..10d3639b5 100644
--- a/src/Ai/Raid/Karazhan/Action/RaidKarazhanActions.cpp
+++ b/src/Ai/Raid/Kara/KaraActions.cpp
@@ -1,5 +1,5 @@
-#include "RaidKarazhanActions.h"
-#include "RaidKarazhanHelpers.h"
+#include "KaraActions.h"
+#include "KaraHelpers.h"
 #include "Playerbots.h"
 #include "PlayerbotTextMgr.h"
 #include "RaidBossHelpers.h"
diff --git a/src/Ai/Raid/Karazhan/Action/RaidKarazhanActions.h b/src/Ai/Raid/Kara/KaraActions.h
similarity index 100%
rename from src/Ai/Raid/Karazhan/Action/RaidKarazhanActions.h
rename to src/Ai/Raid/Kara/KaraActions.h
diff --git a/src/Ai/Raid/Karazhan/Util/RaidKarazhanHelpers.cpp b/src/Ai/Raid/Kara/KaraHelpers.cpp
similarity index 99%
rename from src/Ai/Raid/Karazhan/Util/RaidKarazhanHelpers.cpp
rename to src/Ai/Raid/Kara/KaraHelpers.cpp
index 82ecbdb7b..50de2e3a4 100644
--- a/src/Ai/Raid/Karazhan/Util/RaidKarazhanHelpers.cpp
+++ b/src/Ai/Raid/Kara/KaraHelpers.cpp
@@ -1,4 +1,4 @@
-#include "RaidKarazhanHelpers.h"
+#include "KaraHelpers.h"
 #include "Playerbots.h"
 
 namespace KarazhanHelpers
diff --git a/src/Ai/Raid/Karazhan/Util/RaidKarazhanHelpers.h b/src/Ai/Raid/Kara/KaraHelpers.h
similarity index 100%
rename from src/Ai/Raid/Karazhan/Util/RaidKarazhanHelpers.h
rename to src/Ai/Raid/Kara/KaraHelpers.h
diff --git a/src/Ai/Raid/Karazhan/Multiplier/RaidKarazhanMultipliers.cpp b/src/Ai/Raid/Kara/KaraMultipliers.cpp
similarity index 99%
rename from src/Ai/Raid/Karazhan/Multiplier/RaidKarazhanMultipliers.cpp
rename to src/Ai/Raid/Kara/KaraMultipliers.cpp
index e68a3885d..5f857539b 100644
--- a/src/Ai/Raid/Karazhan/Multiplier/RaidKarazhanMultipliers.cpp
+++ b/src/Ai/Raid/Kara/KaraMultipliers.cpp
@@ -1,6 +1,6 @@
-#include "RaidKarazhanMultipliers.h"
-#include "RaidKarazhanActions.h"
-#include "RaidKarazhanHelpers.h"
+#include "KaraMultipliers.h"
+#include "KaraActions.h"
+#include "KaraHelpers.h"
 #include "AttackAction.h"
 #include "ChooseTargetActions.h"
 #include "DruidActions.h"
diff --git a/src/Ai/Raid/Karazhan/Multiplier/RaidKarazhanMultipliers.h b/src/Ai/Raid/Kara/KaraMultipliers.h
similarity index 100%
rename from src/Ai/Raid/Karazhan/Multiplier/RaidKarazhanMultipliers.h
rename to src/Ai/Raid/Kara/KaraMultipliers.h
diff --git a/src/Ai/Raid/Karazhan/Strategy/RaidKarazhanStrategy.cpp b/src/Ai/Raid/Kara/KaraStrategy.cpp
similarity index 99%
rename from src/Ai/Raid/Karazhan/Strategy/RaidKarazhanStrategy.cpp
rename to src/Ai/Raid/Kara/KaraStrategy.cpp
index d9bbf8162..45dbc68d0 100644
--- a/src/Ai/Raid/Karazhan/Strategy/RaidKarazhanStrategy.cpp
+++ b/src/Ai/Raid/Kara/KaraStrategy.cpp
@@ -1,5 +1,5 @@
-#include "RaidKarazhanStrategy.h"
-#include "RaidKarazhanMultipliers.h"
+#include "KaraStrategy.h"
+#include "KaraMultipliers.h"
 
 void RaidKarazhanStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
diff --git a/src/Ai/Raid/Karazhan/Strategy/RaidKarazhanStrategy.h b/src/Ai/Raid/Kara/KaraStrategy.h
similarity index 100%
rename from src/Ai/Raid/Karazhan/Strategy/RaidKarazhanStrategy.h
rename to src/Ai/Raid/Kara/KaraStrategy.h
diff --git a/src/Ai/Raid/Karazhan/RaidKarazhanTriggerContext.h b/src/Ai/Raid/Kara/KaraTriggerContext.h
similarity index 99%
rename from src/Ai/Raid/Karazhan/RaidKarazhanTriggerContext.h
rename to src/Ai/Raid/Kara/KaraTriggerContext.h
index a9c430734..77d3090e7 100644
--- a/src/Ai/Raid/Karazhan/RaidKarazhanTriggerContext.h
+++ b/src/Ai/Raid/Kara/KaraTriggerContext.h
@@ -1,7 +1,7 @@
 #ifndef _PLAYERBOT_RAIDKARAZHANTRIGGERCONTEXT_H
 #define _PLAYERBOT_RAIDKARAZHANTRIGGERCONTEXT_H
 
-#include "RaidKarazhanTriggers.h"
+#include "KaraTriggers.h"
 #include "NamedObjectContext.h"
 
 class RaidKarazhanTriggerContext : public NamedObjectContext<Trigger>
diff --git a/src/Ai/Raid/Karazhan/Trigger/RaidKarazhanTriggers.cpp b/src/Ai/Raid/Kara/KaraTriggers.cpp
similarity index 99%
rename from src/Ai/Raid/Karazhan/Trigger/RaidKarazhanTriggers.cpp
rename to src/Ai/Raid/Kara/KaraTriggers.cpp
index 3c43aa898..f11c3919b 100644
--- a/src/Ai/Raid/Karazhan/Trigger/RaidKarazhanTriggers.cpp
+++ b/src/Ai/Raid/Kara/KaraTriggers.cpp
@@ -1,6 +1,6 @@
-#include "RaidKarazhanTriggers.h"
-#include "RaidKarazhanHelpers.h"
-#include "RaidKarazhanActions.h"
+#include "KaraTriggers.h"
+#include "KaraHelpers.h"
+#include "KaraActions.h"
 #include "Playerbots.h"
 #include "RaidBossHelpers.h"
 
diff --git a/src/Ai/Raid/Karazhan/Trigger/RaidKarazhanTriggers.h b/src/Ai/Raid/Kara/KaraTriggers.h
similarity index 100%
rename from src/Ai/Raid/Karazhan/Trigger/RaidKarazhanTriggers.h
rename to src/Ai/Raid/Kara/KaraTriggers.h
diff --git a/src/Ai/Raid/MoltenCore/RaidMcActionContext.h b/src/Ai/Raid/MC/MCActionContext.h
similarity index 99%
rename from src/Ai/Raid/MoltenCore/RaidMcActionContext.h
rename to src/Ai/Raid/MC/MCActionContext.h
index aaccb80d3..3cc95257a 100644
--- a/src/Ai/Raid/MoltenCore/RaidMcActionContext.h
+++ b/src/Ai/Raid/MC/MCActionContext.h
@@ -4,7 +4,7 @@
 #include "Action.h"
 #include "BossAuraActions.h"
 #include "NamedObjectContext.h"
-#include "RaidMcActions.h"
+#include "MCActions.h"
 
 class RaidMcActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Raid/MoltenCore/Action/RaidMcActions.cpp b/src/Ai/Raid/MC/MCActions.cpp
similarity index 99%
rename from src/Ai/Raid/MoltenCore/Action/RaidMcActions.cpp
rename to src/Ai/Raid/MC/MCActions.cpp
index d2bc2edc1..96050ac43 100644
--- a/src/Ai/Raid/MoltenCore/Action/RaidMcActions.cpp
+++ b/src/Ai/Raid/MC/MCActions.cpp
@@ -1,8 +1,8 @@
-#include "RaidMcActions.h"
+#include "MCActions.h"
 
 #include "Playerbots.h"
 #include "RtiTargetValue.h"
-#include "RaidMcHelpers.h"
+#include "MCHelpers.h"
 
 static constexpr float LIVING_BOMB_DISTANCE = 20.0f;
 static constexpr float INFERNO_DISTANCE = 20.0f;
diff --git a/src/Ai/Raid/MoltenCore/Action/RaidMcActions.h b/src/Ai/Raid/MC/MCActions.h
similarity index 100%
rename from src/Ai/Raid/MoltenCore/Action/RaidMcActions.h
rename to src/Ai/Raid/MC/MCActions.h
diff --git a/src/Ai/Raid/MoltenCore/Util/RaidMcHelpers.h b/src/Ai/Raid/MC/MCHelpers.h
similarity index 100%
rename from src/Ai/Raid/MoltenCore/Util/RaidMcHelpers.h
rename to src/Ai/Raid/MC/MCHelpers.h
diff --git a/src/Ai/Raid/MoltenCore/Multiplier/RaidMcMultipliers.cpp b/src/Ai/Raid/MC/MCMultipliers.cpp
similarity index 97%
rename from src/Ai/Raid/MoltenCore/Multiplier/RaidMcMultipliers.cpp
rename to src/Ai/Raid/MC/MCMultipliers.cpp
index d1ee936b0..d72763564 100644
--- a/src/Ai/Raid/MoltenCore/Multiplier/RaidMcMultipliers.cpp
+++ b/src/Ai/Raid/MC/MCMultipliers.cpp
@@ -1,4 +1,4 @@
-#include "RaidMcMultipliers.h"
+#include "MCMultipliers.h"
 
 #include "Playerbots.h"
 #include "ChooseTargetActions.h"
@@ -9,8 +9,8 @@
 #include "ShamanActions.h"
 #include "WarriorActions.h"
 #include "DKActions.h"
-#include "RaidMcActions.h"
-#include "RaidMcHelpers.h"
+#include "MCActions.h"
+#include "MCHelpers.h"
 
 using namespace MoltenCoreHelpers;
 
diff --git a/src/Ai/Raid/MoltenCore/Multiplier/RaidMcMultipliers.h b/src/Ai/Raid/MC/MCMultipliers.h
similarity index 100%
rename from src/Ai/Raid/MoltenCore/Multiplier/RaidMcMultipliers.h
rename to src/Ai/Raid/MC/MCMultipliers.h
diff --git a/src/Ai/Raid/MoltenCore/Strategy/RaidMcStrategy.cpp b/src/Ai/Raid/MC/MCStrategy.cpp
similarity index 98%
rename from src/Ai/Raid/MoltenCore/Strategy/RaidMcStrategy.cpp
rename to src/Ai/Raid/MC/MCStrategy.cpp
index 3eddb76a7..fc63c66b9 100644
--- a/src/Ai/Raid/MoltenCore/Strategy/RaidMcStrategy.cpp
+++ b/src/Ai/Raid/MC/MCStrategy.cpp
@@ -1,6 +1,6 @@
-#include "RaidMcStrategy.h"
+#include "MCStrategy.h"
 
-#include "RaidMcMultipliers.h"
+#include "MCMultipliers.h"
 #include "Strategy.h"
 
 void RaidMcStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
diff --git a/src/Ai/Raid/MoltenCore/Strategy/RaidMcStrategy.h b/src/Ai/Raid/MC/MCStrategy.h
similarity index 100%
rename from src/Ai/Raid/MoltenCore/Strategy/RaidMcStrategy.h
rename to src/Ai/Raid/MC/MCStrategy.h
diff --git a/src/Ai/Raid/MoltenCore/RaidMcTriggerContext.h b/src/Ai/Raid/MC/MCTriggerContext.h
similarity index 99%
rename from src/Ai/Raid/MoltenCore/RaidMcTriggerContext.h
rename to src/Ai/Raid/MC/MCTriggerContext.h
index 1f694fe65..7efa95298 100644
--- a/src/Ai/Raid/MoltenCore/RaidMcTriggerContext.h
+++ b/src/Ai/Raid/MC/MCTriggerContext.h
@@ -3,7 +3,7 @@
 
 #include "BossAuraTriggers.h"
 #include "NamedObjectContext.h"
-#include "RaidMcTriggers.h"
+#include "MCTriggers.h"
 
 class RaidMcTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Raid/MoltenCore/Trigger/RaidMcTriggers.cpp b/src/Ai/Raid/MC/MCTriggers.cpp
similarity index 95%
rename from src/Ai/Raid/MoltenCore/Trigger/RaidMcTriggers.cpp
rename to src/Ai/Raid/MC/MCTriggers.cpp
index 834d703d3..b9b2aa1b7 100644
--- a/src/Ai/Raid/MoltenCore/Trigger/RaidMcTriggers.cpp
+++ b/src/Ai/Raid/MC/MCTriggers.cpp
@@ -1,7 +1,7 @@
-#include "RaidMcTriggers.h"
+#include "MCTriggers.h"
 
 #include "SharedDefines.h"
-#include "RaidMcHelpers.h"
+#include "MCHelpers.h"
 
 using namespace MoltenCoreHelpers;
 
diff --git a/src/Ai/Raid/MoltenCore/Trigger/RaidMcTriggers.h b/src/Ai/Raid/MC/MCTriggers.h
similarity index 100%
rename from src/Ai/Raid/MoltenCore/Trigger/RaidMcTriggers.h
rename to src/Ai/Raid/MC/MCTriggers.h
diff --git a/src/Ai/Raid/Magtheridon/RaidMagtheridonActionContext.h b/src/Ai/Raid/Mag/MagActionContext.h
similarity index 98%
rename from src/Ai/Raid/Magtheridon/RaidMagtheridonActionContext.h
rename to src/Ai/Raid/Mag/MagActionContext.h
index 48e8cfd35..2a040ebcd 100644
--- a/src/Ai/Raid/Magtheridon/RaidMagtheridonActionContext.h
+++ b/src/Ai/Raid/Mag/MagActionContext.h
@@ -1,7 +1,7 @@
 #ifndef _PLAYERBOT_RAIDMAGTHERIDONACTIONCONTEXT_H
 #define _PLAYERBOT_RAIDMAGTHERIDONACTIONCONTEXT_H
 
-#include "RaidMagtheridonActions.h"
+#include "MagActions.h"
 #include "NamedObjectContext.h"
 
 class RaidMagtheridonActionContext : public NamedObjectContext<Action>
diff --git a/src/Ai/Raid/Magtheridon/Action/RaidMagtheridonActions.cpp b/src/Ai/Raid/Mag/MagActions.cpp
similarity index 99%
rename from src/Ai/Raid/Magtheridon/Action/RaidMagtheridonActions.cpp
rename to src/Ai/Raid/Mag/MagActions.cpp
index a9e9bcfd7..fc5a9d680 100644
--- a/src/Ai/Raid/Magtheridon/Action/RaidMagtheridonActions.cpp
+++ b/src/Ai/Raid/Mag/MagActions.cpp
@@ -1,5 +1,5 @@
-#include "RaidMagtheridonActions.h"
-#include "RaidMagtheridonHelpers.h"
+#include "MagActions.h"
+#include "MagHelpers.h"
 #include "Creature.h"
 #include "ObjectAccessor.h"
 #include "ObjectGuid.h"
diff --git a/src/Ai/Raid/Magtheridon/Action/RaidMagtheridonActions.h b/src/Ai/Raid/Mag/MagActions.h
similarity index 98%
rename from src/Ai/Raid/Magtheridon/Action/RaidMagtheridonActions.h
rename to src/Ai/Raid/Mag/MagActions.h
index 7abc493c2..dd1660d40 100644
--- a/src/Ai/Raid/Magtheridon/Action/RaidMagtheridonActions.h
+++ b/src/Ai/Raid/Mag/MagActions.h
@@ -1,7 +1,7 @@
 #ifndef _PLAYERBOT_RAIDMAGTHERIDONACTIONS_H
 #define _PLAYERBOT_RAIDMAGTHERIDONACTIONS_H
 
-#include "RaidMagtheridonHelpers.h"
+#include "MagHelpers.h"
 #include "Action.h"
 #include "AttackAction.h"
 #include "MovementActions.h"
diff --git a/src/Ai/Raid/Magtheridon/Util/RaidMagtheridonHelpers.cpp b/src/Ai/Raid/Mag/MagHelpers.cpp
similarity index 99%
rename from src/Ai/Raid/Magtheridon/Util/RaidMagtheridonHelpers.cpp
rename to src/Ai/Raid/Mag/MagHelpers.cpp
index e51ad24e5..39bfbcf27 100644
--- a/src/Ai/Raid/Magtheridon/Util/RaidMagtheridonHelpers.cpp
+++ b/src/Ai/Raid/Mag/MagHelpers.cpp
@@ -1,4 +1,4 @@
-#include "RaidMagtheridonHelpers.h"
+#include "MagHelpers.h"
 #include "Creature.h"
 #include "GameObject.h"
 #include "Map.h"
diff --git a/src/Ai/Raid/Magtheridon/Util/RaidMagtheridonHelpers.h b/src/Ai/Raid/Mag/MagHelpers.h
similarity index 100%
rename from src/Ai/Raid/Magtheridon/Util/RaidMagtheridonHelpers.h
rename to src/Ai/Raid/Mag/MagHelpers.h
diff --git a/src/Ai/Raid/Magtheridon/Multiplier/RaidMagtheridonMultipliers.cpp b/src/Ai/Raid/Mag/MagMultipliers.cpp
similarity index 95%
rename from src/Ai/Raid/Magtheridon/Multiplier/RaidMagtheridonMultipliers.cpp
rename to src/Ai/Raid/Mag/MagMultipliers.cpp
index 55aaf90e9..94ae6d6a9 100644
--- a/src/Ai/Raid/Magtheridon/Multiplier/RaidMagtheridonMultipliers.cpp
+++ b/src/Ai/Raid/Mag/MagMultipliers.cpp
@@ -1,9 +1,9 @@
 #include <unordered_map>
 #include <ctime>
 
-#include "RaidMagtheridonMultipliers.h"
-#include "RaidMagtheridonActions.h"
-#include "RaidMagtheridonHelpers.h"
+#include "MagMultipliers.h"
+#include "MagActions.h"
+#include "MagHelpers.h"
 #include "ChooseTargetActions.h"
 #include "GenericSpellActions.h"
 #include "Playerbots.h"
diff --git a/src/Ai/Raid/Magtheridon/Multiplier/RaidMagtheridonMultipliers.h b/src/Ai/Raid/Mag/MagMultipliers.h
similarity index 100%
rename from src/Ai/Raid/Magtheridon/Multiplier/RaidMagtheridonMultipliers.h
rename to src/Ai/Raid/Mag/MagMultipliers.h
diff --git a/src/Ai/Raid/Magtheridon/Strategy/RaidMagtheridonStrategy.cpp b/src/Ai/Raid/Mag/MagStrategy.cpp
similarity index 96%
rename from src/Ai/Raid/Magtheridon/Strategy/RaidMagtheridonStrategy.cpp
rename to src/Ai/Raid/Mag/MagStrategy.cpp
index 73d240825..fc6d041ff 100644
--- a/src/Ai/Raid/Magtheridon/Strategy/RaidMagtheridonStrategy.cpp
+++ b/src/Ai/Raid/Mag/MagStrategy.cpp
@@ -1,5 +1,5 @@
-#include "RaidMagtheridonStrategy.h"
-#include "RaidMagtheridonMultipliers.h"
+#include "MagStrategy.h"
+#include "MagMultipliers.h"
 
 void RaidMagtheridonStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
diff --git a/src/Ai/Raid/Magtheridon/Strategy/RaidMagtheridonStrategy.h b/src/Ai/Raid/Mag/MagStrategy.h
similarity index 100%
rename from src/Ai/Raid/Magtheridon/Strategy/RaidMagtheridonStrategy.h
rename to src/Ai/Raid/Mag/MagStrategy.h
diff --git a/src/Ai/Raid/Magtheridon/RaidMagtheridonTriggerContext.h b/src/Ai/Raid/Mag/MagTriggerContext.h
similarity index 98%
rename from src/Ai/Raid/Magtheridon/RaidMagtheridonTriggerContext.h
rename to src/Ai/Raid/Mag/MagTriggerContext.h
index 482152e0e..dcaa08fa0 100644
--- a/src/Ai/Raid/Magtheridon/RaidMagtheridonTriggerContext.h
+++ b/src/Ai/Raid/Mag/MagTriggerContext.h
@@ -1,7 +1,7 @@
 #ifndef _PLAYERBOT_RAIDMAGTHERIDONTRIGGERCONTEXT_H
 #define _PLAYERBOT_RAIDMAGTHERIDONTRIGGERCONTEXT_H
 
-#include "RaidMagtheridonTriggers.h"
+#include "MagTriggers.h"
 #include "NamedObjectContext.h"
 
 class RaidMagtheridonTriggerContext : public NamedObjectContext<Trigger>
diff --git a/src/Ai/Raid/Magtheridon/Trigger/RaidMagtheridonTriggers.cpp b/src/Ai/Raid/Mag/MagTriggers.cpp
similarity index 98%
rename from src/Ai/Raid/Magtheridon/Trigger/RaidMagtheridonTriggers.cpp
rename to src/Ai/Raid/Mag/MagTriggers.cpp
index 43aa3361f..28f110c97 100644
--- a/src/Ai/Raid/Magtheridon/Trigger/RaidMagtheridonTriggers.cpp
+++ b/src/Ai/Raid/Mag/MagTriggers.cpp
@@ -1,5 +1,5 @@
-#include "RaidMagtheridonTriggers.h"
-#include "RaidMagtheridonHelpers.h"
+#include "MagTriggers.h"
+#include "MagHelpers.h"
 #include "Playerbots.h"
 
 using namespace MagtheridonHelpers;
diff --git a/src/Ai/Raid/Magtheridon/Trigger/RaidMagtheridonTriggers.h b/src/Ai/Raid/Mag/MagTriggers.h
similarity index 100%
rename from src/Ai/Raid/Magtheridon/Trigger/RaidMagtheridonTriggers.h
rename to src/Ai/Raid/Mag/MagTriggers.h
diff --git a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions.h b/src/Ai/Raid/Naxx/Action/NaxxActions.h
similarity index 99%
rename from src/Ai/Raid/Naxxramas/Action/RaidNaxxActions.h
rename to src/Ai/Raid/Naxx/Action/NaxxActions.h
index f2712d74d..8b854130e 100644
--- a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions.h
+++ b/src/Ai/Raid/Naxx/Action/NaxxActions.h
@@ -7,7 +7,7 @@
 #include "MovementActions.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "RaidNaxxBossHelper.h"
+#include "NaxxBossHelper.h"
 
 class GrobbulusGoBehindAction : public MovementAction
 {
diff --git a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Anubrekhan.cpp b/src/Ai/Raid/Naxx/Action/NaxxActions_Anubrekhan.cpp
similarity index 98%
rename from src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Anubrekhan.cpp
rename to src/Ai/Raid/Naxx/Action/NaxxActions_Anubrekhan.cpp
index 4391ba76c..fbab03646 100644
--- a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Anubrekhan.cpp
+++ b/src/Ai/Raid/Naxx/Action/NaxxActions_Anubrekhan.cpp
@@ -1,6 +1,6 @@
 #include "ObjectGuid.h"
 #include "Playerbots.h"
-#include "RaidNaxxActions.h"
+#include "NaxxActions.h"
 
 bool AnubrekhanChooseTargetAction::Execute(Event /*event*/)
 {
diff --git a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Faerlina.cpp b/src/Ai/Raid/Naxx/Action/NaxxActions_Faerlina.cpp
similarity index 60%
rename from src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Faerlina.cpp
rename to src/Ai/Raid/Naxx/Action/NaxxActions_Faerlina.cpp
index 0c52be786..75d20b0fe 100644
--- a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Faerlina.cpp
+++ b/src/Ai/Raid/Naxx/Action/NaxxActions_Faerlina.cpp
@@ -1,3 +1,3 @@
-#include "RaidNaxxActions.h"
+#include "NaxxActions.h"
 
 // Reserved for Faerlina-specific actions.
diff --git a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_FourHorsemen.cpp b/src/Ai/Raid/Naxx/Action/NaxxActions_FourHorsemen.cpp
similarity index 98%
rename from src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_FourHorsemen.cpp
rename to src/Ai/Raid/Naxx/Action/NaxxActions_FourHorsemen.cpp
index 291b225e7..7d62d669e 100644
--- a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_FourHorsemen.cpp
+++ b/src/Ai/Raid/Naxx/Action/NaxxActions_FourHorsemen.cpp
@@ -1,4 +1,4 @@
-#include "RaidNaxxActions.h"
+#include "NaxxActions.h"
 
 #include "Playerbots.h"
 
diff --git a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Gluth.cpp b/src/Ai/Raid/Naxx/Action/NaxxActions_Gluth.cpp
similarity index 99%
rename from src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Gluth.cpp
rename to src/Ai/Raid/Naxx/Action/NaxxActions_Gluth.cpp
index f95f17ff1..cde175bba 100644
--- a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Gluth.cpp
+++ b/src/Ai/Raid/Naxx/Action/NaxxActions_Gluth.cpp
@@ -1,4 +1,4 @@
-#include "RaidNaxxActions.h"
+#include "NaxxActions.h"
 
 #include "PlayerbotAIConfig.h"
 #include "Playerbots.h"
diff --git a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Gothik.cpp b/src/Ai/Raid/Naxx/Action/NaxxActions_Gothik.cpp
similarity index 59%
rename from src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Gothik.cpp
rename to src/Ai/Raid/Naxx/Action/NaxxActions_Gothik.cpp
index a33fef305..fcf39d74c 100644
--- a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Gothik.cpp
+++ b/src/Ai/Raid/Naxx/Action/NaxxActions_Gothik.cpp
@@ -1,3 +1,3 @@
-#include "RaidNaxxActions.h"
+#include "NaxxActions.h"
 
 // Reserved for Gothik-specific actions.
diff --git a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Grobbulus.cpp b/src/Ai/Raid/Naxx/Action/NaxxActions_Grobbulus.cpp
similarity index 97%
rename from src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Grobbulus.cpp
rename to src/Ai/Raid/Naxx/Action/NaxxActions_Grobbulus.cpp
index 1917c3e13..73bd84637 100644
--- a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Grobbulus.cpp
+++ b/src/Ai/Raid/Naxx/Action/NaxxActions_Grobbulus.cpp
@@ -1,4 +1,4 @@
-#include "RaidNaxxActions.h"
+#include "NaxxActions.h"
 
 #include "Playerbots.h"
 
diff --git a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Heigan.cpp b/src/Ai/Raid/Naxx/Action/NaxxActions_Heigan.cpp
similarity index 97%
rename from src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Heigan.cpp
rename to src/Ai/Raid/Naxx/Action/NaxxActions_Heigan.cpp
index 9e6221957..78e8c4de8 100644
--- a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Heigan.cpp
+++ b/src/Ai/Raid/Naxx/Action/NaxxActions_Heigan.cpp
@@ -1,6 +1,6 @@
 #include "Playerbots.h"
-#include "RaidNaxxActions.h"
-#include "RaidNaxxSpellIds.h"
+#include "NaxxActions.h"
+#include "NaxxSpellIds.h"
 #include "Spell.h"
 #include "Timer.h"
 
diff --git a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Kelthuzad.cpp b/src/Ai/Raid/Naxx/Action/NaxxActions_Kelthuzad.cpp
similarity index 99%
rename from src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Kelthuzad.cpp
rename to src/Ai/Raid/Naxx/Action/NaxxActions_Kelthuzad.cpp
index 5f7741170..cb149fc4e 100644
--- a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Kelthuzad.cpp
+++ b/src/Ai/Raid/Naxx/Action/NaxxActions_Kelthuzad.cpp
@@ -1,4 +1,4 @@
-#include "RaidNaxxActions.h"
+#include "NaxxActions.h"
 
 #include "PlayerbotAIConfig.h"
 #include "Playerbots.h"
diff --git a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Loatheb.cpp b/src/Ai/Raid/Naxx/Action/NaxxActions_Loatheb.cpp
similarity index 98%
rename from src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Loatheb.cpp
rename to src/Ai/Raid/Naxx/Action/NaxxActions_Loatheb.cpp
index df43cabe6..8cc2f21bf 100644
--- a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Loatheb.cpp
+++ b/src/Ai/Raid/Naxx/Action/NaxxActions_Loatheb.cpp
@@ -1,4 +1,4 @@
-#include "RaidNaxxActions.h"
+#include "NaxxActions.h"
 
 #include "Playerbots.h"
 
diff --git a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Maexxna.cpp b/src/Ai/Raid/Naxx/Action/NaxxActions_Maexxna.cpp
similarity index 59%
rename from src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Maexxna.cpp
rename to src/Ai/Raid/Naxx/Action/NaxxActions_Maexxna.cpp
index cfb7d27db..810638b13 100644
--- a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Maexxna.cpp
+++ b/src/Ai/Raid/Naxx/Action/NaxxActions_Maexxna.cpp
@@ -1,3 +1,3 @@
-#include "RaidNaxxActions.h"
+#include "NaxxActions.h"
 
 // Reserved for Maexxna-specific actions.
diff --git a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Noth.cpp b/src/Ai/Raid/Naxx/Action/NaxxActions_Noth.cpp
similarity index 57%
rename from src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Noth.cpp
rename to src/Ai/Raid/Naxx/Action/NaxxActions_Noth.cpp
index 4f8fe24a3..a7e2e7e95 100644
--- a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Noth.cpp
+++ b/src/Ai/Raid/Naxx/Action/NaxxActions_Noth.cpp
@@ -1,3 +1,3 @@
-#include "RaidNaxxActions.h"
+#include "NaxxActions.h"
 
 // Reserved for Noth-specific actions.
diff --git a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Patchwerk.cpp b/src/Ai/Raid/Naxx/Action/NaxxActions_Patchwerk.cpp
similarity index 97%
rename from src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Patchwerk.cpp
rename to src/Ai/Raid/Naxx/Action/NaxxActions_Patchwerk.cpp
index e0e2ee3e9..c7af988f3 100644
--- a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Patchwerk.cpp
+++ b/src/Ai/Raid/Naxx/Action/NaxxActions_Patchwerk.cpp
@@ -1,4 +1,4 @@
-#include "RaidNaxxActions.h"
+#include "NaxxActions.h"
 
 #include <algorithm>
 #include <cmath>
diff --git a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Razuvious.cpp b/src/Ai/Raid/Naxx/Action/NaxxActions_Razuvious.cpp
similarity index 99%
rename from src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Razuvious.cpp
rename to src/Ai/Raid/Naxx/Action/NaxxActions_Razuvious.cpp
index ce0ca6caf..5d91db0c6 100644
--- a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Razuvious.cpp
+++ b/src/Ai/Raid/Naxx/Action/NaxxActions_Razuvious.cpp
@@ -1,4 +1,4 @@
-#include "RaidNaxxActions.h"
+#include "NaxxActions.h"
 
 #include "ObjectGuid.h"
 #include "PlayerbotAIConfig.h"
diff --git a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Sapphiron.cpp b/src/Ai/Raid/Naxx/Action/NaxxActions_Sapphiron.cpp
similarity index 97%
rename from src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Sapphiron.cpp
rename to src/Ai/Raid/Naxx/Action/NaxxActions_Sapphiron.cpp
index 5fb6d8686..55bcdabc4 100644
--- a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Sapphiron.cpp
+++ b/src/Ai/Raid/Naxx/Action/NaxxActions_Sapphiron.cpp
@@ -1,9 +1,9 @@
-#include "RaidNaxxActions.h"
+#include "NaxxActions.h"
 
 #include "PlayerbotAIConfig.h"
 #include "Playerbots.h"
-#include "RaidNaxxBossHelper.h"
-#include "RaidNaxxSpellIds.h"
+#include "NaxxBossHelper.h"
+#include "NaxxSpellIds.h"
 
 bool SapphironGroundPositionAction::Execute(Event /*event*/)
 {
diff --git a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Shared.cpp b/src/Ai/Raid/Naxx/Action/NaxxActions_Shared.cpp
similarity index 93%
rename from src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Shared.cpp
rename to src/Ai/Raid/Naxx/Action/NaxxActions_Shared.cpp
index 50b3bc1d8..300592780 100644
--- a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Shared.cpp
+++ b/src/Ai/Raid/Naxx/Action/NaxxActions_Shared.cpp
@@ -1,4 +1,4 @@
-#include "RaidNaxxActions.h"
+#include "NaxxActions.h"
 
 uint32 RotateAroundTheCenterPointAction::FindNearestWaypoint()
 {
diff --git a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Thaddius.cpp b/src/Ai/Raid/Naxx/Action/NaxxActions_Thaddius.cpp
similarity index 98%
rename from src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Thaddius.cpp
rename to src/Ai/Raid/Naxx/Action/NaxxActions_Thaddius.cpp
index 145604da0..016a9faa5 100644
--- a/src/Ai/Raid/Naxxramas/Action/RaidNaxxActions_Thaddius.cpp
+++ b/src/Ai/Raid/Naxx/Action/NaxxActions_Thaddius.cpp
@@ -1,8 +1,8 @@
-#include "RaidNaxxActions.h"
+#include "NaxxActions.h"
 
 #include "PlayerbotAIConfig.h"
 #include "Playerbots.h"
-#include "RaidNaxxSpellIds.h"
+#include "NaxxSpellIds.h"
 
 bool ThaddiusAttackNearestPetAction::isUseful()
 {
diff --git a/src/Ai/Raid/Naxxramas/RaidNaxxActionContext.h b/src/Ai/Raid/Naxx/NaxxActionContext.h
similarity index 99%
rename from src/Ai/Raid/Naxxramas/RaidNaxxActionContext.h
rename to src/Ai/Raid/Naxx/NaxxActionContext.h
index 4aaf9462e..46645e315 100644
--- a/src/Ai/Raid/Naxxramas/RaidNaxxActionContext.h
+++ b/src/Ai/Raid/Naxx/NaxxActionContext.h
@@ -8,7 +8,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "RaidNaxxActions.h"
+#include "NaxxActions.h"
 
 class RaidNaxxActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Raid/Naxxramas/Util/RaidNaxxBossHelper.h b/src/Ai/Raid/Naxx/NaxxBossHelper.h
similarity index 99%
rename from src/Ai/Raid/Naxxramas/Util/RaidNaxxBossHelper.h
rename to src/Ai/Raid/Naxx/NaxxBossHelper.h
index a13a5b893..7bec3a7df 100644
--- a/src/Ai/Raid/Naxxramas/Util/RaidNaxxBossHelper.h
+++ b/src/Ai/Raid/Naxx/NaxxBossHelper.h
@@ -16,7 +16,7 @@
 #include "SharedDefines.h"
 #include "Spell.h"
 #include "Timer.h"
-#include "RaidNaxxSpellIds.h"
+#include "NaxxSpellIds.h"
 
 const uint32 NAXX_MAP_ID = 533;
 
diff --git a/src/Ai/Raid/Naxxramas/Multiplier/RaidNaxxMultipliers.cpp b/src/Ai/Raid/Naxx/NaxxMultipliers.cpp
similarity index 99%
rename from src/Ai/Raid/Naxxramas/Multiplier/RaidNaxxMultipliers.cpp
rename to src/Ai/Raid/Naxx/NaxxMultipliers.cpp
index 39e7668fa..b7700eb1b 100644
--- a/src/Ai/Raid/Naxxramas/Multiplier/RaidNaxxMultipliers.cpp
+++ b/src/Ai/Raid/Naxx/NaxxMultipliers.cpp
@@ -1,4 +1,4 @@
-#include "RaidNaxxMultipliers.h"
+#include "NaxxMultipliers.h"
 
 #include "ChooseTargetActions.h"
 #include "DKActions.h"
@@ -12,8 +12,8 @@
 #include "MovementActions.h"
 #include "PaladinActions.h"
 #include "PriestActions.h"
-#include "RaidNaxxActions.h"
-#include "RaidNaxxSpellIds.h"
+#include "NaxxActions.h"
+#include "NaxxSpellIds.h"
 #include "ReachTargetActions.h"
 #include "RogueActions.h"
 #include "ScriptedCreature.h"
diff --git a/src/Ai/Raid/Naxxramas/Multiplier/RaidNaxxMultipliers.h b/src/Ai/Raid/Naxx/NaxxMultipliers.h
similarity index 98%
rename from src/Ai/Raid/Naxxramas/Multiplier/RaidNaxxMultipliers.h
rename to src/Ai/Raid/Naxx/NaxxMultipliers.h
index f51420a2a..d7eed4029 100644
--- a/src/Ai/Raid/Naxxramas/Multiplier/RaidNaxxMultipliers.h
+++ b/src/Ai/Raid/Naxx/NaxxMultipliers.h
@@ -3,7 +3,7 @@
 #define _PLAYERBOT_RAIDNAXXMULTIPLIERS_H
 
 #include "Multiplier.h"
-#include "RaidNaxxBossHelper.h"
+#include "NaxxBossHelper.h"
 
 class GrobbulusMultiplier : public Multiplier
 {
diff --git a/src/Ai/Raid/Naxxramas/Util/RaidNaxxSpellIds.h b/src/Ai/Raid/Naxx/NaxxSpellIds.h
similarity index 100%
rename from src/Ai/Raid/Naxxramas/Util/RaidNaxxSpellIds.h
rename to src/Ai/Raid/Naxx/NaxxSpellIds.h
diff --git a/src/Ai/Raid/Naxxramas/Strategy/RaidNaxxStrategy.cpp b/src/Ai/Raid/Naxx/NaxxStrategy.cpp
similarity index 98%
rename from src/Ai/Raid/Naxxramas/Strategy/RaidNaxxStrategy.cpp
rename to src/Ai/Raid/Naxx/NaxxStrategy.cpp
index 51f59f755..f99ba9b8f 100644
--- a/src/Ai/Raid/Naxxramas/Strategy/RaidNaxxStrategy.cpp
+++ b/src/Ai/Raid/Naxx/NaxxStrategy.cpp
@@ -1,6 +1,6 @@
-#include "RaidNaxxStrategy.h"
+#include "NaxxStrategy.h"
 
-#include "RaidNaxxMultipliers.h"
+#include "NaxxMultipliers.h"
 
 void RaidNaxxStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
diff --git a/src/Ai/Raid/Naxxramas/Strategy/RaidNaxxStrategy.h b/src/Ai/Raid/Naxx/NaxxStrategy.h
similarity index 100%
rename from src/Ai/Raid/Naxxramas/Strategy/RaidNaxxStrategy.h
rename to src/Ai/Raid/Naxx/NaxxStrategy.h
diff --git a/src/Ai/Raid/Naxxramas/RaidNaxxTriggerContext.h b/src/Ai/Raid/Naxx/NaxxTriggerContext.h
similarity index 99%
rename from src/Ai/Raid/Naxxramas/RaidNaxxTriggerContext.h
rename to src/Ai/Raid/Naxx/NaxxTriggerContext.h
index 83afc273d..52d40cd64 100644
--- a/src/Ai/Raid/Naxxramas/RaidNaxxTriggerContext.h
+++ b/src/Ai/Raid/Naxx/NaxxTriggerContext.h
@@ -7,7 +7,7 @@
 #define _PLAYERBOT_RAIDNAXXTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
-#include "RaidNaxxTriggers.h"
+#include "NaxxTriggers.h"
 
 class RaidNaxxTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Raid/Naxxramas/Trigger/RaidNaxxTriggers.cpp b/src/Ai/Raid/Naxx/NaxxTriggers.cpp
similarity index 99%
rename from src/Ai/Raid/Naxxramas/Trigger/RaidNaxxTriggers.cpp
rename to src/Ai/Raid/Naxx/NaxxTriggers.cpp
index 3f0fc98b3..62195adbb 100644
--- a/src/Ai/Raid/Naxxramas/Trigger/RaidNaxxTriggers.cpp
+++ b/src/Ai/Raid/Naxx/NaxxTriggers.cpp
@@ -1,7 +1,7 @@
-#include "RaidNaxxTriggers.h"
+#include "NaxxTriggers.h"
 
 #include "Playerbots.h"
-#include "RaidNaxxSpellIds.h"
+#include "NaxxSpellIds.h"
 #include "Timer.h"
 #include "Trigger.h"
 
diff --git a/src/Ai/Raid/Naxxramas/Trigger/RaidNaxxTriggers.h b/src/Ai/Raid/Naxx/NaxxTriggers.h
similarity index 99%
rename from src/Ai/Raid/Naxxramas/Trigger/RaidNaxxTriggers.h
rename to src/Ai/Raid/Naxx/NaxxTriggers.h
index c48cadd79..58b1640b3 100644
--- a/src/Ai/Raid/Naxxramas/Trigger/RaidNaxxTriggers.h
+++ b/src/Ai/Raid/Naxx/NaxxTriggers.h
@@ -5,7 +5,7 @@
 #include "EventMap.h"
 #include "GenericTriggers.h"
 #include "PlayerbotAIConfig.h"
-#include "RaidNaxxBossHelper.h"
+#include "NaxxBossHelper.h"
 #include "Trigger.h"
 
 class MutatingInjectionTrigger : public HasAuraTrigger
diff --git a/src/Ai/Raid/ObsidianSanctum/RaidOsActionContext.h b/src/Ai/Raid/OS/OSActionContext.h
similarity index 98%
rename from src/Ai/Raid/ObsidianSanctum/RaidOsActionContext.h
rename to src/Ai/Raid/OS/OSActionContext.h
index 55afe5260..1d3dc7aa9 100644
--- a/src/Ai/Raid/ObsidianSanctum/RaidOsActionContext.h
+++ b/src/Ai/Raid/OS/OSActionContext.h
@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "RaidOsActions.h"
+#include "OSActions.h"
 
 class RaidOsActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Raid/ObsidianSanctum/Action/RaidOsActions.cpp b/src/Ai/Raid/OS/OSActions.cpp
similarity index 99%
rename from src/Ai/Raid/ObsidianSanctum/Action/RaidOsActions.cpp
rename to src/Ai/Raid/OS/OSActions.cpp
index c4f398d65..745da5ed4 100644
--- a/src/Ai/Raid/ObsidianSanctum/Action/RaidOsActions.cpp
+++ b/src/Ai/Raid/OS/OSActions.cpp
@@ -1,5 +1,5 @@
-#include "RaidOsActions.h"
-#include "RaidOsTriggers.h"
+#include "OSActions.h"
+#include "OSTriggers.h"
 
 #include "Playerbots.h"
 
diff --git a/src/Ai/Raid/ObsidianSanctum/Action/RaidOsActions.h b/src/Ai/Raid/OS/OSActions.h
similarity index 100%
rename from src/Ai/Raid/ObsidianSanctum/Action/RaidOsActions.h
rename to src/Ai/Raid/OS/OSActions.h
diff --git a/src/Ai/Raid/ObsidianSanctum/Multiplier/RaidOsMultipliers.cpp b/src/Ai/Raid/OS/OSMultipliers.cpp
similarity index 94%
rename from src/Ai/Raid/ObsidianSanctum/Multiplier/RaidOsMultipliers.cpp
rename to src/Ai/Raid/OS/OSMultipliers.cpp
index bc63f967d..754c68d40 100644
--- a/src/Ai/Raid/ObsidianSanctum/Multiplier/RaidOsMultipliers.cpp
+++ b/src/Ai/Raid/OS/OSMultipliers.cpp
@@ -1,4 +1,4 @@
-#include "RaidOsMultipliers.h"
+#include "OSMultipliers.h"
 
 #include "ChooseTargetActions.h"
 #include "DKActions.h"
@@ -9,8 +9,8 @@
 #include "GenericSpellActions.h"
 #include "MovementActions.h"
 #include "PaladinActions.h"
-#include "RaidOsActions.h"
-#include "RaidOsTriggers.h"
+#include "OSActions.h"
+#include "OSTriggers.h"
 #include "ReachTargetActions.h"
 #include "ScriptedCreature.h"
 #include "WarriorActions.h"
diff --git a/src/Ai/Raid/ObsidianSanctum/Multiplier/RaidOsMultipliers.h b/src/Ai/Raid/OS/OSMultipliers.h
similarity index 100%
rename from src/Ai/Raid/ObsidianSanctum/Multiplier/RaidOsMultipliers.h
rename to src/Ai/Raid/OS/OSMultipliers.h
diff --git a/src/Ai/Raid/ObsidianSanctum/Strategy/RaidOsStrategy.cpp b/src/Ai/Raid/OS/OSStrategy.cpp
similarity index 95%
rename from src/Ai/Raid/ObsidianSanctum/Strategy/RaidOsStrategy.cpp
rename to src/Ai/Raid/OS/OSStrategy.cpp
index 4468de991..71128148e 100644
--- a/src/Ai/Raid/ObsidianSanctum/Strategy/RaidOsStrategy.cpp
+++ b/src/Ai/Raid/OS/OSStrategy.cpp
@@ -1,5 +1,5 @@
-#include "RaidOsStrategy.h"
-#include "RaidOsMultipliers.h"
+#include "OSStrategy.h"
+#include "OSMultipliers.h"
 #include "Strategy.h"
 
 void RaidOsStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
diff --git a/src/Ai/Raid/ObsidianSanctum/Strategy/RaidOsStrategy.h b/src/Ai/Raid/OS/OSStrategy.h
similarity index 100%
rename from src/Ai/Raid/ObsidianSanctum/Strategy/RaidOsStrategy.h
rename to src/Ai/Raid/OS/OSStrategy.h
diff --git a/src/Ai/Raid/ObsidianSanctum/RaidOsTriggerContext.h b/src/Ai/Raid/OS/OSTriggerContext.h
similarity index 98%
rename from src/Ai/Raid/ObsidianSanctum/RaidOsTriggerContext.h
rename to src/Ai/Raid/OS/OSTriggerContext.h
index 3c1d40692..e9195bcc2 100644
--- a/src/Ai/Raid/ObsidianSanctum/RaidOsTriggerContext.h
+++ b/src/Ai/Raid/OS/OSTriggerContext.h
@@ -2,7 +2,7 @@
 #define _PLAYERBOT_RAIDOSTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
-#include "RaidOsTriggers.h"
+#include "OSTriggers.h"
 
 class RaidOsTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Raid/ObsidianSanctum/Trigger/RaidOsTriggers.cpp b/src/Ai/Raid/OS/OSTriggers.cpp
similarity index 99%
rename from src/Ai/Raid/ObsidianSanctum/Trigger/RaidOsTriggers.cpp
rename to src/Ai/Raid/OS/OSTriggers.cpp
index 710e3cac1..d47fdcd06 100644
--- a/src/Ai/Raid/ObsidianSanctum/Trigger/RaidOsTriggers.cpp
+++ b/src/Ai/Raid/OS/OSTriggers.cpp
@@ -1,4 +1,4 @@
-#include "RaidOsTriggers.h"
+#include "OSTriggers.h"
 
 #include "SharedDefines.h"
 
diff --git a/src/Ai/Raid/ObsidianSanctum/Trigger/RaidOsTriggers.h b/src/Ai/Raid/OS/OSTriggers.h
similarity index 100%
rename from src/Ai/Raid/ObsidianSanctum/Trigger/RaidOsTriggers.h
rename to src/Ai/Raid/OS/OSTriggers.h
diff --git a/src/Ai/Raid/Onyxia/RaidOnyxiaActionContext.h b/src/Ai/Raid/Ony/OnyActionContext.h
similarity index 97%
rename from src/Ai/Raid/Onyxia/RaidOnyxiaActionContext.h
rename to src/Ai/Raid/Ony/OnyActionContext.h
index b2923f969..923186f61 100644
--- a/src/Ai/Raid/Onyxia/RaidOnyxiaActionContext.h
+++ b/src/Ai/Raid/Ony/OnyActionContext.h
@@ -3,7 +3,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "RaidOnyxiaActions.h"
+#include "OnyActions.h"
 
 class RaidOnyxiaActionContext : public NamedObjectContext<Action>
 {
diff --git a/src/Ai/Raid/Onyxia/Action/RaidOnyxiaActions.cpp b/src/Ai/Raid/Ony/OnyActions.cpp
similarity index 99%
rename from src/Ai/Raid/Onyxia/Action/RaidOnyxiaActions.cpp
rename to src/Ai/Raid/Ony/OnyActions.cpp
index 5b470ee5c..d0565c189 100644
--- a/src/Ai/Raid/Onyxia/Action/RaidOnyxiaActions.cpp
+++ b/src/Ai/Raid/Ony/OnyActions.cpp
@@ -1,4 +1,4 @@
-#include "RaidOnyxiaActions.h"
+#include "OnyActions.h"
 
 #include "GenericSpellActions.h"
 #include "LastMovementValue.h"
diff --git a/src/Ai/Raid/Onyxia/Action/RaidOnyxiaActions.h b/src/Ai/Raid/Ony/OnyActions.h
similarity index 100%
rename from src/Ai/Raid/Onyxia/Action/RaidOnyxiaActions.h
rename to src/Ai/Raid/Ony/OnyActions.h
diff --git a/src/Ai/Raid/Onyxia/Strategy/RaidOnyxiaStrategy.cpp b/src/Ai/Raid/Ony/OnyStrategy.cpp
similarity index 96%
rename from src/Ai/Raid/Onyxia/Strategy/RaidOnyxiaStrategy.cpp
rename to src/Ai/Raid/Ony/OnyStrategy.cpp
index bb61bc004..07d763cfe 100644
--- a/src/Ai/Raid/Onyxia/Strategy/RaidOnyxiaStrategy.cpp
+++ b/src/Ai/Raid/Ony/OnyStrategy.cpp
@@ -1,4 +1,4 @@
-#include "RaidOnyxiaStrategy.h"
+#include "OnyStrategy.h"
 
 void RaidOnyxiaStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
diff --git a/src/Ai/Raid/Onyxia/Strategy/RaidOnyxiaStrategy.h b/src/Ai/Raid/Ony/OnyStrategy.h
similarity index 100%
rename from src/Ai/Raid/Onyxia/Strategy/RaidOnyxiaStrategy.h
rename to src/Ai/Raid/Ony/OnyStrategy.h
diff --git a/src/Ai/Raid/Onyxia/RaidOnyxiaTriggerContext.h b/src/Ai/Raid/Ony/OnyTriggerContext.h
similarity index 97%
rename from src/Ai/Raid/Onyxia/RaidOnyxiaTriggerContext.h
rename to src/Ai/Raid/Ony/OnyTriggerContext.h
index daf624a0b..1c8425608 100644
--- a/src/Ai/Raid/Onyxia/RaidOnyxiaTriggerContext.h
+++ b/src/Ai/Raid/Ony/OnyTriggerContext.h
@@ -2,7 +2,7 @@
 #define _PLAYERBOT_RAIDONYXIATRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
-#include "RaidOnyxiaTriggers.h"
+#include "OnyTriggers.h"
 
 class RaidOnyxiaTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Raid/Onyxia/Trigger/RaidOnyxiaTriggers.cpp b/src/Ai/Raid/Ony/OnyTriggers.cpp
similarity index 99%
rename from src/Ai/Raid/Onyxia/Trigger/RaidOnyxiaTriggers.cpp
rename to src/Ai/Raid/Ony/OnyTriggers.cpp
index 56486ebf9..fe59c199d 100644
--- a/src/Ai/Raid/Onyxia/Trigger/RaidOnyxiaTriggers.cpp
+++ b/src/Ai/Raid/Ony/OnyTriggers.cpp
@@ -1,4 +1,4 @@
-#include "RaidOnyxiaTriggers.h"
+#include "OnyTriggers.h"
 
 #include "GenericTriggers.h"
 #include "ObjectAccessor.h"
diff --git a/src/Ai/Raid/Onyxia/Trigger/RaidOnyxiaTriggers.h b/src/Ai/Raid/Ony/OnyTriggers.h
similarity index 100%
rename from src/Ai/Raid/Onyxia/Trigger/RaidOnyxiaTriggers.h
rename to src/Ai/Raid/Ony/OnyTriggers.h
diff --git a/src/Ai/Raid/RaidStrategyContext.h b/src/Ai/Raid/RaidStrategyContext.h
index 732310b28..ddb288e33 100644
--- a/src/Ai/Raid/RaidStrategyContext.h
+++ b/src/Ai/Raid/RaidStrategyContext.h
@@ -2,23 +2,23 @@
 #define _PLAYERBOT_RAIDSTRATEGYCONTEXT_H_
 
 #include "Strategy.h"
-#include "RaidAq20Strategy.h"
-#include "RaidMcStrategy.h"
-#include "RaidBwlStrategy.h"
-#include "RaidKarazhanStrategy.h"
-#include "RaidGruulsLairStrategy.h"
-#include "RaidMagtheridonStrategy.h"
-#include "RaidNaxxStrategy.h"
-#include "RaidSSCStrategy.h"
-#include "RaidTempestKeepStrategy.h"
-#include "RaidHyjalSummitStrategy.h"
-#include "RaidBlackTempleStrategy.h"
-#include "RaidZulAmanStrategy.h"
-#include "RaidOsStrategy.h"
-#include "RaidEoEStrategy.h"
-#include "RaidVoAStrategy.h"
-#include "RaidUlduarStrategy.h"
-#include "RaidOnyxiaStrategy.h"
+#include "Aq20Strategy.h"
+#include "MCStrategy.h"
+#include "BWLStrategy.h"
+#include "KaraStrategy.h"
+#include "GruulStrategy.h"
+#include "MagStrategy.h"
+#include "NaxxStrategy.h"
+#include "SSCStrategy.h"
+#include "TKStrategy.h"
+#include "HyjalStrategy.h"
+#include "BTStrategy.h"
+#include "ZAStrategy.h"
+#include "OSStrategy.h"
+#include "EoEStrategy.h"
+#include "VoAStrategy.h"
+#include "UldStrategy.h"
+#include "OnyStrategy.h"
 #include "ICCStrategy.h"
 
 class RaidStrategyContext : public NamedObjectContext<Strategy>
diff --git a/src/Ai/Raid/SerpentshrineCavern/RaidSSCActionContext.h b/src/Ai/Raid/SSC/SSCActionContext.h
similarity index 99%
rename from src/Ai/Raid/SerpentshrineCavern/RaidSSCActionContext.h
rename to src/Ai/Raid/SSC/SSCActionContext.h
index 1e2c44b49..4a14a747c 100644
--- a/src/Ai/Raid/SerpentshrineCavern/RaidSSCActionContext.h
+++ b/src/Ai/Raid/SSC/SSCActionContext.h
@@ -6,7 +6,7 @@
 #ifndef _PLAYERBOT_RAIDSSCACTIONCONTEXT_H
 #define _PLAYERBOT_RAIDSSCACTIONCONTEXT_H
 
-#include "RaidSSCActions.h"
+#include "SSCActions.h"
 #include "NamedObjectContext.h"
 
 class RaidSSCActionContext : public NamedObjectContext<Action>
diff --git a/src/Ai/Raid/SerpentshrineCavern/Action/RaidSSCActions.cpp b/src/Ai/Raid/SSC/SSCActions.cpp
similarity index 99%
rename from src/Ai/Raid/SerpentshrineCavern/Action/RaidSSCActions.cpp
rename to src/Ai/Raid/SSC/SSCActions.cpp
index 9ccd67d2b..68989f5a6 100644
--- a/src/Ai/Raid/SerpentshrineCavern/Action/RaidSSCActions.cpp
+++ b/src/Ai/Raid/SSC/SSCActions.cpp
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidSSCActions.h"
-#include "RaidSSCHelpers.h"
+#include "SSCActions.h"
+#include "SSCHelpers.h"
 #include "AiFactory.h"
 #include "Corpse.h"
 #include "LootAction.h"
diff --git a/src/Ai/Raid/SerpentshrineCavern/Action/RaidSSCActions.h b/src/Ai/Raid/SSC/SSCActions.h
similarity index 100%
rename from src/Ai/Raid/SerpentshrineCavern/Action/RaidSSCActions.h
rename to src/Ai/Raid/SSC/SSCActions.h
diff --git a/src/Ai/Raid/SerpentshrineCavern/Util/RaidSSCHelpers.cpp b/src/Ai/Raid/SSC/SSCHelpers.cpp
similarity index 99%
rename from src/Ai/Raid/SerpentshrineCavern/Util/RaidSSCHelpers.cpp
rename to src/Ai/Raid/SSC/SSCHelpers.cpp
index 110481775..b3a4ca4a5 100644
--- a/src/Ai/Raid/SerpentshrineCavern/Util/RaidSSCHelpers.cpp
+++ b/src/Ai/Raid/SSC/SSCHelpers.cpp
@@ -3,7 +3,7 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidSSCHelpers.h"
+#include "SSCHelpers.h"
 #include "AiFactory.h"
 #include "Creature.h"
 #include "ObjectAccessor.h"
diff --git a/src/Ai/Raid/SerpentshrineCavern/Util/RaidSSCHelpers.h b/src/Ai/Raid/SSC/SSCHelpers.h
similarity index 100%
rename from src/Ai/Raid/SerpentshrineCavern/Util/RaidSSCHelpers.h
rename to src/Ai/Raid/SSC/SSCHelpers.h
diff --git a/src/Ai/Raid/SerpentshrineCavern/Multiplier/RaidSSCMultipliers.cpp b/src/Ai/Raid/SSC/SSCMultipliers.cpp
similarity index 99%
rename from src/Ai/Raid/SerpentshrineCavern/Multiplier/RaidSSCMultipliers.cpp
rename to src/Ai/Raid/SSC/SSCMultipliers.cpp
index 85d2c51a5..9e64e10c0 100644
--- a/src/Ai/Raid/SerpentshrineCavern/Multiplier/RaidSSCMultipliers.cpp
+++ b/src/Ai/Raid/SSC/SSCMultipliers.cpp
@@ -3,9 +3,9 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidSSCMultipliers.h"
-#include "RaidSSCActions.h"
-#include "RaidSSCHelpers.h"
+#include "SSCMultipliers.h"
+#include "SSCActions.h"
+#include "SSCHelpers.h"
 #include "ChooseTargetActions.h"
 #include "DestroyItemAction.h"
 #include "DKActions.h"
diff --git a/src/Ai/Raid/SerpentshrineCavern/Multiplier/RaidSSCMultipliers.h b/src/Ai/Raid/SSC/SSCMultipliers.h
similarity index 100%
rename from src/Ai/Raid/SerpentshrineCavern/Multiplier/RaidSSCMultipliers.h
rename to src/Ai/Raid/SSC/SSCMultipliers.h
diff --git a/src/Ai/Raid/SerpentshrineCavern/Strategy/RaidSSCStrategy.cpp b/src/Ai/Raid/SSC/SSCStrategy.cpp
similarity index 99%
rename from src/Ai/Raid/SerpentshrineCavern/Strategy/RaidSSCStrategy.cpp
rename to src/Ai/Raid/SSC/SSCStrategy.cpp
index 624049c81..49ca37e6a 100644
--- a/src/Ai/Raid/SerpentshrineCavern/Strategy/RaidSSCStrategy.cpp
+++ b/src/Ai/Raid/SSC/SSCStrategy.cpp
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidSSCStrategy.h"
-#include "RaidSSCMultipliers.h"
+#include "SSCStrategy.h"
+#include "SSCMultipliers.h"
 
 void RaidSSCStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
diff --git a/src/Ai/Raid/SerpentshrineCavern/Strategy/RaidSSCStrategy.h b/src/Ai/Raid/SSC/SSCStrategy.h
similarity index 100%
rename from src/Ai/Raid/SerpentshrineCavern/Strategy/RaidSSCStrategy.h
rename to src/Ai/Raid/SSC/SSCStrategy.h
diff --git a/src/Ai/Raid/SerpentshrineCavern/RaidSSCTriggerContext.h b/src/Ai/Raid/SSC/SSCTriggerContext.h
similarity index 99%
rename from src/Ai/Raid/SerpentshrineCavern/RaidSSCTriggerContext.h
rename to src/Ai/Raid/SSC/SSCTriggerContext.h
index 5b0f8d5e3..ac1ce5876 100644
--- a/src/Ai/Raid/SerpentshrineCavern/RaidSSCTriggerContext.h
+++ b/src/Ai/Raid/SSC/SSCTriggerContext.h
@@ -6,7 +6,7 @@
 #ifndef _PLAYERBOT_RAIDSSCTRIGGERCONTEXT_H
 #define _PLAYERBOT_RAIDSSCTRIGGERCONTEXT_H
 
-#include "RaidSSCTriggers.h"
+#include "SSCTriggers.h"
 #include "NamedObjectContext.h"
 
 class RaidSSCTriggerContext : public NamedObjectContext<Trigger>
diff --git a/src/Ai/Raid/SerpentshrineCavern/Trigger/RaidSSCTriggers.cpp b/src/Ai/Raid/SSC/SSCTriggers.cpp
similarity index 99%
rename from src/Ai/Raid/SerpentshrineCavern/Trigger/RaidSSCTriggers.cpp
rename to src/Ai/Raid/SSC/SSCTriggers.cpp
index c3e753223..f54d40a91 100644
--- a/src/Ai/Raid/SerpentshrineCavern/Trigger/RaidSSCTriggers.cpp
+++ b/src/Ai/Raid/SSC/SSCTriggers.cpp
@@ -3,9 +3,9 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidSSCTriggers.h"
-#include "RaidSSCHelpers.h"
-#include "RaidSSCActions.h"
+#include "SSCTriggers.h"
+#include "SSCHelpers.h"
+#include "SSCActions.h"
 #include "AiFactory.h"
 #include "Corpse.h"
 #include "LootObjectStack.h"
diff --git a/src/Ai/Raid/SerpentshrineCavern/Trigger/RaidSSCTriggers.h b/src/Ai/Raid/SSC/SSCTriggers.h
similarity index 100%
rename from src/Ai/Raid/SerpentshrineCavern/Trigger/RaidSSCTriggers.h
rename to src/Ai/Raid/SSC/SSCTriggers.h
diff --git a/src/Ai/Raid/TempestKeep/RaidTempestKeepActionContext.h b/src/Ai/Raid/TK/TKActionContext.h
similarity index 99%
rename from src/Ai/Raid/TempestKeep/RaidTempestKeepActionContext.h
rename to src/Ai/Raid/TK/TKActionContext.h
index 125b27c0f..0c2c1cd71 100644
--- a/src/Ai/Raid/TempestKeep/RaidTempestKeepActionContext.h
+++ b/src/Ai/Raid/TK/TKActionContext.h
@@ -1,7 +1,7 @@
 #ifndef _PLAYERBOT_RAIDTEMPESTKEEPACTIONCONTEXT_H
 #define _PLAYERBOT_RAIDTEMPESTKEEPACTIONCONTEXT_H
 
-#include "RaidTempestKeepActions.h"
+#include "TKActions.h"
 #include "NamedObjectContext.h"
 
 class RaidTempestKeepActionContext : public NamedObjectContext<Action>
diff --git a/src/Ai/Raid/TempestKeep/Action/RaidTempestKeepActions.cpp b/src/Ai/Raid/TK/TKActions.cpp
similarity index 99%
rename from src/Ai/Raid/TempestKeep/Action/RaidTempestKeepActions.cpp
rename to src/Ai/Raid/TK/TKActions.cpp
index 0255e1928..659338617 100644
--- a/src/Ai/Raid/TempestKeep/Action/RaidTempestKeepActions.cpp
+++ b/src/Ai/Raid/TK/TKActions.cpp
@@ -1,6 +1,6 @@
-#include "RaidTempestKeepActions.h"
-#include "RaidTempestKeepHelpers.h"
-#include "RaidTempestKeepKaelthasBossAI.h"
+#include "TKActions.h"
+#include "TKHelpers.h"
+#include "TKKaelthasBossAI.h"
 #include "AiFactory.h"
 #include "EquipAction.h"
 #include "LootAction.h"
diff --git a/src/Ai/Raid/TempestKeep/Action/RaidTempestKeepActions.h b/src/Ai/Raid/TK/TKActions.h
similarity index 99%
rename from src/Ai/Raid/TempestKeep/Action/RaidTempestKeepActions.h
rename to src/Ai/Raid/TK/TKActions.h
index 41b087e3c..0d751ac16 100644
--- a/src/Ai/Raid/TempestKeep/Action/RaidTempestKeepActions.h
+++ b/src/Ai/Raid/TK/TKActions.h
@@ -1,8 +1,8 @@
 #ifndef _PLAYERBOT_RAIDTEMPESTKEEPACTIONS_H
 #define _PLAYERBOT_RAIDTEMPESTKEEPACTIONS_H
 
-#include "RaidTempestKeepHelpers.h"
-#include "RaidTempestKeepKaelthasBossAI.h"
+#include "TKHelpers.h"
+#include "TKKaelthasBossAI.h"
 #include "Action.h"
 #include "AttackAction.h"
 #include "MovementActions.h"
diff --git a/src/Ai/Raid/TempestKeep/Multiplier/RaidTempestKeepMultipliers.cpp b/src/Ai/Raid/TK/TKMultipliers.cpp
similarity index 98%
rename from src/Ai/Raid/TempestKeep/Multiplier/RaidTempestKeepMultipliers.cpp
rename to src/Ai/Raid/TK/TKMultipliers.cpp
index 3bd65aecb..9a632a6c7 100644
--- a/src/Ai/Raid/TempestKeep/Multiplier/RaidTempestKeepMultipliers.cpp
+++ b/src/Ai/Raid/TK/TKMultipliers.cpp
@@ -1,7 +1,7 @@
-#include "RaidTempestKeepMultipliers.h"
-#include "RaidTempestKeepActions.h"
-#include "RaidTempestKeepHelpers.h"
-#include "RaidTempestKeepKaelthasBossAI.h"
+#include "TKMultipliers.h"
+#include "TKActions.h"
+#include "TKHelpers.h"
+#include "TKKaelthasBossAI.h"
 #include "ChooseTargetActions.h"
 #include "DKActions.h"
 #include "DruidActions.h"
diff --git a/src/Ai/Raid/TempestKeep/Multiplier/RaidTempestKeepMultipliers.h b/src/Ai/Raid/TK/TKMultipliers.h
similarity index 100%
rename from src/Ai/Raid/TempestKeep/Multiplier/RaidTempestKeepMultipliers.h
rename to src/Ai/Raid/TK/TKMultipliers.h
diff --git a/src/Ai/Raid/TempestKeep/Strategy/RaidTempestKeepStrategy.cpp b/src/Ai/Raid/TK/TKStrategy.cpp
similarity index 99%
rename from src/Ai/Raid/TempestKeep/Strategy/RaidTempestKeepStrategy.cpp
rename to src/Ai/Raid/TK/TKStrategy.cpp
index 627d3d7ab..3a5155ca9 100644
--- a/src/Ai/Raid/TempestKeep/Strategy/RaidTempestKeepStrategy.cpp
+++ b/src/Ai/Raid/TK/TKStrategy.cpp
@@ -1,5 +1,5 @@
-#include "RaidTempestKeepStrategy.h"
-#include "RaidTempestKeepMultipliers.h"
+#include "TKStrategy.h"
+#include "TKMultipliers.h"
 
 void RaidTempestKeepStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
diff --git a/src/Ai/Raid/TempestKeep/Strategy/RaidTempestKeepStrategy.h b/src/Ai/Raid/TK/TKStrategy.h
similarity index 100%
rename from src/Ai/Raid/TempestKeep/Strategy/RaidTempestKeepStrategy.h
rename to src/Ai/Raid/TK/TKStrategy.h
diff --git a/src/Ai/Raid/TempestKeep/RaidTempestKeepTriggerContext.h b/src/Ai/Raid/TK/TKTriggerContext.h
similarity index 99%
rename from src/Ai/Raid/TempestKeep/RaidTempestKeepTriggerContext.h
rename to src/Ai/Raid/TK/TKTriggerContext.h
index 0bf1d0fdc..baa11694c 100644
--- a/src/Ai/Raid/TempestKeep/RaidTempestKeepTriggerContext.h
+++ b/src/Ai/Raid/TK/TKTriggerContext.h
@@ -1,7 +1,7 @@
 #ifndef _PLAYERBOT_RAIDTEMPESTKEEPTRIGGERCONTEXT_H
 #define _PLAYERBOT_RAIDTEMPESTKEEPTRIGGERCONTEXT_H
 
-#include "RaidTempestKeepTriggers.h"
+#include "TKTriggers.h"
 #include "NamedObjectContext.h"
 
 class RaidTempestKeepTriggerContext : public NamedObjectContext<Trigger>
diff --git a/src/Ai/Raid/TempestKeep/Trigger/RaidTempestKeepTriggers.cpp b/src/Ai/Raid/TK/TKTriggers.cpp
similarity index 99%
rename from src/Ai/Raid/TempestKeep/Trigger/RaidTempestKeepTriggers.cpp
rename to src/Ai/Raid/TK/TKTriggers.cpp
index b0b399b10..d477b6d8f 100644
--- a/src/Ai/Raid/TempestKeep/Trigger/RaidTempestKeepTriggers.cpp
+++ b/src/Ai/Raid/TK/TKTriggers.cpp
@@ -1,7 +1,7 @@
-#include "RaidTempestKeepTriggers.h"
-#include "RaidTempestKeepHelpers.h"
-#include "RaidTempestKeepActions.h"
-#include "RaidTempestKeepKaelthasBossAI.h"
+#include "TKTriggers.h"
+#include "TKHelpers.h"
+#include "TKActions.h"
+#include "TKKaelthasBossAI.h"
 #include "Playerbots.h"
 #include "RaidBossHelpers.h"
 
diff --git a/src/Ai/Raid/TempestKeep/Trigger/RaidTempestKeepTriggers.h b/src/Ai/Raid/TK/TKTriggers.h
similarity index 100%
rename from src/Ai/Raid/TempestKeep/Trigger/RaidTempestKeepTriggers.h
rename to src/Ai/Raid/TK/TKTriggers.h
diff --git a/src/Ai/Raid/TempestKeep/Util/RaidTempestKeepHelpers.cpp b/src/Ai/Raid/TK/Util/TKHelpers.cpp
similarity index 99%
rename from src/Ai/Raid/TempestKeep/Util/RaidTempestKeepHelpers.cpp
rename to src/Ai/Raid/TK/Util/TKHelpers.cpp
index 303277712..d4d8a44be 100644
--- a/src/Ai/Raid/TempestKeep/Util/RaidTempestKeepHelpers.cpp
+++ b/src/Ai/Raid/TK/Util/TKHelpers.cpp
@@ -1,5 +1,5 @@
-#include "RaidTempestKeepHelpers.h"
-#include "RaidTempestKeepActions.h"
+#include "TKHelpers.h"
+#include "TKActions.h"
 #include "LootObjectStack.h"
 #include "Playerbots.h"
 #include "RaidBossHelpers.h"
diff --git a/src/Ai/Raid/TempestKeep/Util/RaidTempestKeepHelpers.h b/src/Ai/Raid/TK/Util/TKHelpers.h
similarity index 100%
rename from src/Ai/Raid/TempestKeep/Util/RaidTempestKeepHelpers.h
rename to src/Ai/Raid/TK/Util/TKHelpers.h
diff --git a/src/Ai/Raid/TempestKeep/Util/RaidTempestKeepKaelthasBossAI.h b/src/Ai/Raid/TK/Util/TKKaelthasBossAI.h
similarity index 100%
rename from src/Ai/Raid/TempestKeep/Util/RaidTempestKeepKaelthasBossAI.h
rename to src/Ai/Raid/TK/Util/TKKaelthasBossAI.h
diff --git a/src/Ai/Raid/TempestKeep/Util/RaidTempestKeepScripts.cpp b/src/Ai/Raid/TK/Util/TKScripts.cpp
similarity index 97%
rename from src/Ai/Raid/TempestKeep/Util/RaidTempestKeepScripts.cpp
rename to src/Ai/Raid/TK/Util/TKScripts.cpp
index ff26d1500..85703b100 100644
--- a/src/Ai/Raid/TempestKeep/Util/RaidTempestKeepScripts.cpp
+++ b/src/Ai/Raid/TK/Util/TKScripts.cpp
@@ -1,4 +1,4 @@
-#include "RaidTempestKeepHelpers.h"
+#include "TKHelpers.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
 #include "ScriptMgr.h"
diff --git a/src/Ai/Raid/Ulduar/RaidUlduarActionContext.h b/src/Ai/Raid/Uld/UldActionContext.h
similarity index 99%
rename from src/Ai/Raid/Ulduar/RaidUlduarActionContext.h
rename to src/Ai/Raid/Uld/UldActionContext.h
index 84c1bb850..aec2e68e7 100644
--- a/src/Ai/Raid/Ulduar/RaidUlduarActionContext.h
+++ b/src/Ai/Raid/Uld/UldActionContext.h
@@ -8,7 +8,7 @@
 
 #include "Action.h"
 #include "NamedObjectContext.h"
-#include "RaidUlduarActions.h"
+#include "UldActions.h"
 #include "BossAuraActions.h"
 
 class RaidUlduarActionContext : public NamedObjectContext<Action>
diff --git a/src/Ai/Raid/Ulduar/Action/RaidUlduarActions.cpp b/src/Ai/Raid/Uld/UldActions.cpp
similarity index 99%
rename from src/Ai/Raid/Ulduar/Action/RaidUlduarActions.cpp
rename to src/Ai/Raid/Uld/UldActions.cpp
index 217ab2c06..1ea211949 100644
--- a/src/Ai/Raid/Ulduar/Action/RaidUlduarActions.cpp
+++ b/src/Ai/Raid/Uld/UldActions.cpp
@@ -1,5 +1,5 @@
 
-#include "RaidUlduarActions.h"
+#include "UldActions.h"
 
 #include <CombatStrategy.h>
 #include <FollowMasterStrategy.h>
@@ -16,8 +16,8 @@
 #include "PlayerbotAIConfig.h"
 #include "Playerbots.h"
 #include "Position.h"
-#include "RaidUlduarBossHelper.h"
-#include "RaidUlduarScripts.h"
+#include "UldBossHelper.h"
+#include "UldScripts.h"
 #include "RtiValue.h"
 #include "ScriptedCreature.h"
 #include "ServerFacade.h"
diff --git a/src/Ai/Raid/Ulduar/Action/RaidUlduarActions.h b/src/Ai/Raid/Uld/UldActions.h
similarity index 99%
rename from src/Ai/Raid/Ulduar/Action/RaidUlduarActions.h
rename to src/Ai/Raid/Uld/UldActions.h
index c3d5c0d63..152de3fcb 100644
--- a/src/Ai/Raid/Ulduar/Action/RaidUlduarActions.h
+++ b/src/Ai/Raid/Uld/UldActions.h
@@ -8,8 +8,8 @@
 #include "MovementActions.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "RaidUlduarBossHelper.h"
-#include "RaidUlduarTriggers.h"
+#include "UldBossHelper.h"
+#include "UldTriggers.h"
 #include "Vehicle.h"
 
 //
diff --git a/src/Ai/Raid/Ulduar/Strategy/RaidUlduarStrategy.cpp b/src/Ai/Raid/Uld/UldStrategy.cpp
similarity index 99%
rename from src/Ai/Raid/Ulduar/Strategy/RaidUlduarStrategy.cpp
rename to src/Ai/Raid/Uld/UldStrategy.cpp
index 0a1b76a40..c2fa156bd 100644
--- a/src/Ai/Raid/Ulduar/Strategy/RaidUlduarStrategy.cpp
+++ b/src/Ai/Raid/Uld/UldStrategy.cpp
@@ -1,4 +1,4 @@
-#include "RaidUlduarStrategy.h"
+#include "UldStrategy.h"
 
 void RaidUlduarStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
diff --git a/src/Ai/Raid/Ulduar/Strategy/RaidUlduarStrategy.h b/src/Ai/Raid/Uld/UldStrategy.h
similarity index 100%
rename from src/Ai/Raid/Ulduar/Strategy/RaidUlduarStrategy.h
rename to src/Ai/Raid/Uld/UldStrategy.h
diff --git a/src/Ai/Raid/Ulduar/RaidUlduarTriggerContext.h b/src/Ai/Raid/Uld/UldTriggerContext.h
similarity index 99%
rename from src/Ai/Raid/Ulduar/RaidUlduarTriggerContext.h
rename to src/Ai/Raid/Uld/UldTriggerContext.h
index e093f5797..c1bdb4476 100644
--- a/src/Ai/Raid/Ulduar/RaidUlduarTriggerContext.h
+++ b/src/Ai/Raid/Uld/UldTriggerContext.h
@@ -7,7 +7,7 @@
 #define _PLAYERBOT_RAIDULDUARTRIGGERCONTEXT_H
 
 #include "NamedObjectContext.h"
-#include "RaidUlduarTriggers.h"
+#include "UldTriggers.h"
 #include "BossAuraTriggers.h"
 
 class RaidUlduarTriggerContext : public NamedObjectContext<Trigger>
diff --git a/src/Ai/Raid/Ulduar/Trigger/RaidUlduarTriggers.cpp b/src/Ai/Raid/Uld/UldTriggers.cpp
similarity index 99%
rename from src/Ai/Raid/Ulduar/Trigger/RaidUlduarTriggers.cpp
rename to src/Ai/Raid/Uld/UldTriggers.cpp
index 7b269ac68..7c84043ef 100644
--- a/src/Ai/Raid/Ulduar/Trigger/RaidUlduarTriggers.cpp
+++ b/src/Ai/Raid/Uld/UldTriggers.cpp
@@ -1,11 +1,11 @@
-#include "RaidUlduarTriggers.h"
+#include "UldTriggers.h"
 
 #include "GameObject.h"
 #include "Object.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
-#include "RaidUlduarBossHelper.h"
-#include "RaidUlduarScripts.h"
+#include "UldBossHelper.h"
+#include "UldScripts.h"
 #include "ScriptedCreature.h"
 #include "SharedDefines.h"
 #include "Trigger.h"
diff --git a/src/Ai/Raid/Ulduar/Trigger/RaidUlduarTriggers.h b/src/Ai/Raid/Uld/UldTriggers.h
similarity index 99%
rename from src/Ai/Raid/Ulduar/Trigger/RaidUlduarTriggers.h
rename to src/Ai/Raid/Uld/UldTriggers.h
index 7f8cb51a8..f827745fc 100644
--- a/src/Ai/Raid/Ulduar/Trigger/RaidUlduarTriggers.h
+++ b/src/Ai/Raid/Uld/UldTriggers.h
@@ -3,7 +3,7 @@
 
 #include "EventMap.h"
 #include "GenericTriggers.h"
-#include "RaidUlduarBossHelper.h"
+#include "UldBossHelper.h"
 #include "Trigger.h"
 
 //
diff --git a/src/Ai/Raid/Ulduar/Util/RaidUlduarBossHelper.cpp b/src/Ai/Raid/Uld/Util/UldBossHelper.cpp
similarity index 99%
rename from src/Ai/Raid/Ulduar/Util/RaidUlduarBossHelper.cpp
rename to src/Ai/Raid/Uld/Util/UldBossHelper.cpp
index fd6711cf0..b2cb5c48d 100644
--- a/src/Ai/Raid/Ulduar/Util/RaidUlduarBossHelper.cpp
+++ b/src/Ai/Raid/Uld/Util/UldBossHelper.cpp
@@ -1,4 +1,4 @@
-#include "RaidUlduarBossHelper.h"
+#include "UldBossHelper.h"
 #include "ObjectAccessor.h"
 #include "GameObject.h"
 #include "Group.h"
diff --git a/src/Ai/Raid/Ulduar/Util/RaidUlduarBossHelper.h b/src/Ai/Raid/Uld/Util/UldBossHelper.h
similarity index 100%
rename from src/Ai/Raid/Ulduar/Util/RaidUlduarBossHelper.h
rename to src/Ai/Raid/Uld/Util/UldBossHelper.h
diff --git a/src/Ai/Raid/Ulduar/Util/RaidUlduarScripts.h b/src/Ai/Raid/Uld/Util/UldScripts.h
similarity index 100%
rename from src/Ai/Raid/Ulduar/Util/RaidUlduarScripts.h
rename to src/Ai/Raid/Uld/Util/UldScripts.h
diff --git a/src/Ai/Raid/VaultOfArchavon/RaidVoAActionContext.h b/src/Ai/Raid/VoA/VoAActionContext.h
similarity index 98%
rename from src/Ai/Raid/VaultOfArchavon/RaidVoAActionContext.h
rename to src/Ai/Raid/VoA/VoAActionContext.h
index 263d03d9b..312f36a67 100644
--- a/src/Ai/Raid/VaultOfArchavon/RaidVoAActionContext.h
+++ b/src/Ai/Raid/VoA/VoAActionContext.h
@@ -9,7 +9,7 @@
 #include "Action.h"
 #include "BossAuraActions.h"
 #include "NamedObjectContext.h"
-#include "RaidVoAActions.h"
+#include "VoAActions.h"
 #include "PlayerbotAI.h"
 
 class RaidVoAActionContext : public NamedObjectContext<Action>
diff --git a/src/Ai/Raid/VaultOfArchavon/Action/RaidVoAActions.cpp b/src/Ai/Raid/VoA/VoAActions.cpp
similarity index 99%
rename from src/Ai/Raid/VaultOfArchavon/Action/RaidVoAActions.cpp
rename to src/Ai/Raid/VoA/VoAActions.cpp
index 892ddf3eb..33d274461 100644
--- a/src/Ai/Raid/VaultOfArchavon/Action/RaidVoAActions.cpp
+++ b/src/Ai/Raid/VoA/VoAActions.cpp
@@ -1,5 +1,5 @@
-#include "RaidVoAActions.h"
-#include "RaidVoATriggers.h"
+#include "VoAActions.h"
+#include "VoATriggers.h"
 #include "Define.h"
 #include "Event.h"
 #include "Group.h"
diff --git a/src/Ai/Raid/VaultOfArchavon/Action/RaidVoAActions.h b/src/Ai/Raid/VoA/VoAActions.h
similarity index 100%
rename from src/Ai/Raid/VaultOfArchavon/Action/RaidVoAActions.h
rename to src/Ai/Raid/VoA/VoAActions.h
diff --git a/src/Ai/Raid/VaultOfArchavon/Strategy/RaidVoAStrategy.cpp b/src/Ai/Raid/VoA/VoAStrategy.cpp
similarity index 97%
rename from src/Ai/Raid/VaultOfArchavon/Strategy/RaidVoAStrategy.cpp
rename to src/Ai/Raid/VoA/VoAStrategy.cpp
index db81477a8..7a87492ff 100644
--- a/src/Ai/Raid/VaultOfArchavon/Strategy/RaidVoAStrategy.cpp
+++ b/src/Ai/Raid/VoA/VoAStrategy.cpp
@@ -1,4 +1,4 @@
-#include "RaidVoAStrategy.h"
+#include "VoAStrategy.h"
 #include "Action.h"
 #include "Strategy.h"
 #include "Trigger.h"
diff --git a/src/Ai/Raid/VaultOfArchavon/Strategy/RaidVoAStrategy.h b/src/Ai/Raid/VoA/VoAStrategy.h
similarity index 100%
rename from src/Ai/Raid/VaultOfArchavon/Strategy/RaidVoAStrategy.h
rename to src/Ai/Raid/VoA/VoAStrategy.h
diff --git a/src/Ai/Raid/VaultOfArchavon/RaidVoATriggerContext.h b/src/Ai/Raid/VoA/VoATriggerContext.h
similarity index 98%
rename from src/Ai/Raid/VaultOfArchavon/RaidVoATriggerContext.h
rename to src/Ai/Raid/VoA/VoATriggerContext.h
index 6cb5e0f38..54f38ecb7 100644
--- a/src/Ai/Raid/VaultOfArchavon/RaidVoATriggerContext.h
+++ b/src/Ai/Raid/VoA/VoATriggerContext.h
@@ -8,7 +8,7 @@
 
 #include "BossAuraTriggers.h"
 #include "NamedObjectContext.h"
-#include "RaidVoATriggers.h"
+#include "VoATriggers.h"
 
 class RaidVoATriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Raid/VaultOfArchavon/Trigger/RaidVoATriggers.cpp b/src/Ai/Raid/VoA/VoATriggers.cpp
similarity index 99%
rename from src/Ai/Raid/VaultOfArchavon/Trigger/RaidVoATriggers.cpp
rename to src/Ai/Raid/VoA/VoATriggers.cpp
index 03a8b9b35..82038aaa8 100644
--- a/src/Ai/Raid/VaultOfArchavon/Trigger/RaidVoATriggers.cpp
+++ b/src/Ai/Raid/VoA/VoATriggers.cpp
@@ -1,4 +1,4 @@
-#include "RaidVoATriggers.h"
+#include "VoATriggers.h"
 
 #include "EventMap.h"
 #include "Object.h"
diff --git a/src/Ai/Raid/VaultOfArchavon/Trigger/RaidVoATriggers.h b/src/Ai/Raid/VoA/VoATriggers.h
similarity index 100%
rename from src/Ai/Raid/VaultOfArchavon/Trigger/RaidVoATriggers.h
rename to src/Ai/Raid/VoA/VoATriggers.h
diff --git a/src/Ai/Raid/ZulAman/RaidZulAmanActionContext.h b/src/Ai/Raid/ZA/ZAActionContext.h
similarity index 99%
rename from src/Ai/Raid/ZulAman/RaidZulAmanActionContext.h
rename to src/Ai/Raid/ZA/ZAActionContext.h
index 852a180b3..fd83a4073 100644
--- a/src/Ai/Raid/ZulAman/RaidZulAmanActionContext.h
+++ b/src/Ai/Raid/ZA/ZAActionContext.h
@@ -6,7 +6,7 @@
 #ifndef _PLAYERBOT_RAIDZULAMANACTIONCONTEXT_H
 #define _PLAYERBOT_RAIDZULAMANACTIONCONTEXT_H
 
-#include "RaidZulAmanActions.h"
+#include "ZAActions.h"
 #include "NamedObjectContext.h"
 
 class RaidZulAmanActionContext : public NamedObjectContext<Action>
diff --git a/src/Ai/Raid/ZulAman/Action/RaidZulAmanActions.cpp b/src/Ai/Raid/ZA/ZAActions.cpp
similarity index 99%
rename from src/Ai/Raid/ZulAman/Action/RaidZulAmanActions.cpp
rename to src/Ai/Raid/ZA/ZAActions.cpp
index 7e6212104..77826da63 100644
--- a/src/Ai/Raid/ZulAman/Action/RaidZulAmanActions.cpp
+++ b/src/Ai/Raid/ZA/ZAActions.cpp
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidZulAmanActions.h"
-#include "RaidZulAmanHelpers.h"
+#include "ZAActions.h"
+#include "ZAHelpers.h"
 #include "Playerbots.h"
 #include "RaidBossHelpers.h"
 
diff --git a/src/Ai/Raid/ZulAman/Action/RaidZulAmanActions.h b/src/Ai/Raid/ZA/ZAActions.h
similarity index 100%
rename from src/Ai/Raid/ZulAman/Action/RaidZulAmanActions.h
rename to src/Ai/Raid/ZA/ZAActions.h
diff --git a/src/Ai/Raid/ZulAman/Util/RaidZulAmanHelpers.cpp b/src/Ai/Raid/ZA/ZAHelpers.cpp
similarity index 99%
rename from src/Ai/Raid/ZulAman/Util/RaidZulAmanHelpers.cpp
rename to src/Ai/Raid/ZA/ZAHelpers.cpp
index eeff879a4..befee71b7 100644
--- a/src/Ai/Raid/ZulAman/Util/RaidZulAmanHelpers.cpp
+++ b/src/Ai/Raid/ZA/ZAHelpers.cpp
@@ -3,7 +3,7 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidZulAmanHelpers.h"
+#include "ZAHelpers.h"
 #include "Group.h"
 #include "Playerbots.h"
 
diff --git a/src/Ai/Raid/ZulAman/Util/RaidZulAmanHelpers.h b/src/Ai/Raid/ZA/ZAHelpers.h
similarity index 100%
rename from src/Ai/Raid/ZulAman/Util/RaidZulAmanHelpers.h
rename to src/Ai/Raid/ZA/ZAHelpers.h
diff --git a/src/Ai/Raid/ZulAman/Multiplier/RaidZulAmanMultipliers.cpp b/src/Ai/Raid/ZA/ZAMultipliers.cpp
similarity index 99%
rename from src/Ai/Raid/ZulAman/Multiplier/RaidZulAmanMultipliers.cpp
rename to src/Ai/Raid/ZA/ZAMultipliers.cpp
index 8a064fead..a637ed62f 100644
--- a/src/Ai/Raid/ZulAman/Multiplier/RaidZulAmanMultipliers.cpp
+++ b/src/Ai/Raid/ZA/ZAMultipliers.cpp
@@ -3,9 +3,9 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidZulAmanMultipliers.h"
-#include "RaidZulAmanActions.h"
-#include "RaidZulAmanHelpers.h"
+#include "ZAMultipliers.h"
+#include "ZAActions.h"
+#include "ZAHelpers.h"
 #include "ChooseTargetActions.h"
 #include "DKActions.h"
 #include "DruidBearActions.h"
diff --git a/src/Ai/Raid/ZulAman/Multiplier/RaidZulAmanMultipliers.h b/src/Ai/Raid/ZA/ZAMultipliers.h
similarity index 100%
rename from src/Ai/Raid/ZulAman/Multiplier/RaidZulAmanMultipliers.h
rename to src/Ai/Raid/ZA/ZAMultipliers.h
diff --git a/src/Ai/Raid/ZulAman/Strategy/RaidZulAmanStrategy.cpp b/src/Ai/Raid/ZA/ZAStrategy.cpp
similarity index 98%
rename from src/Ai/Raid/ZulAman/Strategy/RaidZulAmanStrategy.cpp
rename to src/Ai/Raid/ZA/ZAStrategy.cpp
index 4ba01a2a1..d9de00b21 100644
--- a/src/Ai/Raid/ZulAman/Strategy/RaidZulAmanStrategy.cpp
+++ b/src/Ai/Raid/ZA/ZAStrategy.cpp
@@ -3,8 +3,8 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidZulAmanStrategy.h"
-#include "RaidZulAmanMultipliers.h"
+#include "ZAStrategy.h"
+#include "ZAMultipliers.h"
 
 void RaidZulAmanStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
 {
diff --git a/src/Ai/Raid/ZulAman/Strategy/RaidZulAmanStrategy.h b/src/Ai/Raid/ZA/ZAStrategy.h
similarity index 100%
rename from src/Ai/Raid/ZulAman/Strategy/RaidZulAmanStrategy.h
rename to src/Ai/Raid/ZA/ZAStrategy.h
diff --git a/src/Ai/Raid/ZulAman/RaidZulAmanTriggerContext.h b/src/Ai/Raid/ZA/ZATriggerContext.h
similarity index 99%
rename from src/Ai/Raid/ZulAman/RaidZulAmanTriggerContext.h
rename to src/Ai/Raid/ZA/ZATriggerContext.h
index cb8bac864..15fd30b20 100644
--- a/src/Ai/Raid/ZulAman/RaidZulAmanTriggerContext.h
+++ b/src/Ai/Raid/ZA/ZATriggerContext.h
@@ -6,7 +6,7 @@
 #ifndef _PLAYERBOT_RAIDZULAMANTRIGGERCONTEXT_H
 #define _PLAYERBOT_RAIDZULAMANTRIGGERCONTEXT_H
 
-#include "RaidZulAmanTriggers.h"
+#include "ZATriggers.h"
 #include "NamedObjectContext.h"
 
 class RaidZulAmanTriggerContext : public NamedObjectContext<Trigger>
diff --git a/src/Ai/Raid/ZulAman/Trigger/RaidZulAmanTriggers.cpp b/src/Ai/Raid/ZA/ZATriggers.cpp
similarity index 98%
rename from src/Ai/Raid/ZulAman/Trigger/RaidZulAmanTriggers.cpp
rename to src/Ai/Raid/ZA/ZATriggers.cpp
index 22b072702..60ce03303 100644
--- a/src/Ai/Raid/ZulAman/Trigger/RaidZulAmanTriggers.cpp
+++ b/src/Ai/Raid/ZA/ZATriggers.cpp
@@ -3,9 +3,9 @@
  * and/or modify it under version 3 of the License, or (at your option), any later version.
  */
 
-#include "RaidZulAmanTriggers.h"
-#include "RaidZulAmanHelpers.h"
-#include "RaidZulAmanActions.h"
+#include "ZATriggers.h"
+#include "ZAHelpers.h"
+#include "ZAActions.h"
 #include "Playerbots.h"
 #include "RaidBossHelpers.h"
 
diff --git a/src/Ai/Raid/ZulAman/Trigger/RaidZulAmanTriggers.h b/src/Ai/Raid/ZA/ZATriggers.h
similarity index 100%
rename from src/Ai/Raid/ZulAman/Trigger/RaidZulAmanTriggers.h
rename to src/Ai/Raid/ZA/ZATriggers.h
diff --git a/src/Bot/Engine/BuildSharedActionContexts.cpp b/src/Bot/Engine/BuildSharedActionContexts.cpp
index c2972a68f..901a7f12b 100644
--- a/src/Bot/Engine/BuildSharedActionContexts.cpp
+++ b/src/Bot/Engine/BuildSharedActionContexts.cpp
@@ -2,24 +2,24 @@
 #include "ActionContext.h"
 #include "ChatActionContext.h"
 #include "WorldPacketActionContext.h"
-#include "Ai/Raid/Aq20/RaidAq20ActionContext.h"
-#include "Ai/Raid/MoltenCore/RaidMcActionContext.h"
-#include "Ai/Raid/BlackwingLair/RaidBwlActionContext.h"
-#include "Ai/Raid/Karazhan/RaidKarazhanActionContext.h"
-#include "Ai/Raid/GruulsLair/RaidGruulsLairActionContext.h"
-#include "Ai/Raid/Naxxramas/RaidNaxxActionContext.h"
-#include "Ai/Raid/Magtheridon/RaidMagtheridonActionContext.h"
-#include "Ai/Raid/SerpentshrineCavern/RaidSSCActionContext.h"
-#include "Ai/Raid/TempestKeep/RaidTempestKeepActionContext.h"
-#include "Ai/Raid/HyjalSummit/RaidHyjalSummitActionContext.h"
-#include "Ai/Raid/BlackTemple/RaidBlackTempleActionContext.h"
-#include "Ai/Raid/ZulAman/RaidZulAmanActionContext.h"
-#include "Ai/Raid/ObsidianSanctum/RaidOsActionContext.h"
-#include "Ai/Raid/EyeOfEternity/RaidEoEActionContext.h"
-#include "Ai/Raid/VaultOfArchavon/RaidVoAActionContext.h"
-#include "Ai/Raid/Ulduar/RaidUlduarActionContext.h"
-#include "Ai/Raid/Onyxia/RaidOnyxiaActionContext.h"
-#include "Ai/Raid/ICC/ICCActionContext.h"
+#include "Aq20ActionContext.h"
+#include "MCActionContext.h"
+#include "BWLActionContext.h"
+#include "KaraActionContext.h"
+#include "GruulActionContext.h"
+#include "NaxxActionContext.h"
+#include "MagActionContext.h"
+#include "SSCActionContext.h"
+#include "TKActionContext.h"
+#include "HyjalActionContext.h"
+#include "BTActionContext.h"
+#include "ZAActionContext.h"
+#include "OSActionContext.h"
+#include "EoEActionContext.h"
+#include "VoAActionContext.h"
+#include "UldActionContext.h"
+#include "OnyActionContext.h"
+#include "ICCActionContext.h"
 #include "Ai/Dungeon/TbcDungeonActionContext.h"
 #include "Ai/Dungeon/WotlkDungeonActionContext.h"
 
diff --git a/src/Bot/Engine/BuildSharedTriggerContexts.cpp b/src/Bot/Engine/BuildSharedTriggerContexts.cpp
index 43b59542c..704890524 100644
--- a/src/Bot/Engine/BuildSharedTriggerContexts.cpp
+++ b/src/Bot/Engine/BuildSharedTriggerContexts.cpp
@@ -2,24 +2,24 @@
 #include "TriggerContext.h"
 #include "ChatTriggerContext.h"
 #include "WorldPacketTriggerContext.h"
-#include "Ai/Raid/Aq20/RaidAq20TriggerContext.h"
-#include "Ai/Raid/MoltenCore/RaidMcTriggerContext.h"
-#include "Ai/Raid/BlackwingLair/RaidBwlTriggerContext.h"
-#include "Ai/Raid/Karazhan/RaidKarazhanTriggerContext.h"
-#include "Ai/Raid/GruulsLair/RaidGruulsLairTriggerContext.h"
-#include "Ai/Raid/Magtheridon/RaidMagtheridonTriggerContext.h"
-#include "Ai/Raid/Naxxramas/RaidNaxxTriggerContext.h"
-#include "Ai/Raid/SerpentshrineCavern/RaidSSCTriggerContext.h"
-#include "Ai/Raid/TempestKeep/RaidTempestKeepTriggerContext.h"
-#include "Ai/Raid/HyjalSummit/RaidHyjalSummitTriggerContext.h"
-#include "Ai/Raid/BlackTemple/RaidBlackTempleTriggerContext.h"
-#include "Ai/Raid/ZulAman/RaidZulAmanTriggerContext.h"
-#include "Ai/Raid/ObsidianSanctum/RaidOsTriggerContext.h"
-#include "Ai/Raid/EyeOfEternity/RaidEoETriggerContext.h"
-#include "Ai/Raid/VaultOfArchavon/RaidVoATriggerContext.h"
-#include "Ai/Raid/Ulduar/RaidUlduarTriggerContext.h"
-#include "Ai/Raid/Onyxia/RaidOnyxiaTriggerContext.h"
-#include "Ai/Raid/ICC/ICCTriggerContext.h"
+#include "Aq20TriggerContext.h"
+#include "MCTriggerContext.h"
+#include "BWLTriggerContext.h"
+#include "KaraTriggerContext.h"
+#include "GruulTriggerContext.h"
+#include "MagTriggerContext.h"
+#include "NaxxTriggerContext.h"
+#include "SSCTriggerContext.h"
+#include "TKTriggerContext.h"
+#include "HyjalTriggerContext.h"
+#include "BTTriggerContext.h"
+#include "ZATriggerContext.h"
+#include "OSTriggerContext.h"
+#include "EoETriggerContext.h"
+#include "VoATriggerContext.h"
+#include "UldTriggerContext.h"
+#include "OnyTriggerContext.h"
+#include "ICCTriggerContext.h"
 #include "Ai/Dungeon/TbcDungeonTriggerContext.h"
 #include "Ai/Dungeon/WotlkDungeonTriggerContext.h"