diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_anetheron.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_archimonde.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_azgalor.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_kazrogal.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_rage_winterchill.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal.h
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjalAI.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjalAI.h
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal_trash.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal_trash.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal_trash.h
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/hyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/hyjal/instance_hyjal.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_epoch.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_infinite.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_infinite.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_mal_ganis.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_meathook.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/boss_salramm.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/culling_of_stratholme.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/culling_of_stratholme.h b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/culling_of_stratholme.h
rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/culling_of_stratholme/instance_culling_of_stratholme.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_aeonus.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_chrono_lord_deja.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_temporus.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/dark_portal.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/dark_portal.h b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/dark_portal.h
rename to src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.h
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/instance_dark_portal.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_captain_skarloc.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_epoch_hunter.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_leutenant_drake.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/instance_old_hillsbrad.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/old_hillsbrad.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/old_hillsbrad.h b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/old_hillsbrad.h
rename to src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
diff --git a/src/server/scripts/Northrend/AzjolNerub/azjol_nerub/azjol_nerub.h b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
similarity index 100%
rename from src/server/scripts/Northrend/AzjolNerub/azjol_nerub/azjol_nerub.h
rename to src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
diff --git a/src/server/scripts/Northrend/AzjolNerub/azjol_nerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
similarity index 100%
rename from src/server/scripts/Northrend/AzjolNerub/azjol_nerub/boss_anubarak.cpp
rename to src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
diff --git a/src/server/scripts/Northrend/AzjolNerub/azjol_nerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
similarity index 100%
rename from src/server/scripts/Northrend/AzjolNerub/azjol_nerub/boss_hadronox.cpp
rename to src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
diff --git a/src/server/scripts/Northrend/AzjolNerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
similarity index 100%
rename from src/server/scripts/Northrend/AzjolNerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
rename to src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
diff --git a/src/server/scripts/Northrend/AzjolNerub/azjol_nerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
similarity index 100%
rename from src/server/scripts/Northrend/AzjolNerub/azjol_nerub/instance_azjol_nerub.cpp
rename to src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
similarity index 100%
rename from src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/boss_argent_challenge.cpp
rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
similarity index 100%
rename from src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/boss_black_knight.cpp
rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
similarity index 100%
rename from src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/boss_grand_champions.cpp
rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
similarity index 100%
rename from src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/instance_trial_of_the_champion.cpp
rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
similarity index 100%
rename from src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/trial_of_the_champion.cpp
rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/trial_of_the_champion.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
similarity index 100%
rename from src/server/scripts/Northrend/CrusadersColiseum/trial_of_the_champion/trial_of_the_champion.h
rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
diff --git a/src/server/scripts/Northrend/FrozenHalls/forge_of_souls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/forge_of_souls/boss_bronjahm.cpp
rename to src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/forge_of_souls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/forge_of_souls/boss_devourer_of_souls.cpp
rename to src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/forge_of_souls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/forge_of_souls/forge_of_souls.cpp
rename to src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/forge_of_souls/forge_of_souls.h b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/forge_of_souls/forge_of_souls.h
rename to src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
diff --git a/src/server/scripts/Northrend/FrozenHalls/forge_of_souls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/forge_of_souls/instance_forge_of_souls.cpp
rename to src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/boss_falric.cpp
rename to src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/boss_marwyn.cpp
rename to src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/halls_of_reflection.cpp
rename to src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/halls_of_reflection.h
rename to src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
diff --git a/src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/halls_of_reflection/instance_halls_of_reflection.cpp
rename to src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/pit_of_saron/boss_forgemaster_garfrost.cpp
rename to src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/pit_of_saron/boss_krickandick.cpp
rename to src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/pit_of_saron/boss_scourgelord_tyrannus.cpp
rename to src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/pit_of_saron/instance_pit_of_saron.cpp
rename to src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/pit_of_saron/pit_of_saron.cpp
rename to src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/pit_of_saron/pit_of_saron.h b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/pit_of_saron/pit_of_saron.h
rename to src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
diff --git a/src/server/scripts/Northrend/TheNexus/eye_of_eternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
similarity index 100%
rename from src/server/scripts/Northrend/TheNexus/eye_of_eternity/boss_malygos.cpp
rename to src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
diff --git a/src/server/scripts/Northrend/TheNexus/eye_of_eternity/eye_of_eternity.h b/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
similarity index 100%
rename from src/server/scripts/Northrend/TheNexus/eye_of_eternity/eye_of_eternity.h
rename to src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
diff --git a/src/server/scripts/Northrend/TheNexus/eye_of_eternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
similarity index 100%
rename from src/server/scripts/Northrend/TheNexus/eye_of_eternity/instance_eye_of_eternity.cpp
rename to src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
diff --git a/src/server/scripts/Northrend/TheNexus/nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
similarity index 100%
rename from src/server/scripts/Northrend/TheNexus/nexus/boss_anomalus.cpp
rename to src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
diff --git a/src/server/scripts/Northrend/TheNexus/nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
similarity index 100%
rename from src/server/scripts/Northrend/TheNexus/nexus/boss_keristrasza.cpp
rename to src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
diff --git a/src/server/scripts/Northrend/TheNexus/nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
similarity index 100%
rename from src/server/scripts/Northrend/TheNexus/nexus/boss_magus_telestra.cpp
rename to src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
diff --git a/src/server/scripts/Northrend/TheNexus/nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
similarity index 100%
rename from src/server/scripts/Northrend/TheNexus/nexus/boss_ormorok.cpp
rename to src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
diff --git a/src/server/scripts/Northrend/TheNexus/nexus/commander_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp
similarity index 100%
rename from src/server/scripts/Northrend/TheNexus/nexus/commander_kolurg.cpp
rename to src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp
diff --git a/src/server/scripts/Northrend/TheNexus/nexus/commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp
similarity index 100%
rename from src/server/scripts/Northrend/TheNexus/nexus/commander_stoutbeard.cpp
rename to src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp
diff --git a/src/server/scripts/Northrend/TheNexus/nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
similarity index 100%
rename from src/server/scripts/Northrend/TheNexus/nexus/instance_nexus.cpp
rename to src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
diff --git a/src/server/scripts/Northrend/TheNexus/nexus/nexus.h b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h
similarity index 100%
rename from src/server/scripts/Northrend/TheNexus/nexus/nexus.h
rename to src/server/scripts/Northrend/Nexus/Nexus/nexus.h
diff --git a/src/server/scripts/Northrend/TheNexus/oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
similarity index 100%
rename from src/server/scripts/Northrend/TheNexus/oculus/boss_drakos.cpp
rename to src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
diff --git a/src/server/scripts/Northrend/TheNexus/oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
similarity index 100%
rename from src/server/scripts/Northrend/TheNexus/oculus/boss_eregos.cpp
rename to src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
diff --git a/src/server/scripts/Northrend/TheNexus/oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
similarity index 100%
rename from src/server/scripts/Northrend/TheNexus/oculus/boss_urom.cpp
rename to src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
diff --git a/src/server/scripts/Northrend/TheNexus/oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
similarity index 100%
rename from src/server/scripts/Northrend/TheNexus/oculus/boss_varos.cpp
rename to src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
diff --git a/src/server/scripts/Northrend/TheNexus/oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
similarity index 100%
rename from src/server/scripts/Northrend/TheNexus/oculus/instance_oculus.cpp
rename to src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
diff --git a/src/server/scripts/Northrend/TheNexus/oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
similarity index 100%
rename from src/server/scripts/Northrend/TheNexus/oculus/oculus.cpp
rename to src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
diff --git a/src/server/scripts/Northrend/TheNexus/oculus/oculus.h b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h
similarity index 100%
rename from src/server/scripts/Northrend/TheNexus/oculus/oculus.h
rename to src/server/scripts/Northrend/Nexus/Oculus/oculus.h
diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_bjarngrim.cpp
rename to src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_ionar.cpp
rename to src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_loken.cpp
rename to src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/halls_of_lightning/boss_volkhan.cpp
rename to src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_lightning/halls_of_lightning.h b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/halls_of_lightning/halls_of_lightning.h
rename to src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_lightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/halls_of_lightning/instance_halls_of_lightning.cpp
rename to src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_stone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/halls_of_stone/boss_krystallus.cpp
rename to src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_stone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/halls_of_stone/boss_maiden_of_grief.cpp
rename to src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_stone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/halls_of_stone/boss_sjonnir.cpp
rename to src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_stone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/halls_of_stone/halls_of_stone.cpp
rename to src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_stone/halls_of_stone.h b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/halls_of_stone/halls_of_stone.h
rename to src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
diff --git a/src/server/scripts/Northrend/Ulduar/halls_of_stone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/halls_of_stone/instance_halls_of_stone.cpp
rename to src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/boss_ingvar_the_plunderer.cpp
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/boss_keleseth.cpp
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/boss_skarvald_dalronn.cpp
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/instance_utgarde_keep.cpp
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/utgarde_keep.cpp
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/utgarde_keep.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/utgarde_keep/utgarde_keep.h
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_palehoof.cpp
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_skadi.cpp
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_svala.cpp
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/boss_ymiron.cpp
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/instance_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/instance_pinnacle.cpp
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/utgarde_pinnacle.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/utgarde_pinnacle/utgarde_pinnacle.h
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
diff --git a/src/server/scripts/Outland/Auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
rename to src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
rename to src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
rename to src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/mana_tombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/mana_tombs/boss_pandemonius.cpp
rename to src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/sethekk_halls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/sethekk_halls/boss_darkweaver_syth.cpp
rename to src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
rename to src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/sethekk_halls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/sethekk_halls/instance_sethekk_halls.cpp
rename to src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/sethekk_halls/sethekk_halls.h b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/sethekk_halls/sethekk_halls.h
rename to src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
diff --git a/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
rename to src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
rename to src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
rename to src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_murmur.cpp
rename to src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
rename to src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/shadow_labyrinth/shadow_labyrinth.h b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/shadow_labyrinth/shadow_labyrinth.h
rename to src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
diff --git a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_fathomlord_karathress.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_hydross_the_unstable.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_lady_vashj.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_leotheras_the_blind.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_lurker_below.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_morogrim_tidewalker.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/instance_serpent_shrine.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/serpent_shrine.h b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/serpent_shrine.h
rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
diff --git a/src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_hydromancer_thespia.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_mekgineer_steamrigger.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_warlord_kalithresh.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/steam_vault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/steam_vault/instance_steam_vault.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/steam_vault/steam_vault.h b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/steam_vault/steam_vault.h
rename to src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
diff --git a/src/server/scripts/Outland/HellfireCitadel/blood_furnace/blood_furnace.h b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/blood_furnace/blood_furnace.h
rename to src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
diff --git a/src/server/scripts/Outland/HellfireCitadel/blood_furnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/blood_furnace/boss_broggok.cpp
rename to src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/blood_furnace/boss_kelidan_the_breaker.cpp
rename to src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/blood_furnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/blood_furnace/boss_the_maker.cpp
rename to src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/blood_furnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/blood_furnace/instance_blood_furnace.cpp
rename to src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_omor_the_unscarred.cpp
rename to src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_vazruden_the_herald.cpp
rename to src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp
rename to src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/hellfire_ramparts.h b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/hellfire_ramparts.h
rename to src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
diff --git a/src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/instance_hellfire_ramparts.cpp
rename to src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/magtheridons_lair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/magtheridons_lair/boss_magtheridon.cpp
rename to src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/magtheridons_lair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/magtheridons_lair/instance_magtheridons_lair.cpp
rename to src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/magtheridons_lair/magtheridons_lair.h b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/magtheridons_lair/magtheridons_lair.h
rename to src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
diff --git a/src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_nethekurse.cpp
rename to src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_warbringer_omrogg.cpp
rename to src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
rename to src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/shattered_halls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/shattered_halls/instance_shattered_halls.cpp
rename to src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/shattered_halls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/shattered_halls/shattered_halls.h
rename to src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
diff --git a/src/server/scripts/Outland/TempestKeep/the_eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/the_eye/boss_alar.cpp
rename to src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/the_eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/the_eye/boss_astromancer.cpp
rename to src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/the_eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/the_eye/boss_kaelthas.cpp
rename to src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/the_eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/the_eye/boss_void_reaver.cpp
rename to src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/the_eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/the_eye/instance_the_eye.cpp
rename to src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/the_eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/the_eye/the_eye.cpp
rename to src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/the_eye/the_eye.h b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/the_eye/the_eye.h
rename to src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
diff --git a/src/server/scripts/Outland/TempestKeep/the_mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/the_mechanar/boss_gatewatcher_gyrokill.cpp
rename to src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/the_mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/the_mechanar/boss_gatewatcher_ironhand.cpp
rename to src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/the_mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/the_mechanar/boss_nethermancer_sepethrea.cpp
rename to src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/the_mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/the_mechanar/boss_pathaleon_the_calculator.cpp
rename to src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/the_mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/the_mechanar/instance_mechanar.cpp
rename to src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/the_mechanar/mechanar.h b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/the_mechanar/mechanar.h
rename to src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h