595 files changed, 684 insertions, 1854 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 577ed3ea16..fb4f74bb97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ include(CheckIncludeFiles)
 # some utils for cmake
 include(modules/uwd/cmake-utils/utils.cmake)
 
-include(ScriptsMacro)
+include(src/cmake/ac_macros.cmake)
 
 # set default buildoptions and print them
 include(conf/config.cmake.dist)
@@ -80,10 +80,10 @@ if(NOT WITHOUT_GIT)
 endif()
 
 # Find revision ID and hash of the sourcetree
-include(modules/acore/cmake/genrev.cmake)
+include(src/cmake/genrev.cmake)
 
 # print out the results before continuing
-include(modules/acore/cmake/showoptions.cmake)
+include(src/cmake/showoptions.cmake)
 
 # add modules and dependencies
 CU_SUBDIRLIST(sub_DIRS  "${CMAKE_SOURCE_DIR}/modules" FALSE FALSE)
diff --git a/cmake_uninstall.cmake.in b/cmake_uninstall.cmake.in
deleted file mode 100644
index 06f9c8263a..0000000000
--- a/cmake_uninstall.cmake.in
+++ /dev/null
@@ -1,23 +0,0 @@
-# from cmake wiki
-IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-  MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
-ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-
-FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
-STRING(REGEX REPLACE "\n" ";" files "${files}")
-FOREACH(file ${files})
-  MESSAGE(STATUS "Uninstalling \"${file}\"")
-  IF(EXISTS "${file}")
-    EXEC_PROGRAM(
-      "@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
-      OUTPUT_VARIABLE rm_out
-      RETURN_VALUE rm_retval
-      )
-    IF("${rm_retval}" STREQUAL 0)
-    ELSE("${rm_retval}" STREQUAL 0)
-      MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
-    ENDIF("${rm_retval}" STREQUAL 0)
-  ELSE(EXISTS "${file}")
-    MESSAGE(STATUS "File \"${file}\" does not exist.")
-  ENDIF(EXISTS "${file}")
-ENDFOREACH(file)
diff --git a/config.h.cmake b/config.h.cmake
deleted file mode 100644
index b017c891b8..0000000000
--- a/config.h.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef HAVE_CONFIG_H
-#define HAVE_CONFIG_H
-
-#cmakedefine HAVE_ACE_STACK_TRACE_H
-
-#cmakedefine USE_MULTI_THREAD_MAP
-
-#endif /* HAVE_CONFIG_H */
diff --git a/modules/acore/CMakeLists.txt b/modules/acore/CMakeLists.txt
index bdc17a43fe..558ef6ba6a 100644
--- a/modules/acore/CMakeLists.txt
+++ b/modules/acore/CMakeLists.txt
@@ -1,12 +1,10 @@
 CU_RUN_HOOK("BEFORE_ACORE_LOAD")
 
 add_subdirectory(deps)
-add_subdirectory(genrev)
 
 if( SERVERS )
   add_subdirectory(framework)
   add_subdirectory(world-engine/collision)
-  add_subdirectory(scripts-wotlk)
 else()
   if( TOOLS )
     add_subdirectory(extractors)
diff --git a/modules/acore/cmake/stack_direction.c b/modules/acore/cmake/stack_direction.c
deleted file mode 100644
index 11bcf803bf..0000000000
--- a/modules/acore/cmake/stack_direction.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (C) 2009 Sun Microsystems, Inc
- 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
-
-/* Check stack direction (0-down, 1-up) */
-int f(int *a) 
-{
-  int b;
-  return(&b > a)?1:0; 
-}
-/*
- Prevent compiler optimizations by calling function 
- through pointer.
-*/
-volatile int (*ptr_f)(int *) = f;
-int main() 
-{
-  int a;
-  return ptr_f(&a);
-}
\ No newline at end of file
diff --git a/modules/acore/scripts-wotlk/CMakeLists.txt b/modules/acore/scripts-wotlk/CMakeLists.txt
deleted file mode 100644
index 65599b6ba3..0000000000
--- a/modules/acore/scripts-wotlk/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-CU_SET_PATH("CMAKE_AC_MODULE_DIR" "${CMAKE_CURRENT_LIST_DIR}")
-
-if(SCRIPTS)
-  include(World/CMakeLists.txt)
-  include(OutdoorPvP/CMakeLists.txt)
-  include(EasternKingdoms/CMakeLists.txt)
-  include(Kalimdor/CMakeLists.txt)
-  include(Outland/CMakeLists.txt)
-  include(Northrend/CMakeLists.txt)
-  include(Events/CMakeLists.txt)
-  include(Pet/CMakeLists.txt)
-
-  if(EXISTS "Custom/CMakeLists.txt")
-	include(Custom/CMakeLists.txt)
-  endif()
-  
-  AC_ADD_SCRIPT("${scripts_STAT_SRCS}")
-endif()
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/CMakeLists.txt b/modules/acore/scripts-wotlk/EasternKingdoms/CMakeLists.txt
deleted file mode 100644
index 9f2f8fd1a1..0000000000
--- a/modules/acore/scripts-wotlk/EasternKingdoms/CMakeLists.txt
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright (C) 
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-set(scripts_STAT_SRCS
-  ${scripts_STAT_SRCS}
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_ghostlands.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_eversong_woods.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/AlteracValley/boss_galvangar.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/AlteracValley/boss_balinda.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/AlteracValley/boss_drekthar.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/AlteracValley/boss_vanndar.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/AlteracValley/alterac_valley.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Scholomance/scholomance.h
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Scholomance/instance_scholomance.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_isle_of_queldanas.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulGurub/boss_hakkar.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulGurub/boss_mandokir.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulGurub/boss_marli.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulGurub/boss_jeklik.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulGurub/boss_grilek.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulGurub/zulgurub.h
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulGurub/boss_renataki.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulGurub/boss_arlokk.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulGurub/boss_venoxis.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulGurub/boss_jindo.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulGurub/boss_thekal.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_wetlands.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_arathi_highlands.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_redridge_mountains.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_ironforge.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ScarletEnclave/chapter2.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ScarletEnclave/chapter5.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ScarletEnclave/chapter1.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_eastern_plaguelands.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Stratholme/instance_stratholme.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Stratholme/stratholme.h
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_tirisfal_glades.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/SunkenTemple/sunken_temple.h
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/MagistersTerrace/magisters_terrace.h
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Uldaman/uldaman.h
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Uldaman/instance_uldaman.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_swamp_of_sorrows.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/SunwellPlateau/boss_muru.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_stranglethorn_vale.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Deadmines/boss_mr_smite.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Deadmines/instance_deadmines.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Deadmines/deadmines.h
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_duskwood.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_undercity.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_loch_modan.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_burning_steppes.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_blasted_lands.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_stormwind_city.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulAman/boss_halazzi.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulAman/boss_hexlord.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulAman/boss_zuljin.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulAman/boss_akilzon.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulAman/instance_zulaman.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulAman/boss_janalai.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulAman/boss_nalorakk.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulAman/zulaman.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/ZulAman/zulaman.h
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_hinterlands.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_western_plaguelands.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_alterac_mountains.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_westfall.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/zone_silverpine_forest.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Karazhan/instance_karazhan.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Karazhan/boss_nightbane.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Karazhan/karazhan.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Karazhan/boss_curator.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Karazhan/boss_netherspite.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Karazhan/boss_midnight.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Karazhan/bosses_opera.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Karazhan/boss_moroes.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/Karazhan/karazhan.h
-  ${CMAKE_AC_MODULE_DIR}/EasternKingdoms/TheStockade/instance_the_stockade.cpp
-)
-
-AC_ADD_SCRIPT_LOADER("EasternKingdoms" "${CMAKE_AC_MODULE_DIR}/ScriptWotlkLoader.h")
-
-message("  -> Prepared: Eastern Kingdoms")
diff --git a/modules/acore/scripts-wotlk/Events/CMakeLists.txt b/modules/acore/scripts-wotlk/Events/CMakeLists.txt
deleted file mode 100644
index 6874e47e65..0000000000
--- a/modules/acore/scripts-wotlk/Events/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-set(scripts_STAT_SRCS
-  ${scripts_STAT_SRCS}
-  ${CMAKE_AC_MODULE_DIR}/Events/brewfest.cpp
-  ${CMAKE_AC_MODULE_DIR}/Events/childrens_week.cpp
-  ${CMAKE_AC_MODULE_DIR}/Events/hallows_end.cpp
-  ${CMAKE_AC_MODULE_DIR}/Events/pilgrims_bounty.cpp
-  ${CMAKE_AC_MODULE_DIR}/Events/winter_veil.cpp
-  ${CMAKE_AC_MODULE_DIR}/Events/love_in_air.cpp
-  ${CMAKE_AC_MODULE_DIR}/Events/midsummer.cpp
-)
-
-AC_ADD_SCRIPT_LOADER("Event" "${CMAKE_AC_MODULE_DIR}/ScriptWotlkLoader.h")
-
-message("  -> Prepared: Events")
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CMakeLists.txt b/modules/acore/scripts-wotlk/Kalimdor/CMakeLists.txt
deleted file mode 100644
index dd4753d14d..0000000000
--- a/modules/acore/scripts-wotlk/Kalimdor/CMakeLists.txt
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright (C) 
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-set(scripts_STAT_SRCS
-  ${scripts_STAT_SRCS}
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_stonetalon_mountains.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_silithus.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_moonglade.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/RazorfenDowns/razorfen_downs.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/RazorfenDowns/razorfen_downs.h
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/ZulFarrak/zulfarrak.h
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_azuremyst_isle.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_orgrimmar.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_desolace.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_feralas.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/Maraudon/instance_maraudon.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/Maraudon/maraudon.h
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_darkshore.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_mulgore.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_bloodmyst_isle.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_thunder_bluff.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_azshara.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_the_barrens.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_ungoro_crater.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/WailingCaverns/wailing_caverns.h
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_durotar.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_felwood.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/boss_azuregos.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_tanaris.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_dustwallow_marsh.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_winterspring.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_thousand_needles.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_ashenvale.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/zone_teldrassil.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/OnyxiasLair/boss_onyxia.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/OnyxiasLair/onyxias_lair.h
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/DireMaul/instance_dire_maul.cpp
-  ${CMAKE_AC_MODULE_DIR}/Kalimdor/DireMaul/dire_maul.h
-)
-
-AC_ADD_SCRIPT_LOADER("Kalimdor" "${CMAKE_AC_MODULE_DIR}/ScriptWotlkLoader.h")
-
-message("  -> Prepared: Kalimdor")
diff --git a/modules/acore/scripts-wotlk/Northrend/CMakeLists.txt b/modules/acore/scripts-wotlk/Northrend/CMakeLists.txt
deleted file mode 100644
index c2bda59df3..0000000000
--- a/modules/acore/scripts-wotlk/Northrend/CMakeLists.txt
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright (C) 
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-set(scripts_STAT_SRCS
-  ${scripts_STAT_SRCS}
-  ${CMAKE_AC_MODULE_DIR}/Northrend/isle_of_conquest.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/zone_storm_peaks.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/Ulduar/ulduar.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/Ulduar/boss_thorim.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/Ulduar/boss_ignis.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/Ulduar/boss_hodir.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/Ulduar/boss_xt002.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/Ulduar/ulduar.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/Ulduar/boss_freya.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Nexus/Oculus/boss_eregos.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Nexus/Oculus/boss_drakos.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Nexus/Oculus/oculus.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Nexus/Oculus/boss_varos.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Nexus/Oculus/boss_urom.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Nexus/Oculus/oculus.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Nexus/Oculus/instance_oculus.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Nexus/Nexus/boss_ormorok.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Nexus/Nexus/instance_nexus.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Nexus/Nexus/boss_keristrasza.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Nexus/Nexus/boss_anomalus.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Nexus/Nexus/nexus.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Naxxramas/boss_loatheb.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Naxxramas/boss_anubrekhan.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Naxxramas/boss_maexxna.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Naxxramas/boss_patchwerk.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Naxxramas/boss_gothik.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Naxxramas/boss_faerlina.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Naxxramas/boss_gluth.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Naxxramas/boss_four_horsemen.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Naxxramas/naxxramas.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Naxxramas/boss_kelthuzad.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Naxxramas/boss_heigan.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Naxxramas/boss_thaddius.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Naxxramas/boss_razuvious.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Naxxramas/boss_sapphiron.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Naxxramas/instance_naxxramas.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Naxxramas/boss_grobbulus.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Naxxramas/boss_noth.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/zone_crystalsong_forest.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/VaultOfArchavon/boss_archavon.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/VaultOfArchavon/boss_koralon.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/VaultOfArchavon/vault_of_archavon.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/VaultOfArchavon/boss_emalon.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/VaultOfArchavon/boss_toravon.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/zone_sholazar_basin.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/zone_dragonblight.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/zone_grizzly_hills.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/AzjolNerub/ahnkahet/ahnkahet.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/VioletHold/boss_zuramat.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/VioletHold/instance_violet_hold.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/VioletHold/boss_lavanthor.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/VioletHold/boss_cyanigosa.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/VioletHold/violet_hold.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/VioletHold/boss_ichoron.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/VioletHold/boss_moragg.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/VioletHold/boss_xevozz.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/VioletHold/boss_erekem.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/VioletHold/violet_hold.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/IcecrownCitadel/icecrown_citadel.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/IcecrownCitadel/icecrown_citadel.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/IcecrownCitadel/boss_festergut.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/IcecrownCitadel/boss_rotface.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/IcecrownCitadel/boss_sindragosa.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/zone_zuldrak.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/zone_wintergrasp.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/zone_icecrown.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Gundrak/boss_slad_ran.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Gundrak/instance_gundrak.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Gundrak/boss_drakkari_colossus.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Gundrak/gundrak.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Gundrak/boss_gal_darah.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Gundrak/boss_moorabi.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/Gundrak/boss_eck.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/zone_borean_tundra.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/zone_howling_fjord.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/zone_dalaran.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/DraktharonKeep/boss_trollgore.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/DraktharonKeep/boss_novos.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/DraktharonKeep/drak_tharon_keep.h
-  ${CMAKE_AC_MODULE_DIR}/Northrend/DraktharonKeep/boss_tharon_ja.cpp
-  ${CMAKE_AC_MODULE_DIR}/Northrend/DraktharonKeep/boss_dred.cpp
-)
-
-AC_ADD_SCRIPT_LOADER("Northrend" "${CMAKE_AC_MODULE_DIR}/ScriptWotlkLoader.h")
-
-message("  -> Prepared: Northrend")
diff --git a/modules/acore/scripts-wotlk/OutdoorPvP/CMakeLists.txt b/modules/acore/scripts-wotlk/OutdoorPvP/CMakeLists.txt
deleted file mode 100644
index d038096e7e..0000000000
--- a/modules/acore/scripts-wotlk/OutdoorPvP/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (C) 
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-set(scripts_STAT_SRCS
-  ${scripts_STAT_SRCS}
-  ${CMAKE_AC_MODULE_DIR}/OutdoorPvP/OutdoorPvPTF.cpp
-  ${CMAKE_AC_MODULE_DIR}/OutdoorPvP/OutdoorPvPSI.cpp
-  ${CMAKE_AC_MODULE_DIR}/OutdoorPvP/OutdoorPvPSI.h
-  ${CMAKE_AC_MODULE_DIR}/OutdoorPvP/OutdoorPvPZM.cpp
-  ${CMAKE_AC_MODULE_DIR}/OutdoorPvP/OutdoorPvPNA.cpp
-  ${CMAKE_AC_MODULE_DIR}/OutdoorPvP/OutdoorPvPHP.cpp
-  ${CMAKE_AC_MODULE_DIR}/OutdoorPvP/OutdoorPvPTF.h
-  ${CMAKE_AC_MODULE_DIR}/OutdoorPvP/OutdoorPvPEP.h
-  ${CMAKE_AC_MODULE_DIR}/OutdoorPvP/OutdoorPvPEP.cpp
-  ${CMAKE_AC_MODULE_DIR}/OutdoorPvP/OutdoorPvPHP.h
-  ${CMAKE_AC_MODULE_DIR}/OutdoorPvP/OutdoorPvPZM.h
-  ${CMAKE_AC_MODULE_DIR}/OutdoorPvP/OutdoorPvPNA.h
-  ${CMAKE_AC_MODULE_DIR}/OutdoorPvP/OutdoorPvPGH.cpp
-  ${CMAKE_AC_MODULE_DIR}/OutdoorPvP/OutdoorPvPGH.h
-)
-
-AC_ADD_SCRIPT_LOADER("OutdoorPvP" "${CMAKE_AC_MODULE_DIR}/ScriptWotlkLoader.h")
-
-message("  -> Prepared: Outdoor PVP Zones")
diff --git a/modules/acore/scripts-wotlk/Outland/CMakeLists.txt b/modules/acore/scripts-wotlk/Outland/CMakeLists.txt
deleted file mode 100644
index e7d3843cf9..0000000000
--- a/modules/acore/scripts-wotlk/Outland/CMakeLists.txt
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright (C) 
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-set(scripts_STAT_SRCS
-  ${scripts_STAT_SRCS}
-  ${CMAKE_AC_MODULE_DIR}/Outland/zone_nagrand.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
-  ${CMAKE_AC_MODULE_DIR}/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
-  ${CMAKE_AC_MODULE_DIR}/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
-  ${CMAKE_AC_MODULE_DIR}/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
-  ${CMAKE_AC_MODULE_DIR}/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/CoilfangReservoir/SteamVault/steam_vault.h
-  ${CMAKE_AC_MODULE_DIR}/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
-  ${CMAKE_AC_MODULE_DIR}/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/zone_shattrath_city.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/Mechanar/mechanar.h
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/Eye/the_eye.h
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/Eye/instance_the_eye.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/Eye/boss_void_reaver.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/Eye/boss_astromancer.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/Eye/boss_alar.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/Eye/boss_kaelthas.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/botanica/the_botanica.h
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/botanica/instance_the_botanica.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/botanica/boss_laj.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/arcatraz/arcatraz.h
-  ${CMAKE_AC_MODULE_DIR}/Outland/TempestKeep/arcatraz/arcatraz.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
-  ${CMAKE_AC_MODULE_DIR}/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
-  ${CMAKE_AC_MODULE_DIR}/Outland/boss_doomwalker.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/zone_terokkar_forest.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/zone_hellfire_peninsula.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/boss_doomlord_kazzak.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/BlackTemple/boss_teron_gorefiend.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/BlackTemple/black_temple.h
-  ${CMAKE_AC_MODULE_DIR}/Outland/BlackTemple/illidari_council.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/BlackTemple/boss_shade_of_akama.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/BlackTemple/boss_supremus.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/BlackTemple/boss_mother_shahraz.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/BlackTemple/instance_black_temple.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/BlackTemple/boss_reliquary_of_souls.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/BlackTemple/boss_warlord_najentus.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/BlackTemple/boss_bloodboil.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/BlackTemple/boss_illidan.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/zone_shadowmoon_valley.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/zone_blades_edge_mountains.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/GruulsLair/boss_high_king_maulgar.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/GruulsLair/boss_gruul.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/GruulsLair/gruuls_lair.h
-  ${CMAKE_AC_MODULE_DIR}/Outland/GruulsLair/instance_gruuls_lair.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/zone_netherstorm.cpp
-  ${CMAKE_AC_MODULE_DIR}/Outland/zone_zangarmarsh.cpp
-)
-
-AC_ADD_SCRIPT_LOADER("Outland" "${CMAKE_AC_MODULE_DIR}/ScriptWotlkLoader.h")
-
-message("  -> Prepared: Outland")
diff --git a/modules/acore/scripts-wotlk/ScriptWotlkLoader.cpp b/modules/acore/scripts-wotlk/ScriptWotlkLoader.cpp
deleted file mode 100644
index 48a221537d..0000000000
--- a/modules/acore/scripts-wotlk/ScriptWotlkLoader.cpp
+++ /dev/null
@@ -1,1072 +0,0 @@
-/*
- * Copyright (C)
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ScriptWotlkLoader.h"
-#include "ScriptMgr.h"
-
-#ifdef SCRIPTS
-//world
-void AddSC_areatrigger_scripts();
-void AddSC_emerald_dragons();
-void AddSC_generic_creature();
-void AddSC_go_scripts();
-void AddSC_guards();
-void AddSC_item_scripts();
-void AddSC_npc_professions();
-void AddSC_npc_innkeeper();
-void AddSC_npcs_special();
-void AddSC_npc_taxi();
-void AddSC_achievement_scripts();
-
-//events
-void AddSC_event_brewfest_scripts();
-void AddSC_event_hallows_end_scripts();
-void AddSC_event_pilgrims_end_scripts();
-void AddSC_event_winter_veil_scripts();
-void AddSC_event_love_in_the_air();
-void AddSC_event_midsummer_scripts();
-void AddSC_event_childrens_week();
-
-//eastern kingdoms
-void AddSC_alterac_valley();                 //Alterac Valley
-void AddSC_boss_balinda();
-void AddSC_boss_drekthar();
-void AddSC_boss_galvangar();
-void AddSC_boss_vanndar();
-void AddSC_blackrock_depths();               //Blackrock Depths
-void AddSC_boss_ambassador_flamelash();
-void AddSC_boss_anubshiah();
-void AddSC_boss_draganthaurissan();
-void AddSC_boss_general_angerforge();
-void AddSC_boss_gorosh_the_dervish();
-void AddSC_boss_grizzle();
-void AddSC_boss_high_interrogator_gerstahn();
-void AddSC_boss_magmus();
-void AddSC_boss_moira_bronzebeard();
-void AddSC_boss_tomb_of_seven();
-void AddSC_instance_blackrock_depths();
-void AddSC_boss_drakkisath();                //Blackrock Spire
-void AddSC_boss_halycon();
-void AddSC_boss_highlordomokk();
-void AddSC_boss_mothersmolderweb();
-void AddSC_boss_overlordwyrmthalak();
-void AddSC_boss_shadowvosh();
-void AddSC_boss_thebeast();
-void AddSC_boss_warmastervoone();
-void AddSC_boss_quatermasterzigris();
-void AddSC_boss_pyroguard_emberseer();
-void AddSC_boss_gyth();
-void AddSC_boss_rend_blackhand();
-void AddSC_boss_urok_doomhowl();
-void AddSC_boss_gizrul_the_slavener();
-void AddSC_instance_blackrock_spire();
-void AddSC_boss_razorgore();                 //Blackwing lair
-void AddSC_boss_vaelastrasz();
-void AddSC_boss_broodlord();
-void AddSC_boss_firemaw();
-void AddSC_boss_ebonroc();
-void AddSC_boss_flamegor();
-void AddSC_boss_chromaggus();
-void AddSC_boss_nefarian();
-void AddSC_instance_blackwing_lair();
-void AddSC_boss_mr_smite();
-void AddSC_instance_deadmines();             //Deadmines
-void AddSC_instance_gnomeregan();            //Gnomeregan
-void AddSC_instance_karazhan();              //Karazhan
-void AddSC_boss_servant_quarters();
-void AddSC_boss_attumen();
-void AddSC_boss_curator();
-void AddSC_boss_maiden_of_virtue();
-void AddSC_boss_shade_of_aran();
-void AddSC_boss_malchezaar();
-void AddSC_boss_terestian_illhoof();
-void AddSC_boss_moroes();
-void AddSC_bosses_opera();
-void AddSC_boss_netherspite();
-void AddSC_karazhan();
-void AddSC_boss_nightbane();
-void AddSC_boss_felblood_kaelthas();         // Magister's Terrace
-void AddSC_boss_selin_fireheart();
-void AddSC_boss_vexallus();
-void AddSC_boss_priestess_delrissa();
-void AddSC_instance_magisters_terrace();
-void AddSC_boss_lucifron();                  //Molten core
-void AddSC_boss_magmadar();
-void AddSC_boss_gehennas();
-void AddSC_boss_garr();
-void AddSC_boss_baron_geddon();
-void AddSC_boss_shazzrah();
-void AddSC_boss_golemagg();
-void AddSC_boss_sulfuron();
-void AddSC_boss_majordomo();
-void AddSC_boss_ragnaros();
-void AddSC_instance_molten_core();
-void AddSC_the_scarlet_enclave();            //Scarlet Enclave
-void AddSC_the_scarlet_enclave_c1();
-void AddSC_the_scarlet_enclave_c2();
-void AddSC_the_scarlet_enclave_c5();
-void AddSC_instance_scarlet_monastery();     //Scarlet Monastery
-void AddSC_boss_kirtonos_the_herald();
-void AddSC_instance_scholomance();           //Scholomance
-void AddSC_instance_shadowfang_keep();       //Shadowfang keep
-void AddSC_instance_stratholme();            //Stratholme
-void AddSC_instance_sunken_temple();         //Sunken Temple
-void AddSC_instance_sunwell_plateau();       //Sunwell Plateau
-void AddSC_boss_kalecgos();
-void AddSC_boss_brutallus();
-void AddSC_boss_felmyst();
-void AddSC_boss_eredar_twins();
-void AddSC_boss_muru();
-void AddSC_boss_kiljaeden();
-void AddSC_instance_the_stockade();          //The Stockade
-void AddSC_instance_uldaman();               //Uldaman
-void AddSC_boss_akilzon();                   //Zul'Aman
-void AddSC_boss_halazzi();
-void AddSC_boss_hex_lord_malacrass();
-void AddSC_boss_janalai();
-void AddSC_boss_nalorakk();
-void AddSC_boss_zuljin();
-void AddSC_instance_zulaman();
-void AddSC_zulaman();
-void AddSC_boss_jeklik();                    //Zul'Gurub
-void AddSC_boss_venoxis();
-void AddSC_boss_marli();
-void AddSC_boss_mandokir();
-void AddSC_boss_gahzranka();
-void AddSC_boss_thekal();
-void AddSC_boss_arlokk();
-void AddSC_boss_jindo();
-void AddSC_boss_hakkar();
-void AddSC_boss_grilek();
-void AddSC_boss_hazzarah();
-void AddSC_boss_renataki();
-void AddSC_boss_wushoolay();
-void AddSC_instance_zulgurub();
-
-//void AddSC_alterac_mountains();
-void AddSC_arathi_highlands();
-void AddSC_blasted_lands();
-void AddSC_burning_steppes();
-void AddSC_duskwood();
-void AddSC_eastern_plaguelands();
-void AddSC_eversong_woods();
-void AddSC_ghostlands();
-void AddSC_hinterlands();
-void AddSC_ironforge();
-void AddSC_isle_of_queldanas();
-void AddSC_loch_modan();
-void AddSC_redridge_mountains();
-void AddSC_silverpine_forest();
-void AddSC_stormwind_city();
-void AddSC_stranglethorn_vale();
-void AddSC_swamp_of_sorrows();
-void AddSC_tirisfal_glades();
-void AddSC_undercity();
-void AddSC_western_plaguelands();
-void AddSC_westfall();
-void AddSC_wetlands();
-
-//kalimdor
-void AddSC_instance_blackfathom_deeps();     //Blackfathom Depths
-void AddSC_hyjal();                          //CoT Battle for Mt. Hyjal
-void AddSC_boss_archimonde();
-void AddSC_instance_mount_hyjal();
-void AddSC_hyjal_trash();
-void AddSC_boss_rage_winterchill();
-void AddSC_boss_anetheron();
-void AddSC_boss_kazrogal();
-void AddSC_boss_azgalor();
-void AddSC_boss_captain_skarloc();           //CoT Old Hillsbrad
-void AddSC_boss_epoch_hunter();
-void AddSC_boss_lieutenant_drake();
-void AddSC_instance_old_hillsbrad();
-void AddSC_old_hillsbrad();
-void AddSC_boss_aeonus();                    //CoT The Dark Portal
-void AddSC_boss_chrono_lord_deja();
-void AddSC_boss_temporus();
-void AddSC_the_black_morass();
-void AddSC_instance_the_black_morass();
-void AddSC_boss_epoch();                     //CoT Culling Of Stratholme
-void AddSC_boss_infinite_corruptor();
-void AddSC_boss_salramm();
-void AddSC_boss_mal_ganis();
-void AddSC_boss_meathook();
-void AddSC_culling_of_stratholme();
-void AddSC_instance_culling_of_stratholme();
-void AddSC_instance_dire_maul();             //Dire Maul
-void AddSC_instance_maraudon();              //Maraudon
-void AddSC_boss_onyxia();                    //Onyxia's Lair
-void AddSC_instance_onyxias_lair();
-void AddSC_instance_ragefire_chasm();        //Ragefire Chasm
-void AddSC_razorfen_downs();                 //Razorfen Downs
-void AddSC_instance_razorfen_downs();
-void AddSC_instance_razorfen_kraul();        //Razorfen Kraul
-void AddSC_boss_kurinnaxx();                 //Ruins of ahn'qiraj
-void AddSC_boss_rajaxx();
-void AddSC_boss_moam();
-void AddSC_boss_buru();
-void AddSC_boss_ayamiss();
-void AddSC_boss_ossirian();
-void AddSC_instance_ruins_of_ahnqiraj();
-void AddSC_boss_cthun();                     //Temple of ahn'qiraj
-void AddSC_boss_viscidus();
-void AddSC_boss_fankriss();
-void AddSC_boss_huhuran();
-void AddSC_bug_trio();
-void AddSC_boss_sartura();
-void AddSC_boss_skeram();
-void AddSC_boss_twinemperors();
-void AddSC_boss_ouro();
-void AddSC_npc_anubisath_sentinel();
-void AddSC_instance_temple_of_ahnqiraj();
-void AddSC_instance_wailing_caverns();       //Wailing caverns
-void AddSC_instance_zulfarrak();             //Zul'Farrak
-
-void AddSC_ashenvale();
-void AddSC_azshara();
-void AddSC_azuremyst_isle();
-void AddSC_bloodmyst_isle();
-void AddSC_boss_azuregos();
-void AddSC_darkshore();
-void AddSC_desolace();
-void AddSC_durotar();
-void AddSC_dustwallow_marsh();
-void AddSC_felwood();
-void AddSC_feralas();
-void AddSC_moonglade();
-void AddSC_mulgore();
-void AddSC_orgrimmar();
-void AddSC_silithus();
-void AddSC_stonetalon_mountains();
-void AddSC_tanaris();
-void AddSC_teldrassil();
-void AddSC_the_barrens();
-void AddSC_thousand_needles();
-void AddSC_thunder_bluff();
-void AddSC_ungoro_crater();
-void AddSC_winterspring();
-
-//northrend
-void AddSC_boss_slad_ran();
-void AddSC_boss_moorabi();
-void AddSC_boss_drakkari_colossus();
-void AddSC_boss_gal_darah();
-void AddSC_boss_eck();
-void AddSC_instance_gundrak();
-void AddSC_boss_krik_thir();             //Azjol-Nerub
-void AddSC_boss_hadronox();
-void AddSC_boss_anub_arak();
-void AddSC_instance_azjol_nerub();
-void AddSC_instance_ahnkahet();          //Azjol-Nerub Ahn'kahet
-void AddSC_boss_amanitar();
-void AddSC_boss_taldaram();
-void AddSC_boss_jedoga_shadowseeker();
-void AddSC_boss_elder_nadox();
-void AddSC_boss_volazj();
-void AddSC_boss_argent_challenge();      //Trial of the Champion
-void AddSC_boss_black_knight();
-void AddSC_boss_grand_champions();
-void AddSC_instance_trial_of_the_champion();
-void AddSC_trial_of_the_champion();
-void AddSC_boss_anubarak_trial();        //Trial of the Crusader
-void AddSC_boss_faction_champions();
-void AddSC_boss_jaraxxus();
-void AddSC_boss_northrend_beasts();
-void AddSC_boss_twin_valkyr();
-void AddSC_trial_of_the_crusader();
-void AddSC_instance_trial_of_the_crusader();
-void AddSC_boss_anubrekhan();            //Naxxramas
-void AddSC_boss_maexxna();
-void AddSC_boss_patchwerk();
-void AddSC_boss_grobbulus();
-void AddSC_boss_razuvious();
-void AddSC_boss_kelthuzad();
-void AddSC_boss_loatheb();
-void AddSC_boss_noth();
-void AddSC_boss_gluth();
-void AddSC_boss_sapphiron();
-void AddSC_boss_four_horsemen();
-void AddSC_boss_faerlina();
-void AddSC_boss_heigan();
-void AddSC_boss_gothik();
-void AddSC_boss_thaddius();
-void AddSC_instance_naxxramas();
-void AddSC_boss_magus_telestra();        //The Nexus Nexus
-void AddSC_boss_anomalus();
-void AddSC_boss_ormorok();
-void AddSC_boss_keristrasza();
-void AddSC_boss_commander_stoutbeard();
-void AddSC_instance_nexus();
-void AddSC_boss_drakos();                //The Nexus The Oculus
-void AddSC_boss_varos();
-void AddSC_boss_urom();
-void AddSC_boss_eregos();
-void AddSC_instance_oculus();
-void AddSC_oculus();
-void AddSC_boss_sartharion();            //Obsidian Sanctum
-void AddSC_instance_obsidian_sanctum();
-void AddSC_boss_malygos();               //Eye of Eternity
-void AddSC_instance_eye_of_eternity();
-void AddSC_boss_bjarngrim();             //Ulduar Halls of Lightning
-void AddSC_boss_loken();
-void AddSC_boss_ionar();
-void AddSC_boss_volkhan();
-void AddSC_instance_halls_of_lightning();
-void AddSC_boss_maiden_of_grief();       //Ulduar Halls of Stone
-void AddSC_boss_krystallus();
-void AddSC_boss_sjonnir();
-void AddSC_brann_bronzebeard();
-void AddSC_instance_halls_of_stone();
-void AddSC_boss_auriaya();               //Ulduar Ulduar
-void AddSC_boss_flame_leviathan();
-void AddSC_boss_ignis();
-void AddSC_boss_razorscale();
-void AddSC_boss_xt002();
-void AddSC_boss_kologarn();
-void AddSC_boss_assembly_of_iron();
-void AddSC_boss_freya();
-void AddSC_boss_mimiron();
-void AddSC_boss_hodir();
-void AddSC_boss_thorim();
-void AddSC_boss_vezax();
-void AddSC_boss_yoggsaron();
-void AddSC_ulduar();
-void AddSC_boss_algalon_the_observer();
-void AddSC_instance_ulduar();
-void AddSC_boss_keleseth();              //Utgarde Keep
-void AddSC_boss_skarvald_dalronn();
-void AddSC_boss_ingvar_the_plunderer();
-void AddSC_instance_utgarde_keep();
-void AddSC_boss_svala();                 //Utgarde pinnacle
-void AddSC_boss_palehoof();
-void AddSC_boss_skadi();
-void AddSC_boss_ymiron();
-void AddSC_instance_utgarde_pinnacle();
-void AddSC_utgarde_keep();
-void AddSC_boss_archavon();              //Vault of Archavon
-void AddSC_boss_emalon();
-void AddSC_boss_koralon();
-void AddSC_boss_toravon();
-void AddSC_instance_vault_of_archavon();
-void AddSC_boss_trollgore();             //Drak'Tharon Keep
-void AddSC_boss_novos();
-void AddSC_boss_dred();
-void AddSC_boss_tharon_ja();
-void AddSC_instance_drak_tharon_keep();
-void AddSC_boss_cyanigosa();             //Violet Hold
-void AddSC_boss_erekem();
-void AddSC_boss_ichoron();
-void AddSC_boss_lavanthor();
-void AddSC_boss_moragg();
-void AddSC_boss_xevozz();
-void AddSC_boss_zuramat();
-void AddSC_instance_violet_hold();
-void AddSC_violet_hold();
-void AddSC_instance_forge_of_souls();   //Forge of Souls
-void AddSC_forge_of_souls();
-void AddSC_boss_bronjahm();
-void AddSC_boss_devourer_of_souls();
-void AddSC_instance_pit_of_saron();     //Pit of Saron
-void AddSC_pit_of_saron();
-void AddSC_boss_garfrost();
-void AddSC_boss_ick();
-void AddSC_boss_tyrannus();
-void AddSC_instance_halls_of_reflection();   // Halls of Reflection
-void AddSC_halls_of_reflection();
-void AddSC_boss_falric();
-void AddSC_boss_marwyn();
-void AddSC_boss_lord_marrowgar();       // Icecrown Citadel
-void AddSC_boss_lady_deathwhisper();
-void AddSC_boss_icecrown_gunship_battle();
-void AddSC_boss_deathbringer_saurfang();
-void AddSC_boss_festergut();
-void AddSC_boss_rotface();
-void AddSC_boss_professor_putricide();
-void AddSC_boss_blood_prince_council();
-void AddSC_boss_blood_queen_lana_thel();
-void AddSC_boss_valithria_dreamwalker();
-void AddSC_boss_sindragosa();
-void AddSC_boss_the_lich_king();
-void AddSC_icecrown_citadel_teleport();
-void AddSC_instance_icecrown_citadel();
-void AddSC_icecrown_citadel();
-void AddSC_instance_ruby_sanctum();      // Ruby Sanctum
-void AddSC_boss_baltharus_the_warborn();
-void AddSC_boss_saviana_ragefire();
-void AddSC_boss_general_zarithrian();
-void AddSC_boss_halion();
-
-void AddSC_dalaran();
-void AddSC_borean_tundra();
-void AddSC_dragonblight();
-void AddSC_grizzly_hills();
-void AddSC_howling_fjord();
-void AddSC_icecrown();
-void AddSC_sholazar_basin();
-void AddSC_storm_peaks();
-void AddSC_zuldrak();
-void AddSC_crystalsong_forest();
-void AddSC_isle_of_conquest();
-void AddSC_wintergrasp();
-
-//outland
-void AddSC_boss_exarch_maladaar();           //Auchindoun Auchenai Crypts
-void AddSC_boss_shirrak_the_dead_watcher();
-void AddSC_boss_nexusprince_shaffar();       //Auchindoun Mana Tombs
-void AddSC_boss_talon_king_ikiss();          //Auchindoun Sekketh Halls
-void AddSC_instance_sethekk_halls();
-void AddSC_instance_shadow_labyrinth();      //Auchindoun Shadow Labyrinth
-void AddSC_boss_ambassador_hellmaw();
-void AddSC_boss_blackheart_the_inciter();
-void AddSC_boss_grandmaster_vorpil();
-void AddSC_boss_murmur();
-void AddSC_boss_illidan();                   //Black Temple
-void AddSC_boss_shade_of_akama();
-void AddSC_boss_supremus();
-void AddSC_boss_gurtogg_bloodboil();
-void AddSC_boss_mother_shahraz();
-void AddSC_boss_reliquary_of_souls();
-void AddSC_boss_teron_gorefiend();
-void AddSC_boss_najentus();
-void AddSC_boss_illidari_council();
-void AddSC_instance_black_temple();
-void AddSC_boss_fathomlord_karathress();     //CR Serpent Shrine Cavern
-void AddSC_boss_hydross_the_unstable();
-void AddSC_boss_lady_vashj();
-void AddSC_boss_leotheras_the_blind();
-void AddSC_boss_morogrim_tidewalker();
-void AddSC_instance_serpentshrine_cavern();
-void AddSC_boss_the_lurker_below();
-void AddSC_boss_hydromancer_thespia();       //CR Steam Vault
-void AddSC_boss_mekgineer_steamrigger();
-void AddSC_boss_warlord_kalithresh();
-void AddSC_instance_steam_vault();
-void AddSC_boss_the_black_stalker();         //CR Underbog
-void AddSC_boss_ahune();
-void AddSC_boss_gruul();                     //Gruul's Lair
-void AddSC_boss_high_king_maulgar();
-void AddSC_instance_gruuls_lair();
-void AddSC_boss_broggok();                   //HC Blood Furnace
-void AddSC_boss_kelidan_the_breaker();
-void AddSC_boss_the_maker();
-void AddSC_instance_blood_furnace();
-void AddSC_boss_magtheridon();               //HC Magtheridon's Lair
-void AddSC_instance_magtheridons_lair();
-void AddSC_boss_grand_warlock_nethekurse();  //HC Shattered Halls
-void AddSC_boss_warbringer_omrogg();
-void AddSC_boss_warchief_kargath_bladefist();
-void AddSC_instance_shattered_halls();
-void AddSC_boss_watchkeeper_gargolmar();     //HC Ramparts
-void AddSC_boss_omor_the_unscarred();
-void AddSC_boss_vazruden_the_herald();
-void AddSC_instance_ramparts();
-void AddSC_arcatraz();                       //TK Arcatraz
-void AddSC_boss_harbinger_skyriss();
-void AddSC_boss_wrath_scryer_soccothrates();
-void AddSC_boss_zereketh_the_unbound();
-void AddSC_boss_dalliah_the_doomsayer();
-void AddSC_instance_arcatraz();
-void AddSC_boss_high_botanist_freywinn();    //TK Botanica
-void AddSC_boss_laj();
-void AddSC_boss_warp_splinter();
-void AddSC_boss_thorngrin_the_tender();
-void AddSC_boss_commander_sarannis();
-void AddSC_instance_the_botanica();
-void AddSC_boss_alar();                      //TK The Eye
-void AddSC_boss_kaelthas();
-void AddSC_boss_void_reaver();
-void AddSC_boss_high_astromancer_solarian();
-void AddSC_instance_the_eye();
-void AddSC_boss_gatewatcher_iron_hand();     //TK The Mechanar
-void AddSC_boss_gatewatcher_gyrokill();
-void AddSC_boss_nethermancer_sepethrea();
-void AddSC_boss_pathaleon_the_calculator();
-void AddSC_boss_mechano_lord_capacitus();
-void AddSC_instance_mechanar();
-
-void AddSC_blades_edge_mountains();
-void AddSC_boss_doomlordkazzak();
-void AddSC_boss_doomwalker();
-void AddSC_hellfire_peninsula();
-void AddSC_nagrand();
-void AddSC_netherstorm();
-void AddSC_shadowmoon_valley();
-void AddSC_shattrath_city();
-void AddSC_terokkar_forest();
-void AddSC_zangarmarsh();
-
-// Pets
-void AddSC_deathknight_pet_scripts();
-void AddSC_generic_pet_scripts();
-void AddSC_hunter_pet_scripts();
-void AddSC_mage_pet_scripts();
-void AddSC_priest_pet_scripts();
-void AddSC_shaman_pet_scripts();
-
-// battlegrounds
-
-// outdoor pvp
-void AddSC_outdoorpvp_ep();
-void AddSC_outdoorpvp_hp();
-void AddSC_outdoorpvp_na();
-void AddSC_outdoorpvp_si();
-void AddSC_outdoorpvp_tf();
-void AddSC_outdoorpvp_zm();
-void AddSC_outdoorpvp_gh();
-
-
-#endif
-
-void AddWorldScripts()
-{
-#ifdef SCRIPTS
-    AddSC_areatrigger_scripts();
-    AddSC_emerald_dragons();
-    AddSC_generic_creature();
-    AddSC_go_scripts();
-    AddSC_guards();
-    AddSC_item_scripts();
-    AddSC_npc_professions();
-    AddSC_npc_innkeeper();
-    AddSC_npcs_special();
-    AddSC_npc_taxi();
-    AddSC_achievement_scripts();
-#endif
-}
-
-void AddEventScripts()
-{
-#ifdef SCRIPTS
-    AddSC_event_brewfest_scripts();
-    AddSC_event_hallows_end_scripts();
-    AddSC_event_pilgrims_end_scripts();
-    AddSC_event_winter_veil_scripts();
-    AddSC_event_love_in_the_air();
-    AddSC_event_midsummer_scripts();
-    AddSC_event_childrens_week();
-#endif
-}
-
-void AddEasternKingdomsScripts()
-{
-#ifdef SCRIPTS
-    AddSC_alterac_valley();                 //Alterac Valley
-    AddSC_boss_balinda();
-    AddSC_boss_drekthar();
-    AddSC_boss_galvangar();
-    AddSC_boss_vanndar();
-    AddSC_blackrock_depths();               //Blackrock Depths
-    AddSC_boss_ambassador_flamelash();
-    AddSC_boss_anubshiah();
-    AddSC_boss_draganthaurissan();
-    AddSC_boss_general_angerforge();
-    AddSC_boss_gorosh_the_dervish();
-    AddSC_boss_grizzle();
-    AddSC_boss_high_interrogator_gerstahn();
-    AddSC_boss_magmus();
-    AddSC_boss_moira_bronzebeard();
-    AddSC_boss_tomb_of_seven();
-    AddSC_instance_blackrock_depths();
-    AddSC_boss_drakkisath();                //Blackrock Spire
-    AddSC_boss_halycon();
-    AddSC_boss_highlordomokk();
-    AddSC_boss_mothersmolderweb();
-    AddSC_boss_overlordwyrmthalak();
-    AddSC_boss_shadowvosh();
-    AddSC_boss_thebeast();
-    AddSC_boss_warmastervoone();
-    AddSC_boss_quatermasterzigris();
-    AddSC_boss_pyroguard_emberseer();
-    AddSC_boss_gyth();
-    AddSC_boss_rend_blackhand();
-    AddSC_boss_urok_doomhowl();
-    AddSC_boss_gizrul_the_slavener();
-    AddSC_instance_blackrock_spire();
-    AddSC_boss_razorgore();                 //Blackwing lair
-    AddSC_boss_vaelastrasz();
-    AddSC_boss_broodlord();
-    AddSC_boss_firemaw();
-    AddSC_boss_ebonroc();
-    AddSC_boss_flamegor();
-    AddSC_boss_chromaggus();
-    AddSC_boss_nefarian();
-    AddSC_instance_blackwing_lair();
-    AddSC_boss_mr_smite();
-    AddSC_instance_deadmines();             //Deadmines
-    AddSC_instance_gnomeregan();            //Gnomeregan
-    AddSC_instance_karazhan();              //Karazhan
-    AddSC_boss_servant_quarters();
-    AddSC_boss_attumen();
-    AddSC_boss_curator();
-    AddSC_boss_maiden_of_virtue();
-    AddSC_boss_shade_of_aran();
-    AddSC_boss_malchezaar();
-    AddSC_boss_terestian_illhoof();
-    AddSC_boss_moroes();
-    AddSC_bosses_opera();
-    AddSC_boss_netherspite();
-    AddSC_karazhan();
-    AddSC_boss_nightbane();
-    AddSC_boss_felblood_kaelthas();         // Magister's Terrace
-    AddSC_boss_selin_fireheart();
-    AddSC_boss_vexallus();
-    AddSC_boss_priestess_delrissa();
-    AddSC_instance_magisters_terrace();
-    AddSC_boss_lucifron();                  //Molten core
-    AddSC_boss_magmadar();
-    AddSC_boss_gehennas();
-    AddSC_boss_garr();
-    AddSC_boss_baron_geddon();
-    AddSC_boss_shazzrah();
-    AddSC_boss_golemagg();
-    AddSC_boss_sulfuron();
-    AddSC_boss_majordomo();
-    AddSC_boss_ragnaros();
-    AddSC_instance_molten_core();
-    AddSC_the_scarlet_enclave();            //Scarlet Enclave
-    AddSC_the_scarlet_enclave_c1();
-    AddSC_the_scarlet_enclave_c2();
-    AddSC_the_scarlet_enclave_c5();
-    AddSC_instance_scarlet_monastery();     //Scarlet Monastery
-    AddSC_boss_kirtonos_the_herald();
-    AddSC_instance_scholomance();           //Scholomance
-    AddSC_instance_shadowfang_keep();       //Shadowfang keep
-    AddSC_instance_stratholme();            //Stratholme
-    AddSC_instance_sunken_temple();         //Sunken Temple
-    AddSC_instance_sunwell_plateau();       //Sunwell Plateau
-    AddSC_boss_kalecgos();
-    AddSC_boss_brutallus();
-    AddSC_boss_felmyst();
-    AddSC_boss_eredar_twins();
-    AddSC_boss_muru();
-    AddSC_boss_kiljaeden();
-    AddSC_instance_the_stockade();          //The Stockade
-    AddSC_instance_uldaman();               //Uldaman
-    AddSC_boss_akilzon();                   //Zul'Aman
-    AddSC_boss_halazzi();
-    AddSC_boss_hex_lord_malacrass();
-    AddSC_boss_janalai();
-    AddSC_boss_nalorakk();
-    AddSC_boss_zuljin();
-    AddSC_instance_zulaman();
-    AddSC_zulaman();
-    AddSC_boss_jeklik();                    //Zul'Gurub
-    AddSC_boss_venoxis();
-    AddSC_boss_marli();
-    AddSC_boss_mandokir();
-    AddSC_boss_gahzranka();
-    AddSC_boss_thekal();
-    AddSC_boss_arlokk();
-    AddSC_boss_jindo();
-    AddSC_boss_hakkar();
-    AddSC_boss_grilek();
-    AddSC_boss_hazzarah();
-    AddSC_boss_renataki();
-    AddSC_boss_wushoolay();
-    AddSC_instance_zulgurub();
-
-    //AddSC_alterac_mountains();
-    AddSC_arathi_highlands();
-    AddSC_blasted_lands();
-    AddSC_burning_steppes();
-    AddSC_duskwood();
-    AddSC_eastern_plaguelands();
-    AddSC_eversong_woods();
-    AddSC_ghostlands();
-    AddSC_hinterlands();
-    AddSC_ironforge();
-    AddSC_isle_of_queldanas();
-    AddSC_loch_modan();
-    AddSC_redridge_mountains();
-    AddSC_silverpine_forest();
-    AddSC_stormwind_city();
-    AddSC_stranglethorn_vale();
-    AddSC_swamp_of_sorrows();
-    AddSC_tirisfal_glades();
-    AddSC_undercity();
-    AddSC_western_plaguelands();
-    AddSC_westfall();
-    AddSC_wetlands();
-#endif
-}
-
-void AddKalimdorScripts()
-{
-#ifdef SCRIPTS
-    AddSC_instance_blackfathom_deeps();     //Blackfathom Depths
-    AddSC_hyjal();                          //CoT Battle for Mt. Hyjal
-    AddSC_boss_archimonde();
-    AddSC_instance_mount_hyjal();
-    AddSC_hyjal_trash();
-    AddSC_boss_rage_winterchill();
-    AddSC_boss_anetheron();
-    AddSC_boss_kazrogal();
-    AddSC_boss_azgalor();
-    AddSC_boss_captain_skarloc();           //CoT Old Hillsbrad
-    AddSC_boss_epoch_hunter();
-    AddSC_boss_lieutenant_drake();
-    AddSC_instance_old_hillsbrad();
-    AddSC_old_hillsbrad();
-    AddSC_boss_aeonus();                    //CoT The Black Morass
-    AddSC_boss_chrono_lord_deja();
-    AddSC_boss_temporus();
-    AddSC_the_black_morass();
-    AddSC_instance_the_black_morass();
-    AddSC_boss_epoch();                     //CoT Culling Of Stratholme
-    AddSC_boss_infinite_corruptor();
-    AddSC_boss_salramm();
-    AddSC_boss_mal_ganis();
-    AddSC_boss_meathook();
-    AddSC_culling_of_stratholme();
-    AddSC_instance_culling_of_stratholme();
-    AddSC_instance_dire_maul();             //Dire Maul
-    AddSC_instance_maraudon();              //Maraudon
-    AddSC_boss_onyxia();                    //Onyxia's Lair
-    AddSC_instance_onyxias_lair();
-    AddSC_instance_ragefire_chasm();        //Ragefire Chasm
-    AddSC_razorfen_downs();
-    AddSC_instance_razorfen_downs();        //Razorfen Downs
-    AddSC_instance_razorfen_kraul();        //Razorfen Kraul
-    AddSC_boss_kurinnaxx();                 //Ruins of ahn'qiraj
-    AddSC_boss_rajaxx();
-    AddSC_boss_moam();
-    AddSC_boss_buru();
-    AddSC_boss_ayamiss();
-    AddSC_boss_ossirian();
-    AddSC_instance_ruins_of_ahnqiraj();
-    AddSC_boss_cthun();                     //Temple of ahn'qiraj
-    AddSC_boss_viscidus();
-    AddSC_boss_fankriss();
-    AddSC_boss_huhuran();
-    AddSC_bug_trio();
-    AddSC_boss_sartura();
-    AddSC_boss_skeram();
-    AddSC_boss_twinemperors();
-    AddSC_boss_ouro();
-    AddSC_npc_anubisath_sentinel();
-    AddSC_instance_temple_of_ahnqiraj();
-    AddSC_instance_wailing_caverns();       //Wailing caverns
-    AddSC_instance_zulfarrak();             //Zul'Farrak instance script
-
-    AddSC_ashenvale();
-    AddSC_azshara();
-    AddSC_azuremyst_isle();
-    AddSC_bloodmyst_isle();
-    AddSC_boss_azuregos();
-    AddSC_darkshore();
-    AddSC_desolace();
-    AddSC_durotar();
-    AddSC_dustwallow_marsh();
-    AddSC_felwood();
-    AddSC_feralas();
-    AddSC_moonglade();
-    AddSC_mulgore();
-    AddSC_orgrimmar();
-    AddSC_silithus();
-    AddSC_stonetalon_mountains();
-    AddSC_tanaris();
-    AddSC_teldrassil();
-    AddSC_the_barrens();
-    AddSC_thousand_needles();
-    AddSC_thunder_bluff();
-    AddSC_ungoro_crater();
-    AddSC_winterspring();
-#endif
-}
-
-void AddOutlandScripts()
-{
-#ifdef SCRIPTS
-    AddSC_boss_exarch_maladaar();           //Auchindoun Auchenai Crypts
-    AddSC_boss_shirrak_the_dead_watcher();
-    AddSC_boss_nexusprince_shaffar();       //Auchindoun Mana Tombs
-    AddSC_boss_talon_king_ikiss();          //Auchindoun Sekketh Halls
-    AddSC_instance_sethekk_halls();
-    AddSC_instance_shadow_labyrinth();      //Auchindoun Shadow Labyrinth
-    AddSC_boss_ambassador_hellmaw();
-    AddSC_boss_blackheart_the_inciter();
-    AddSC_boss_grandmaster_vorpil();
-    AddSC_boss_murmur();
-    AddSC_boss_illidan();                   //Black Temple
-    AddSC_boss_shade_of_akama();
-    AddSC_boss_supremus();
-    AddSC_boss_gurtogg_bloodboil();
-    AddSC_boss_mother_shahraz();
-    AddSC_boss_reliquary_of_souls();
-    AddSC_boss_teron_gorefiend();
-    AddSC_boss_najentus();
-    AddSC_boss_illidari_council();
-    AddSC_instance_black_temple();
-    AddSC_boss_fathomlord_karathress();     //CR Serpent Shrine Cavern
-    AddSC_boss_hydross_the_unstable();
-    AddSC_boss_lady_vashj();
-    AddSC_boss_leotheras_the_blind();
-    AddSC_boss_morogrim_tidewalker();
-    AddSC_instance_serpentshrine_cavern();
-    AddSC_boss_the_lurker_below();
-    AddSC_boss_hydromancer_thespia();       //CR Steam Vault
-    AddSC_boss_mekgineer_steamrigger();
-    AddSC_boss_warlord_kalithresh();
-    AddSC_instance_steam_vault();
-    AddSC_boss_the_black_stalker();         //CR Underbog
-    AddSC_boss_ahune();
-    AddSC_boss_gruul();                     //Gruul's Lair
-    AddSC_boss_high_king_maulgar();
-    AddSC_instance_gruuls_lair();
-    AddSC_boss_broggok();                   //HC Blood Furnace
-    AddSC_boss_kelidan_the_breaker();
-    AddSC_boss_the_maker();
-    AddSC_instance_blood_furnace();
-    AddSC_boss_magtheridon();               //HC Magtheridon's Lair
-    AddSC_instance_magtheridons_lair();
-    AddSC_boss_grand_warlock_nethekurse();  //HC Shattered Halls
-    AddSC_boss_warbringer_omrogg();
-    AddSC_boss_warchief_kargath_bladefist();
-    AddSC_instance_shattered_halls();
-    AddSC_boss_watchkeeper_gargolmar();     //HC Ramparts
-    AddSC_boss_omor_the_unscarred();
-    AddSC_boss_vazruden_the_herald();
-    AddSC_instance_ramparts();
-    AddSC_arcatraz();                       //TK Arcatraz
-    AddSC_boss_harbinger_skyriss();
-    AddSC_boss_wrath_scryer_soccothrates();
-    AddSC_boss_zereketh_the_unbound();
-    AddSC_boss_dalliah_the_doomsayer();
-    AddSC_instance_arcatraz();
-    AddSC_boss_high_botanist_freywinn();    //TK Botanica
-    AddSC_boss_laj();
-    AddSC_boss_warp_splinter();
-    AddSC_boss_thorngrin_the_tender();
-    AddSC_boss_commander_sarannis();
-    AddSC_instance_the_botanica();
-    AddSC_boss_alar();                      //TK The Eye
-    AddSC_boss_kaelthas();
-    AddSC_boss_void_reaver();
-    AddSC_boss_high_astromancer_solarian();
-    AddSC_instance_the_eye();
-    AddSC_boss_gatewatcher_iron_hand();     //TK The Mechanar
-    AddSC_boss_gatewatcher_gyrokill();
-    AddSC_boss_nethermancer_sepethrea();
-    AddSC_boss_pathaleon_the_calculator();
-    AddSC_boss_mechano_lord_capacitus();
-    AddSC_instance_mechanar();
-
-    AddSC_blades_edge_mountains();
-    AddSC_boss_doomlordkazzak();
-    AddSC_boss_doomwalker();
-    AddSC_hellfire_peninsula();
-    AddSC_nagrand();
-    AddSC_netherstorm();
-    AddSC_shadowmoon_valley();
-    AddSC_shattrath_city();
-    AddSC_terokkar_forest();
-    AddSC_zangarmarsh();
-#endif
-}
-
-void AddNorthrendScripts()
-{
-#ifdef SCRIPTS
-    AddSC_boss_slad_ran();               //Gundrak
-    AddSC_boss_moorabi();
-    AddSC_boss_drakkari_colossus();
-    AddSC_boss_gal_darah();
-    AddSC_boss_eck();
-    AddSC_instance_gundrak();
-    AddSC_boss_amanitar();
-    AddSC_boss_taldaram();              //Azjol-Nerub Ahn'kahet
-    AddSC_boss_elder_nadox();
-    AddSC_boss_jedoga_shadowseeker();
-    AddSC_boss_volazj();
-    AddSC_instance_ahnkahet();
-    AddSC_boss_argent_challenge();      //Trial of the Champion
-    AddSC_boss_black_knight();
-    AddSC_boss_grand_champions();
-    AddSC_instance_trial_of_the_champion();
-    AddSC_trial_of_the_champion();
-    AddSC_boss_anubarak_trial();        //Trial of the Crusader
-    AddSC_boss_faction_champions();
-    AddSC_boss_jaraxxus();
-    AddSC_trial_of_the_crusader();
-    AddSC_boss_twin_valkyr();
-    AddSC_boss_northrend_beasts();
-    AddSC_instance_trial_of_the_crusader();
-    AddSC_boss_krik_thir();             //Azjol-Nerub Azjol-Nerub
-    AddSC_boss_hadronox();
-    AddSC_boss_anub_arak();
-    AddSC_instance_azjol_nerub();
-    AddSC_boss_anubrekhan();            //Naxxramas
-    AddSC_boss_maexxna();
-    AddSC_boss_patchwerk();
-    AddSC_boss_grobbulus();
-    AddSC_boss_razuvious();
-    AddSC_boss_kelthuzad();
-    AddSC_boss_loatheb();
-    AddSC_boss_noth();
-    AddSC_boss_gluth();
-    AddSC_boss_sapphiron();
-    AddSC_boss_four_horsemen();
-    AddSC_boss_faerlina();
-    AddSC_boss_heigan();
-    AddSC_boss_gothik();
-    AddSC_boss_thaddius();
-    AddSC_instance_naxxramas();
-    AddSC_boss_magus_telestra();        //The Nexus Nexus
-    AddSC_boss_anomalus();
-    AddSC_boss_ormorok();
-    AddSC_boss_keristrasza();
-    AddSC_boss_commander_stoutbeard();
-    AddSC_instance_nexus();
-    AddSC_boss_drakos();                //The Nexus The Oculus
-    AddSC_boss_varos();
-    AddSC_boss_urom();
-    AddSC_boss_eregos();
-    AddSC_instance_oculus();
-    AddSC_oculus();
-    AddSC_boss_sartharion();            //Obsidian Sanctum
-    AddSC_instance_obsidian_sanctum();
-    AddSC_boss_malygos();                //Eye of Eternity
-    AddSC_instance_eye_of_eternity();
-    AddSC_boss_bjarngrim();             //Ulduar Halls of Lightning
-    AddSC_boss_loken();
-    AddSC_boss_ionar();
-    AddSC_boss_volkhan();
-    AddSC_instance_halls_of_lightning();
-    AddSC_boss_maiden_of_grief();       //Ulduar Halls of Stone
-    AddSC_boss_krystallus();
-    AddSC_boss_sjonnir();
-    AddSC_brann_bronzebeard();
-    AddSC_instance_halls_of_stone();
-    AddSC_boss_auriaya();               //Ulduar Ulduar
-    AddSC_boss_flame_leviathan();
-    AddSC_boss_ignis();
-    AddSC_boss_razorscale();
-    AddSC_boss_xt002();
-    AddSC_boss_assembly_of_iron();
-    AddSC_boss_mimiron();
-    AddSC_boss_hodir();
-    AddSC_boss_vezax();
-    AddSC_boss_kologarn();
-    AddSC_boss_freya();
-    AddSC_boss_thorim();
-    AddSC_boss_yoggsaron();
-    AddSC_ulduar();
-    AddSC_boss_algalon_the_observer();
-    AddSC_instance_ulduar();
-    AddSC_boss_keleseth();              //Utgarde Keep
-    AddSC_boss_skarvald_dalronn();
-    AddSC_boss_ingvar_the_plunderer();
-    AddSC_instance_utgarde_keep();
-    AddSC_boss_svala();                 //Utgarde pinnacle
-    AddSC_boss_palehoof();
-    AddSC_boss_skadi();
-    AddSC_boss_ymiron();
-    AddSC_instance_utgarde_pinnacle();
-    AddSC_utgarde_keep();
-    AddSC_boss_archavon();              //Vault of Archavon
-    AddSC_boss_emalon();
-    AddSC_boss_koralon();
-    AddSC_boss_toravon();
-    AddSC_instance_vault_of_archavon();
-    AddSC_boss_trollgore();             //Drak'Tharon Keep
-    AddSC_boss_novos();
-    AddSC_boss_dred();
-    AddSC_boss_tharon_ja();
-    AddSC_instance_drak_tharon_keep();
-    AddSC_boss_cyanigosa();             //Violet Hold
-    AddSC_boss_erekem();
-    AddSC_boss_ichoron();
-    AddSC_boss_lavanthor();
-    AddSC_boss_moragg();
-    AddSC_boss_xevozz();
-    AddSC_boss_zuramat();
-    AddSC_instance_violet_hold();
-    AddSC_violet_hold();
-    AddSC_instance_forge_of_souls();   //Forge of Souls
-    AddSC_forge_of_souls();
-    AddSC_boss_bronjahm();
-    AddSC_boss_devourer_of_souls();
-    AddSC_instance_pit_of_saron();      //Pit of Saron
-    AddSC_pit_of_saron();
-    AddSC_boss_garfrost();
-    AddSC_boss_ick();
-    AddSC_boss_tyrannus();
-    AddSC_instance_halls_of_reflection();   // Halls of Reflection
-    AddSC_halls_of_reflection();
-    AddSC_boss_falric();
-    AddSC_boss_marwyn();
-    AddSC_boss_lord_marrowgar();        // Icecrown Citadel
-    AddSC_boss_lady_deathwhisper();
-    AddSC_boss_icecrown_gunship_battle();
-    AddSC_boss_deathbringer_saurfang();
-    AddSC_boss_festergut();
-    AddSC_boss_rotface();
-    AddSC_boss_professor_putricide();
-    AddSC_boss_blood_prince_council();
-    AddSC_boss_blood_queen_lana_thel();
-    AddSC_boss_valithria_dreamwalker();
-    AddSC_boss_sindragosa();
-    AddSC_boss_the_lich_king();
-    AddSC_icecrown_citadel_teleport();
-    AddSC_instance_icecrown_citadel();
-    AddSC_icecrown_citadel();
-    AddSC_instance_ruby_sanctum();      // Ruby Sanctum
-    AddSC_boss_baltharus_the_warborn();
-    AddSC_boss_saviana_ragefire();
-    AddSC_boss_general_zarithrian();
-    AddSC_boss_halion();
-
-    AddSC_dalaran();
-    AddSC_borean_tundra();
-    AddSC_dragonblight();
-    AddSC_grizzly_hills();
-    AddSC_howling_fjord();
-    AddSC_icecrown();
-    AddSC_sholazar_basin();
-    AddSC_storm_peaks();
-    AddSC_zuldrak();
-    AddSC_crystalsong_forest();
-    AddSC_isle_of_conquest();
-    AddSC_wintergrasp();
-#endif
-}
-
-void AddPetScripts()
-{
-#ifdef SCRIPTS
-    AddSC_deathknight_pet_scripts();
-    AddSC_generic_pet_scripts();
-    AddSC_hunter_pet_scripts();
-    AddSC_mage_pet_scripts();
-    AddSC_priest_pet_scripts();
-    AddSC_shaman_pet_scripts();
-#endif
-}
-
-void AddOutdoorPvPScripts()
-{
-#ifdef SCRIPTS
-    AddSC_outdoorpvp_ep();
-    AddSC_outdoorpvp_hp();
-    AddSC_outdoorpvp_na();
-    AddSC_outdoorpvp_si();
-    AddSC_outdoorpvp_tf();
-    AddSC_outdoorpvp_zm();
-    AddSC_outdoorpvp_gh();
-#endif
-}
-
diff --git a/modules/acore/scripts-wotlk/ScriptWotlkLoader.h b/modules/acore/scripts-wotlk/ScriptWotlkLoader.h
deleted file mode 100644
index ebad6268f1..0000000000
--- a/modules/acore/scripts-wotlk/ScriptWotlkLoader.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef SC_SCRIPT_WOTLK_LOADER_H
-#define SC_SCRIPT_WOTLK_LOADER_H
-
-void AddWorldScripts();
-void AddEventScripts();
-void AddEasternKingdomsScripts();
-void AddKalimdorScripts();
-void AddOutlandScripts();
-void AddNorthrendScripts();
-void AddPetScripts();
-void AddOutdoorPvPScripts();
-
-#endif
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3f0f9d2b61..eceb541604 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,6 +16,8 @@ if(CMAKE_COMPILER_IS_GNUCXX AND NOT MINGW)
   add_definitions(-fno-delete-null-pointer-checks)
 endif()
 
+add_subdirectory(genrev)
+
 if( SERVERS )
   set(sources_windows_Debugging
     ${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging/WheatyExceptionReport.cpp
diff --git a/modules/acore/cmake/macros/ScriptsMacro.cmake b/src/cmake/ac_macros.cmake
index 60c415ab45..60c415ab45 100644
--- a/modules/acore/cmake/macros/ScriptsMacro.cmake
+++ b/src/cmake/ac_macros.cmake
diff --git a/modules/acore/cmake/genrev.cmake b/src/cmake/genrev.cmake
index edd31590a5..d09e582567 100644
--- a/modules/acore/cmake/genrev.cmake
+++ b/src/cmake/genrev.cmake
@@ -72,9 +72,9 @@ else()
 endif()
 
 # Create the actual revision.h file from the above params
-if(NOT "${rev_hash_cached}" MATCHES "${rev_hash}" OR NOT "${rev_branch_cached}" MATCHES "${rev_branch}" OR NOT EXISTS "${BUILDDIR}/revision_data.h")
+if(NOT "${rev_hash_cached}" MATCHES "${rev_hash}" OR NOT "${rev_branch_cached}" MATCHES "${rev_branch}" OR NOT EXISTS "${BUILDDIR}/revision.h")
   configure_file(
-    "${CMAKE_SOURCE_DIR}/revision.h.in.cmake"
+    "${CMAKE_SOURCE_DIR}/src/cmake/revision.h.in.cmake"
     "${BUILDDIR}/revision.h"
     @ONLY
   )
diff --git a/revision.h.in.cmake b/src/cmake/revision.h.in.cmake
index 47afec3152..47afec3152 100644
--- a/revision.h.in.cmake
+++ b/src/cmake/revision.h.in.cmake
diff --git a/modules/acore/cmake/showoptions.cmake b/src/cmake/showoptions.cmake
index 0b935bd6c1..0b935bd6c1 100644
--- a/modules/acore/cmake/showoptions.cmake
+++ b/src/cmake/showoptions.cmake
diff --git a/modules/acore/genrev/CMakeLists.txt b/src/genrev/CMakeLists.txt
index f7b5a4eba9..64b2abdf74 100644
--- a/modules/acore/genrev/CMakeLists.txt
+++ b/src/genrev/CMakeLists.txt
@@ -10,6 +10,6 @@
 
 # Need to pass old ${CMAKE_BINARY_DIR} as param because its different at build stage
 add_custom_target(revision.h ALL
-  COMMAND ${CMAKE_COMMAND} -DBUILDDIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/modules/acore/cmake/genrev.cmake
+  COMMAND ${CMAKE_COMMAND} -DBUILDDIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/src/cmake/genrev.cmake
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 )
diff --git a/src/scripts/CMakeLists.txt b/src/scripts/CMakeLists.txt
index 5cee47bf07..ec347eea7d 100644
--- a/src/scripts/CMakeLists.txt
+++ b/src/scripts/CMakeLists.txt
@@ -10,6 +10,8 @@
 
 # Enable precompiled headers when using the GCC compiler.
 
+CU_SET_PATH("AC_SCRIPTS_DIR" "${CMAKE_CURRENT_LIST_DIR}")
+
 if (USE_SCRIPTPCH)
   set(scripts_STAT_PCH_HDR PrecompiledHeaders/ScriptPCH.h)
   set(scripts_STAT_PCH_SRC PrecompiledHeaders/ScriptPCH.cpp)
@@ -34,6 +36,23 @@ AC_ADD_SCRIPT_LOADER("Spell" "ScriptLoader.h")
 AC_ADD_SCRIPT_LOADER("SC_Smart" "ScriptLoader.h")
 AC_ADD_SCRIPT_LOADER("Command" "ScriptLoader.h")
 
+CU_SET_PATH("CMAKE_AC_MODULE_DIR" "${CMAKE_CURRENT_LIST_DIR}")
+
+if(SCRIPTS)
+  include(World/CMakeLists.txt)
+  include(OutdoorPvP/CMakeLists.txt)
+  include(EasternKingdoms/CMakeLists.txt)
+  include(Kalimdor/CMakeLists.txt)
+  include(Outland/CMakeLists.txt)
+  include(Northrend/CMakeLists.txt)
+  include(Events/CMakeLists.txt)
+  include(Pet/CMakeLists.txt)
+endif()
+
+if(EXISTS "Custom/CMakeLists.txt")
+include(Custom/CMakeLists.txt)
+endif()
+
 CU_GET_GLOBAL("AC_ADD_SCRIPTS_LIST")
 CU_GET_GLOBAL("AC_ADD_SCRIPTS_INCLUDE")
 CU_GET_GLOBAL("AC_SCRIPTS_SOURCES")
diff --git a/modules/acore/scripts-wotlk/Custom/README.md b/src/scripts/Custom/README.md
index 8473a630fd..8473a630fd 100644
--- a/modules/acore/scripts-wotlk/Custom/README.md
+++ b/src/scripts/Custom/README.md
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
index 2d2dc412fd..2d2dc412fd 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/AlteracValley/alterac_valley.cpp
+++ b/src/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
index 59c2b69f96..59c2b69f96 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/AlteracValley/boss_balinda.cpp
+++ b/src/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
index 8d7a2570b7..8d7a2570b7 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/AlteracValley/boss_drekthar.cpp
+++ b/src/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
index fc4a41fd39..fc4a41fd39 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/AlteracValley/boss_galvangar.cpp
+++ b/src/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
index e68254c02d..e68254c02d 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/AlteracValley/boss_vanndar.cpp
+++ b/src/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
index fb96a73672..fb96a73672 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h
index e3de1510e9..e3de1510e9 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
index 7e878089d5..7e878089d5 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
index ad1881a97e..ad1881a97e 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
index 5e56600b69..5e56600b69 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
index 4225327e13..4225327e13 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
index 80b4ffe2a6..80b4ffe2a6 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
index 9fd040a618..9fd040a618 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
index 3c4289f157..3c4289f157 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
index 9023ab3100..9023ab3100 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
index d53e4a2032..d53e4a2032 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
index e5427138c7..e5427138c7 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
index ffa802ee44..ffa802ee44 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h
index 992ccebc48..992ccebc48 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
index 3c9be23fe3..3c9be23fe3 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
index 5d6957449c..5d6957449c 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
index b4341caa70..b4341caa70 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
index 73dccbda93..73dccbda93 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
index 8ea3c8ee47..8ea3c8ee47 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
index bf776e19c0..bf776e19c0 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
index 5baedca6e4..5baedca6e4 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
index 5469455109..5469455109 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
index 911705a36c..911705a36c 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
index df9738d45a..df9738d45a 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
index 78aa2c1597..78aa2c1597 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
index 92ec58aa5d..92ec58aa5d 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
index 02dece8ff7..02dece8ff7 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
index 062ec7a3c0..062ec7a3c0 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
index f836ac20c2..f836ac20c2 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
index 65a0de14f6..65a0de14f6 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h b/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h
index e72f23ce2b..e72f23ce2b 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
index b5e7e595c5..b5e7e595c5 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
index 18ec709c9a..18ec709c9a 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
index a131a54e6c..a131a54e6c 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
index bd70cdc1a8..bd70cdc1a8 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
index 9980ba53ce..9980ba53ce 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
index e6555a0904..e6555a0904 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
index 00e8059e7e..00e8059e7e 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
index ef5951f1b2..ef5951f1b2 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
index 073957d27e..073957d27e 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
index cd03a3a996..cd03a3a996 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
index d22e0049be..d22e0049be 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
index 8f1c01eed9..8f1c01eed9 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
index 5f13e7bd41..5f13e7bd41 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
index 28488b9491..28488b9491 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
index d32ecca6aa..d32ecca6aa 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
index 1257d37a53..1257d37a53 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
index ccbbe48739..ccbbe48739 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
index 2e559dda32..2e559dda32 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
index 302115f8ff..302115f8ff 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
index 1e4ef792f8..1e4ef792f8 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h
index ace4ff02eb..ace4ff02eb 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h
+++ b/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h
diff --git a/src/scripts/EasternKingdoms/CMakeLists.txt b/src/scripts/EasternKingdoms/CMakeLists.txt
new file mode 100644
index 0000000000..ce290313ea
--- /dev/null
+++ b/src/scripts/EasternKingdoms/CMakeLists.txt
@@ -0,0 +1,169 @@
+# Copyright (C) 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+set(scripts_STAT_SRCS
+  ${scripts_STAT_SRCS}
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_ghostlands.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_eversong_woods.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/AlteracValley/boss_galvangar.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/AlteracValley/boss_balinda.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/AlteracValley/boss_drekthar.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/AlteracValley/boss_vanndar.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/AlteracValley/alterac_valley.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Scholomance/scholomance.h
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Scholomance/instance_scholomance.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_isle_of_queldanas.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulGurub/boss_hakkar.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulGurub/boss_marli.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulGurub/boss_jeklik.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulGurub/boss_grilek.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulGurub/zulgurub.h
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulGurub/boss_renataki.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulGurub/boss_venoxis.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulGurub/boss_jindo.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulGurub/boss_thekal.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_wetlands.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_arathi_highlands.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_redridge_mountains.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_ironforge.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ScarletEnclave/chapter2.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ScarletEnclave/chapter5.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ScarletEnclave/chapter1.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_eastern_plaguelands.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Stratholme/instance_stratholme.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Stratholme/stratholme.h
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_tirisfal_glades.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/SunkenTemple/sunken_temple.h
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/MagistersTerrace/magisters_terrace.h
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Uldaman/uldaman.h
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Uldaman/instance_uldaman.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_swamp_of_sorrows.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_stranglethorn_vale.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Deadmines/boss_mr_smite.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Deadmines/instance_deadmines.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Deadmines/deadmines.h
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_duskwood.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_undercity.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_loch_modan.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_burning_steppes.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_blasted_lands.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_stormwind_city.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulAman/boss_halazzi.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulAman/boss_hexlord.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulAman/boss_zuljin.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulAman/boss_akilzon.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulAman/instance_zulaman.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulAman/boss_janalai.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulAman/boss_nalorakk.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulAman/zulaman.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/ZulAman/zulaman.h
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_hinterlands.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_western_plaguelands.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_alterac_mountains.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_westfall.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/zone_silverpine_forest.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Karazhan/instance_karazhan.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Karazhan/boss_nightbane.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Karazhan/karazhan.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Karazhan/boss_curator.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Karazhan/boss_netherspite.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Karazhan/boss_midnight.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Karazhan/bosses_opera.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Karazhan/boss_moroes.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/Karazhan/karazhan.h
+  ${AC_SCRIPTS_DIR}/EasternKingdoms/TheStockade/instance_the_stockade.cpp
+)
+
+AC_ADD_SCRIPT_LOADER("EasternKingdoms" "${AC_SCRIPTS_DIR}/ScriptLoader.h")
+
+message("  -> Prepared: Eastern Kingdoms")
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
index aac98fa1e6..aac98fa1e6 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Deadmines/boss_mr_smite.cpp
+++ b/src/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Deadmines/deadmines.h b/src/scripts/EasternKingdoms/Deadmines/deadmines.h
index 00d89eb9e4..00d89eb9e4 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Deadmines/deadmines.h
+++ b/src/scripts/EasternKingdoms/Deadmines/deadmines.h
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
index 00f8d54f50..00f8d54f50 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Deadmines/instance_deadmines.cpp
+++ b/src/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
index 68eadf5a3d..68eadf5a3d 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
+++ b/src/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_curator.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
index 95f97749fe..95f97749fe 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_curator.cpp
+++ b/src/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
index 4af0e1be9c..4af0e1be9c 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
+++ b/src/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
index de7baa0270..de7baa0270 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_midnight.cpp
+++ b/src/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
index a01a2fa268..a01a2fa268 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_moroes.cpp
+++ b/src/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
index fc75fcb479..fc75fcb479 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_netherspite.cpp
+++ b/src/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
index 0d1621295f..0d1621295f 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_nightbane.cpp
+++ b/src/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
index 50394eeefe..50394eeefe 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+++ b/src/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_servant_quarters.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
index a7ba48e740..a7ba48e740 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
+++ b/src/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
index d613f46834..d613f46834 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+++ b/src/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
index cd152c9f8b..cd152c9f8b 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+++ b/src/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
index 45170b2efa..45170b2efa 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/bosses_opera.cpp
+++ b/src/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
index cc5f179296..cc5f179296 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/instance_karazhan.cpp
+++ b/src/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/karazhan.cpp b/src/scripts/EasternKingdoms/Karazhan/karazhan.cpp
index ad832e1a29..ad832e1a29 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/scripts/EasternKingdoms/Karazhan/karazhan.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/karazhan.h b/src/scripts/EasternKingdoms/Karazhan/karazhan.h
index d2c914f375..d2c914f375 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/karazhan.h
+++ b/src/scripts/EasternKingdoms/Karazhan/karazhan.h
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
index 51905233b8..51905233b8 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+++ b/src/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
index 7e62939bbf..7e62939bbf 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+++ b/src/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
index 5b5ae179dd..5b5ae179dd 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+++ b/src/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
index f640155a25..f640155a25 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+++ b/src/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
index 90366cbeaf..90366cbeaf 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+++ b/src/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/magisters_terrace.h b/src/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
index edea0f9f62..edea0f9f62 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/magisters_terrace.h
+++ b/src/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index 6a096e793d..6a096e793d 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
index e233b06891..e233b06891 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ScarletEnclave/chapter2.cpp
+++ b/src/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
index 704c3e308a..704c3e308a 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ScarletEnclave/chapter5.cpp
+++ b/src/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp b/src/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
index 23ee275e42..23ee275e42 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
+++ b/src/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
index d46b18564d..d46b18564d 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+++ b/src/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
index 05d224adcc..05d224adcc 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
+++ b/src/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
index bdcf0c99f4..bdcf0c99f4 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Scholomance/instance_scholomance.cpp
+++ b/src/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Scholomance/scholomance.h b/src/scripts/EasternKingdoms/Scholomance/scholomance.h
index 4a010006b6..4a010006b6 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Scholomance/scholomance.h
+++ b/src/scripts/EasternKingdoms/Scholomance/scholomance.h
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
index 31f5109ac4..31f5109ac4 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+++ b/src/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h b/src/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
index fdf315f723..fdf315f723 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
+++ b/src/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
index c3830bd8dc..c3830bd8dc 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Stratholme/instance_stratholme.cpp
+++ b/src/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Stratholme/stratholme.h b/src/scripts/EasternKingdoms/Stratholme/stratholme.h
index b27fde684f..b27fde684f 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Stratholme/stratholme.h
+++ b/src/scripts/EasternKingdoms/Stratholme/stratholme.h
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
index 6cadcfa17f..6cadcfa17f 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
+++ b/src/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/SunkenTemple/sunken_temple.h b/src/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h
index 744cf4d86e..744cf4d86e 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/SunkenTemple/sunken_temple.h
+++ b/src/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
index 14930066e6..14930066e6 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
+++ b/src/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
index 92e3e76e5f..92e3e76e5f 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+++ b/src/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
index d282e3553c..d282e3553c 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+++ b/src/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
index 8220fb202d..8220fb202d 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
index bdf5e7270c..bdf5e7270c 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+++ b/src/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
index b40a54fc6e..b40a54fc6e 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+++ b/src/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
index 7b603381e9..7b603381e9 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+++ b/src/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/sunwell_plateau.h b/src/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
index 01875f2681..01875f2681 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
+++ b/src/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/TheStockade/instance_the_stockade.cpp b/src/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp
index 49283d325b..49283d325b 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/TheStockade/instance_the_stockade.cpp
+++ b/src/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
index 659e050ee2..659e050ee2 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Uldaman/instance_uldaman.cpp
+++ b/src/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/Uldaman/uldaman.h b/src/scripts/EasternKingdoms/Uldaman/uldaman.h
index 8685c7ea9d..8685c7ea9d 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/Uldaman/uldaman.h
+++ b/src/scripts/EasternKingdoms/Uldaman/uldaman.h
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
index b24d8ea280..b24d8ea280 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/src/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
index a1bc4b3280..a1bc4b3280 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_halazzi.cpp
+++ b/src/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
index ae233783ee..ae233783ee 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_hexlord.cpp
+++ b/src/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
index 78b6695862..78b6695862 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/src/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
index 91777b9941..91777b9941 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_nalorakk.cpp
+++ b/src/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
index 095af530d9..095af530d9 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_zuljin.cpp
+++ b/src/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
index 084c87fbe9..084c87fbe9 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/instance_zulaman.cpp
+++ b/src/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/zulaman.cpp b/src/scripts/EasternKingdoms/ZulAman/zulaman.cpp
index 3b782fcb45..3b782fcb45 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/zulaman.cpp
+++ b/src/scripts/EasternKingdoms/ZulAman/zulaman.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/zulaman.h b/src/scripts/EasternKingdoms/ZulAman/zulaman.h
index 78835b0983..78835b0983 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/zulaman.h
+++ b/src/scripts/EasternKingdoms/ZulAman/zulaman.h
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
index 61a2b531b2..61a2b531b2 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+++ b/src/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_gahzranka.cpp b/src/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
index 235db2d184..235db2d184 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
+++ b/src/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
index c9f1d950dc..c9f1d950dc 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_grilek.cpp
+++ b/src/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
index 45d153e37d..45d153e37d 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_hakkar.cpp
+++ b/src/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
index c86200c1e6..c86200c1e6 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
+++ b/src/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
index 445b42fd36..445b42fd36 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_jeklik.cpp
+++ b/src/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
index ef4d717390..ef4d717390 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_jindo.cpp
+++ b/src/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
index 1f7854364c..1f7854364c 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+++ b/src/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
index b8dcedc8fb..b8dcedc8fb 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_marli.cpp
+++ b/src/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
index 5a3dadbc8b..5a3dadbc8b 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_renataki.cpp
+++ b/src/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
index 07937cf63d..07937cf63d 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_thekal.cpp
+++ b/src/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
index 591c9e531b..591c9e531b 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_venoxis.cpp
+++ b/src/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
index bf20516fe3..bf20516fe3 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
+++ b/src/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
index 1b37790a37..1b37790a37 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
+++ b/src/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/zulgurub.h b/src/scripts/EasternKingdoms/ZulGurub/zulgurub.h
index b676c5a925..b676c5a925 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/zulgurub.h
+++ b/src/scripts/EasternKingdoms/ZulGurub/zulgurub.h
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_alterac_mountains.cpp b/src/scripts/EasternKingdoms/zone_alterac_mountains.cpp
index 444edc5a5e..444edc5a5e 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_alterac_mountains.cpp
+++ b/src/scripts/EasternKingdoms/zone_alterac_mountains.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_arathi_highlands.cpp b/src/scripts/EasternKingdoms/zone_arathi_highlands.cpp
index b9515d1ef6..b9515d1ef6 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_arathi_highlands.cpp
+++ b/src/scripts/EasternKingdoms/zone_arathi_highlands.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_blasted_lands.cpp b/src/scripts/EasternKingdoms/zone_blasted_lands.cpp
index a6f1f4fc9b..a6f1f4fc9b 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_blasted_lands.cpp
+++ b/src/scripts/EasternKingdoms/zone_blasted_lands.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_burning_steppes.cpp b/src/scripts/EasternKingdoms/zone_burning_steppes.cpp
index 3b431b0986..3b431b0986 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_burning_steppes.cpp
+++ b/src/scripts/EasternKingdoms/zone_burning_steppes.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_duskwood.cpp b/src/scripts/EasternKingdoms/zone_duskwood.cpp
index 4d8b7b1764..4d8b7b1764 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_duskwood.cpp
+++ b/src/scripts/EasternKingdoms/zone_duskwood.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_eastern_plaguelands.cpp b/src/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp
index bab3c99cc1..bab3c99cc1 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_eastern_plaguelands.cpp
+++ b/src/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_eversong_woods.cpp b/src/scripts/EasternKingdoms/zone_eversong_woods.cpp
index cf3f20aced..cf3f20aced 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_eversong_woods.cpp
+++ b/src/scripts/EasternKingdoms/zone_eversong_woods.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_ghostlands.cpp b/src/scripts/EasternKingdoms/zone_ghostlands.cpp
index 8e54aabb5d..8e54aabb5d 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_ghostlands.cpp
+++ b/src/scripts/EasternKingdoms/zone_ghostlands.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_hinterlands.cpp b/src/scripts/EasternKingdoms/zone_hinterlands.cpp
index 8d0e565b67..8d0e565b67 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_hinterlands.cpp
+++ b/src/scripts/EasternKingdoms/zone_hinterlands.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_ironforge.cpp b/src/scripts/EasternKingdoms/zone_ironforge.cpp
index 8ac9f695a6..8ac9f695a6 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_ironforge.cpp
+++ b/src/scripts/EasternKingdoms/zone_ironforge.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_isle_of_queldanas.cpp b/src/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp
index 827e4bac5d..827e4bac5d 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_isle_of_queldanas.cpp
+++ b/src/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_loch_modan.cpp b/src/scripts/EasternKingdoms/zone_loch_modan.cpp
index 6e8453a1df..6e8453a1df 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_loch_modan.cpp
+++ b/src/scripts/EasternKingdoms/zone_loch_modan.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_redridge_mountains.cpp b/src/scripts/EasternKingdoms/zone_redridge_mountains.cpp
index ac5f9a30bc..ac5f9a30bc 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_redridge_mountains.cpp
+++ b/src/scripts/EasternKingdoms/zone_redridge_mountains.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_silverpine_forest.cpp b/src/scripts/EasternKingdoms/zone_silverpine_forest.cpp
index e1ba57b5dc..e1ba57b5dc 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_silverpine_forest.cpp
+++ b/src/scripts/EasternKingdoms/zone_silverpine_forest.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_stormwind_city.cpp b/src/scripts/EasternKingdoms/zone_stormwind_city.cpp
index bfbaa16b5f..bfbaa16b5f 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_stormwind_city.cpp
+++ b/src/scripts/EasternKingdoms/zone_stormwind_city.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_stranglethorn_vale.cpp b/src/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp
index 1d55f33247..1d55f33247 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_stranglethorn_vale.cpp
+++ b/src/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_swamp_of_sorrows.cpp b/src/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
index af1f8988a4..af1f8988a4 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_swamp_of_sorrows.cpp
+++ b/src/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_tirisfal_glades.cpp b/src/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
index e23e405993..e23e405993 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_tirisfal_glades.cpp
+++ b/src/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_undercity.cpp b/src/scripts/EasternKingdoms/zone_undercity.cpp
index a082ccb808..a082ccb808 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_undercity.cpp
+++ b/src/scripts/EasternKingdoms/zone_undercity.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_western_plaguelands.cpp b/src/scripts/EasternKingdoms/zone_western_plaguelands.cpp
index d9d53cc14d..d9d53cc14d 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_western_plaguelands.cpp
+++ b/src/scripts/EasternKingdoms/zone_western_plaguelands.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_westfall.cpp b/src/scripts/EasternKingdoms/zone_westfall.cpp
index 86f9ba9641..86f9ba9641 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_westfall.cpp
+++ b/src/scripts/EasternKingdoms/zone_westfall.cpp
diff --git a/modules/acore/scripts-wotlk/EasternKingdoms/zone_wetlands.cpp b/src/scripts/EasternKingdoms/zone_wetlands.cpp
index 55a802bd09..55a802bd09 100644
--- a/modules/acore/scripts-wotlk/EasternKingdoms/zone_wetlands.cpp
+++ b/src/scripts/EasternKingdoms/zone_wetlands.cpp
diff --git a/src/scripts/Events/CMakeLists.txt b/src/scripts/Events/CMakeLists.txt
new file mode 100644
index 0000000000..2ef412a9cb
--- /dev/null
+++ b/src/scripts/Events/CMakeLists.txt
@@ -0,0 +1,14 @@
+set(scripts_STAT_SRCS
+  ${scripts_STAT_SRCS}
+  ${AC_SCRIPTS_DIR}/Events/brewfest.cpp
+  ${AC_SCRIPTS_DIR}/Events/childrens_week.cpp
+  ${AC_SCRIPTS_DIR}/Events/hallows_end.cpp
+  ${AC_SCRIPTS_DIR}/Events/pilgrims_bounty.cpp
+  ${AC_SCRIPTS_DIR}/Events/winter_veil.cpp
+  ${AC_SCRIPTS_DIR}/Events/love_in_air.cpp
+  ${AC_SCRIPTS_DIR}/Events/midsummer.cpp
+)
+
+AC_ADD_SCRIPT_LOADER("Event" "${AC_SCRIPTS_DIR}/ScriptLoader.h")
+
+message("  -> Prepared: Events")
diff --git a/modules/acore/scripts-wotlk/Events/brewfest.cpp b/src/scripts/Events/brewfest.cpp
index 1489df8643..1489df8643 100644
--- a/modules/acore/scripts-wotlk/Events/brewfest.cpp
+++ b/src/scripts/Events/brewfest.cpp
diff --git a/modules/acore/scripts-wotlk/Events/childrens_week.cpp b/src/scripts/Events/childrens_week.cpp
index 154cf857c8..154cf857c8 100644
--- a/modules/acore/scripts-wotlk/Events/childrens_week.cpp
+++ b/src/scripts/Events/childrens_week.cpp
diff --git a/modules/acore/scripts-wotlk/Events/hallows_end.cpp b/src/scripts/Events/hallows_end.cpp
index a8b46363c9..a8b46363c9 100644
--- a/modules/acore/scripts-wotlk/Events/hallows_end.cpp
+++ b/src/scripts/Events/hallows_end.cpp
diff --git a/modules/acore/scripts-wotlk/Events/love_in_air.cpp b/src/scripts/Events/love_in_air.cpp
index fa7a016719..fa7a016719 100644
--- a/modules/acore/scripts-wotlk/Events/love_in_air.cpp
+++ b/src/scripts/Events/love_in_air.cpp
diff --git a/modules/acore/scripts-wotlk/Events/midsummer.cpp b/src/scripts/Events/midsummer.cpp
index 8fce374e70..8fce374e70 100644
--- a/modules/acore/scripts-wotlk/Events/midsummer.cpp
+++ b/src/scripts/Events/midsummer.cpp
diff --git a/modules/acore/scripts-wotlk/Events/pilgrims_bounty.cpp b/src/scripts/Events/pilgrims_bounty.cpp
index 6d8f20ccb3..6d8f20ccb3 100644
--- a/modules/acore/scripts-wotlk/Events/pilgrims_bounty.cpp
+++ b/src/scripts/Events/pilgrims_bounty.cpp
diff --git a/modules/acore/scripts-wotlk/Events/winter_veil.cpp b/src/scripts/Events/winter_veil.cpp
index 84f53a63fc..84f53a63fc 100644
--- a/modules/acore/scripts-wotlk/Events/winter_veil.cpp
+++ b/src/scripts/Events/winter_veil.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h b/src/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
index 836dca3391..836dca3391 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
+++ b/src/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
diff --git a/modules/acore/scripts-wotlk/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
index e6f374e0d0..e6f374e0d0 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+++ b/src/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
diff --git a/src/scripts/Kalimdor/CMakeLists.txt b/src/scripts/Kalimdor/CMakeLists.txt
new file mode 100644
index 0000000000..2f78d50875
--- /dev/null
+++ b/src/scripts/Kalimdor/CMakeLists.txt
@@ -0,0 +1,110 @@
+# Copyright (C) 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+set(scripts_STAT_SRCS
+  ${scripts_STAT_SRCS}
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_stonetalon_mountains.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_silithus.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_moonglade.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/RazorfenDowns/razorfen_downs.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/RazorfenDowns/razorfen_downs.h
+  ${AC_SCRIPTS_DIR}/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/ZulFarrak/zulfarrak.h
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_azuremyst_isle.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_orgrimmar.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_desolace.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_feralas.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/Maraudon/instance_maraudon.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/Maraudon/maraudon.h
+  ${AC_SCRIPTS_DIR}/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
+  ${AC_SCRIPTS_DIR}/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_darkshore.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
+  ${AC_SCRIPTS_DIR}/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_mulgore.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_bloodmyst_isle.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_thunder_bluff.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_azshara.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_the_barrens.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_ungoro_crater.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/WailingCaverns/wailing_caverns.h
+  ${AC_SCRIPTS_DIR}/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_durotar.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_felwood.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/boss_azuregos.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_tanaris.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_dustwallow_marsh.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_winterspring.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_thousand_needles.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_ashenvale.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/zone_teldrassil.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/OnyxiasLair/onyxias_lair.h
+  ${AC_SCRIPTS_DIR}/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/DireMaul/instance_dire_maul.cpp
+  ${AC_SCRIPTS_DIR}/Kalimdor/DireMaul/dire_maul.h
+)
+
+AC_ADD_SCRIPT_LOADER("Kalimdor" "${AC_SCRIPTS_DIR}/ScriptLoader.h")
+
+message("  -> Prepared: Kalimdor")
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
index 9bfb5577d0..9bfb5577d0 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
index 0d78fdaa18..0d78fdaa18 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
index 53f54b1dac..53f54b1dac 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
index 4007d85631..4007d85631 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
index 9d0eab4605..9d0eab4605 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
index 89caea2602..89caea2602 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
index 0215e02299..0215e02299 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
+++ b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
index 94ef07afe1..94ef07afe1 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
index 22deec3b33..22deec3b33 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
+++ b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
index da1da4ecd7..da1da4ecd7 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
index dcb18865ff..dcb18865ff 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
+++ b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
index fb908b6c81..fb908b6c81 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
index 4e800b8126..4e800b8126 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp b/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
index 8bc97d8795..8bc97d8795 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
index 182ec74e0d..182ec74e0d 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
index edbcad9b83..edbcad9b83 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
index 0c2f3f5871..0c2f3f5871 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
index 4d43f3b4a1..4d43f3b4a1 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h b/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
index 761388c16b..761388c16b 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
+++ b/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
index 89a97d944a..89a97d944a 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
index 0e53004270..0e53004270 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
index 0cf2f7e4b2..0cf2f7e4b2 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp
index b8563bfa6b..b8563bfa6b 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
index abac9a5963..abac9a5963 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
index 5f9ebd8a12..5f9ebd8a12 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
index 09500d6051..09500d6051 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
+++ b/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
index 55a806deb8..55a806deb8 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
index 5261403ee8..5261403ee8 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
index 528017d3c3..528017d3c3 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
index 68b4914415..68b4914415 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
index c5af9c9ab8..c5af9c9ab8 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
+++ b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h
index 0923449e4f..0923449e4f 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h
+++ b/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h
diff --git a/modules/acore/scripts-wotlk/Kalimdor/DireMaul/dire_maul.h b/src/scripts/Kalimdor/DireMaul/dire_maul.h
index b3d4bef398..b3d4bef398 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/DireMaul/dire_maul.h
+++ b/src/scripts/Kalimdor/DireMaul/dire_maul.h
diff --git a/modules/acore/scripts-wotlk/Kalimdor/DireMaul/instance_dire_maul.cpp b/src/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp
index 0c6e9d0e47..0c6e9d0e47 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/DireMaul/instance_dire_maul.cpp
+++ b/src/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/Maraudon/instance_maraudon.cpp b/src/scripts/Kalimdor/Maraudon/instance_maraudon.cpp
index b8eae70bbe..b8eae70bbe 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/Maraudon/instance_maraudon.cpp
+++ b/src/scripts/Kalimdor/Maraudon/instance_maraudon.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/Maraudon/maraudon.h b/src/scripts/Kalimdor/Maraudon/maraudon.h
index 1f3c29ace1..1f3c29ace1 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/Maraudon/maraudon.h
+++ b/src/scripts/Kalimdor/Maraudon/maraudon.h
diff --git a/modules/acore/scripts-wotlk/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
index 4535c88f15..4535c88f15 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+++ b/src/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
index bb559566a9..bb559566a9 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
+++ b/src/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/OnyxiasLair/onyxias_lair.h b/src/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
index 8a119c2a6c..8a119c2a6c 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/OnyxiasLair/onyxias_lair.h
+++ b/src/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
diff --git a/modules/acore/scripts-wotlk/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp b/src/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp
index 1feafa82d8..1feafa82d8 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp
+++ b/src/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
index 5fbf83d7d9..5fbf83d7d9 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
+++ b/src/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
index 712030a8af..712030a8af 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/RazorfenDowns/razorfen_downs.cpp
+++ b/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/RazorfenDowns/razorfen_downs.h b/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h
index fe27d1fef9..fe27d1fef9 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/RazorfenDowns/razorfen_downs.h
+++ b/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h
diff --git a/modules/acore/scripts-wotlk/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
index 60d8a141b7..60d8a141b7 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
+++ b/src/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
index cbfaa03e32..cbfaa03e32 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
+++ b/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
index b901e4a0ca..b901e4a0ca 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+++ b/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
index 5cb4333ccf..5cb4333ccf 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
+++ b/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
index dfae29bb09..dfae29bb09 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
+++ b/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
index 35b5ac75af..35b5ac75af 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+++ b/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
index 6f9c95bbb6..6f9c95bbb6 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
+++ b/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
index 3e35c5e897..3e35c5e897 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
+++ b/src/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h b/src/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
index 7ae0b975f7..7ae0b975f7 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
+++ b/src/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
diff --git a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
index 4afd89658d..4afd89658d 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
+++ b/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
index 5ab39034e9..5ab39034e9 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+++ b/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
index e54358430b..e54358430b 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
+++ b/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
index 1f8d477405..1f8d477405 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
+++ b/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
index 466e054c91..466e054c91 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
+++ b/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
index 52336ed1f4..52336ed1f4 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
+++ b/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
index eb4dc47b37..eb4dc47b37 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+++ b/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
index 81053347c3..81053347c3 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+++ b/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
index 92f4aea8c5..92f4aea8c5 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
+++ b/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
index f1ec789971..f1ec789971 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
+++ b/src/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
index 4313e54131..4313e54131 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
+++ b/src/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h b/src/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
index c6530383b0..c6530383b0 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
+++ b/src/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
diff --git a/modules/acore/scripts-wotlk/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
index 77da1560ae..77da1560ae 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
+++ b/src/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/WailingCaverns/wailing_caverns.h b/src/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
index 301453cff3..301453cff3 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/WailingCaverns/wailing_caverns.h
+++ b/src/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
diff --git a/modules/acore/scripts-wotlk/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
index 6ba2b53436..6ba2b53436 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+++ b/src/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/ZulFarrak/zulfarrak.h b/src/scripts/Kalimdor/ZulFarrak/zulfarrak.h
index aea47c9bbd..aea47c9bbd 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/ZulFarrak/zulfarrak.h
+++ b/src/scripts/Kalimdor/ZulFarrak/zulfarrak.h
diff --git a/modules/acore/scripts-wotlk/Kalimdor/boss_azuregos.cpp b/src/scripts/Kalimdor/boss_azuregos.cpp
index 61adafd647..61adafd647 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/boss_azuregos.cpp
+++ b/src/scripts/Kalimdor/boss_azuregos.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_ashenvale.cpp b/src/scripts/Kalimdor/zone_ashenvale.cpp
index bc161a350e..bc161a350e 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_ashenvale.cpp
+++ b/src/scripts/Kalimdor/zone_ashenvale.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_azshara.cpp b/src/scripts/Kalimdor/zone_azshara.cpp
index 85951b03b1..85951b03b1 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_azshara.cpp
+++ b/src/scripts/Kalimdor/zone_azshara.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_azuremyst_isle.cpp b/src/scripts/Kalimdor/zone_azuremyst_isle.cpp
index e58f882dcb..e58f882dcb 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_azuremyst_isle.cpp
+++ b/src/scripts/Kalimdor/zone_azuremyst_isle.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_bloodmyst_isle.cpp b/src/scripts/Kalimdor/zone_bloodmyst_isle.cpp
index c890aea85d..c890aea85d 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_bloodmyst_isle.cpp
+++ b/src/scripts/Kalimdor/zone_bloodmyst_isle.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_darkshore.cpp b/src/scripts/Kalimdor/zone_darkshore.cpp
index f08585fdbe..f08585fdbe 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_darkshore.cpp
+++ b/src/scripts/Kalimdor/zone_darkshore.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_desolace.cpp b/src/scripts/Kalimdor/zone_desolace.cpp
index dce8b86ce3..dce8b86ce3 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_desolace.cpp
+++ b/src/scripts/Kalimdor/zone_desolace.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_durotar.cpp b/src/scripts/Kalimdor/zone_durotar.cpp
index c5795f7b1e..c5795f7b1e 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_durotar.cpp
+++ b/src/scripts/Kalimdor/zone_durotar.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_dustwallow_marsh.cpp b/src/scripts/Kalimdor/zone_dustwallow_marsh.cpp
index 9b65b6c47d..9b65b6c47d 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_dustwallow_marsh.cpp
+++ b/src/scripts/Kalimdor/zone_dustwallow_marsh.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_felwood.cpp b/src/scripts/Kalimdor/zone_felwood.cpp
index c58f4e179f..c58f4e179f 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_felwood.cpp
+++ b/src/scripts/Kalimdor/zone_felwood.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_feralas.cpp b/src/scripts/Kalimdor/zone_feralas.cpp
index 53d2bb365c..53d2bb365c 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_feralas.cpp
+++ b/src/scripts/Kalimdor/zone_feralas.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_moonglade.cpp b/src/scripts/Kalimdor/zone_moonglade.cpp
index 710d4c7a13..710d4c7a13 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_moonglade.cpp
+++ b/src/scripts/Kalimdor/zone_moonglade.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_mulgore.cpp b/src/scripts/Kalimdor/zone_mulgore.cpp
index 02d9b46e56..02d9b46e56 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_mulgore.cpp
+++ b/src/scripts/Kalimdor/zone_mulgore.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_orgrimmar.cpp b/src/scripts/Kalimdor/zone_orgrimmar.cpp
index dcac512a31..dcac512a31 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_orgrimmar.cpp
+++ b/src/scripts/Kalimdor/zone_orgrimmar.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_silithus.cpp b/src/scripts/Kalimdor/zone_silithus.cpp
index 14e131e23c..14e131e23c 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_silithus.cpp
+++ b/src/scripts/Kalimdor/zone_silithus.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_stonetalon_mountains.cpp b/src/scripts/Kalimdor/zone_stonetalon_mountains.cpp
index c6998d54b9..c6998d54b9 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_stonetalon_mountains.cpp
+++ b/src/scripts/Kalimdor/zone_stonetalon_mountains.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_tanaris.cpp b/src/scripts/Kalimdor/zone_tanaris.cpp
index 73d8338fb9..73d8338fb9 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_tanaris.cpp
+++ b/src/scripts/Kalimdor/zone_tanaris.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_teldrassil.cpp b/src/scripts/Kalimdor/zone_teldrassil.cpp
index 0c34f00ce2..0c34f00ce2 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_teldrassil.cpp
+++ b/src/scripts/Kalimdor/zone_teldrassil.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_the_barrens.cpp b/src/scripts/Kalimdor/zone_the_barrens.cpp
index 0f2e87cb35..0f2e87cb35 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_the_barrens.cpp
+++ b/src/scripts/Kalimdor/zone_the_barrens.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_thousand_needles.cpp b/src/scripts/Kalimdor/zone_thousand_needles.cpp
index d22d8378f5..d22d8378f5 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_thousand_needles.cpp
+++ b/src/scripts/Kalimdor/zone_thousand_needles.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_thunder_bluff.cpp b/src/scripts/Kalimdor/zone_thunder_bluff.cpp
index f9b618c3eb..f9b618c3eb 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_thunder_bluff.cpp
+++ b/src/scripts/Kalimdor/zone_thunder_bluff.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_ungoro_crater.cpp b/src/scripts/Kalimdor/zone_ungoro_crater.cpp
index bbed4c6da9..bbed4c6da9 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_ungoro_crater.cpp
+++ b/src/scripts/Kalimdor/zone_ungoro_crater.cpp
diff --git a/modules/acore/scripts-wotlk/Kalimdor/zone_winterspring.cpp b/src/scripts/Kalimdor/zone_winterspring.cpp
index 0e6553ef4a..0e6553ef4a 100644
--- a/modules/acore/scripts-wotlk/Kalimdor/zone_winterspring.cpp
+++ b/src/scripts/Kalimdor/zone_winterspring.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h b/src/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
index 6fcb6a635c..6fcb6a635c 100644
--- a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
+++ b/src/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
diff --git a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
index 4f321a03f1..4f321a03f1 100644
--- a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
+++ b/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
index 9857b335cb..9857b335cb 100644
--- a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+++ b/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
index f49f96740d..f49f96740d 100644
--- a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
+++ b/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
index fe9f7e4bc1..fe9f7e4bc1 100644
--- a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
+++ b/src/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/ahnkahet.h b/src/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h
index 4b473c42da..4b473c42da 100644
--- a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/ahnkahet.h
+++ b/src/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h
diff --git a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
index 17036be18e..17036be18e 100644
--- a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
+++ b/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp b/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
index f8b739575c..f8b739575c 100644
--- a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
+++ b/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
index 4cdf8e2297..4cdf8e2297 100644
--- a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
+++ b/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
index b4c2b26072..b4c2b26072 100644
--- a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
+++ b/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
index f5ee977303..f5ee977303 100644
--- a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
+++ b/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/def_ahnkahet.h b/src/scripts/Northrend/AzjolNerub/ahnkahet/def_ahnkahet.h
index 7c4a551246..7c4a551246 100644
--- a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/def_ahnkahet.h
+++ b/src/scripts/Northrend/AzjolNerub/ahnkahet/def_ahnkahet.h
diff --git a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
index 93137958b9..93137958b9 100644
--- a/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
+++ b/src/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
diff --git a/src/scripts/Northrend/CMakeLists.txt b/src/scripts/Northrend/CMakeLists.txt
new file mode 100644
index 0000000000..0638a43cef
--- /dev/null
+++ b/src/scripts/Northrend/CMakeLists.txt
@@ -0,0 +1,201 @@
+# Copyright (C) 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+set(scripts_STAT_SRCS
+  ${scripts_STAT_SRCS}
+  ${AC_SCRIPTS_DIR}/Northrend/isle_of_conquest.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/zone_storm_peaks.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/Ulduar/ulduar.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/Ulduar/boss_thorim.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/Ulduar/boss_ignis.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/Ulduar/boss_hodir.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/Ulduar/boss_xt002.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/Ulduar/ulduar.h
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/Ulduar/boss_freya.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
+  ${AC_SCRIPTS_DIR}/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h
+  ${AC_SCRIPTS_DIR}/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h
+  ${AC_SCRIPTS_DIR}/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
+  ${AC_SCRIPTS_DIR}/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
+  ${AC_SCRIPTS_DIR}/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
+  ${AC_SCRIPTS_DIR}/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
+  ${AC_SCRIPTS_DIR}/Northrend/Nexus/Oculus/boss_eregos.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Nexus/Oculus/boss_drakos.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Nexus/Oculus/oculus.h
+  ${AC_SCRIPTS_DIR}/Northrend/Nexus/Oculus/boss_varos.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Nexus/Oculus/boss_urom.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Nexus/Oculus/oculus.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Nexus/Oculus/instance_oculus.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Nexus/Nexus/boss_ormorok.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Nexus/Nexus/instance_nexus.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Nexus/Nexus/boss_keristrasza.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Nexus/Nexus/boss_anomalus.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Nexus/Nexus/nexus.h
+  ${AC_SCRIPTS_DIR}/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
+  ${AC_SCRIPTS_DIR}/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
+  ${AC_SCRIPTS_DIR}/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Naxxramas/boss_loatheb.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Naxxramas/boss_anubrekhan.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Naxxramas/boss_maexxna.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Naxxramas/boss_patchwerk.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Naxxramas/boss_gothik.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Naxxramas/boss_faerlina.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Naxxramas/boss_gluth.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Naxxramas/boss_four_horsemen.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Naxxramas/naxxramas.h
+  ${AC_SCRIPTS_DIR}/Northrend/Naxxramas/boss_kelthuzad.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Naxxramas/boss_heigan.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Naxxramas/boss_thaddius.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Naxxramas/boss_razuvious.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Naxxramas/boss_sapphiron.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Naxxramas/instance_naxxramas.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Naxxramas/boss_grobbulus.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Naxxramas/boss_noth.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/zone_crystalsong_forest.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/VaultOfArchavon/boss_archavon.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/VaultOfArchavon/boss_koralon.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/VaultOfArchavon/vault_of_archavon.h
+  ${AC_SCRIPTS_DIR}/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/VaultOfArchavon/boss_emalon.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/VaultOfArchavon/boss_toravon.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/zone_sholazar_basin.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
+  ${AC_SCRIPTS_DIR}/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
+  ${AC_SCRIPTS_DIR}/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/zone_dragonblight.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/zone_grizzly_hills.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
+  ${AC_SCRIPTS_DIR}/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/AzjolNerub/ahnkahet/ahnkahet.h
+  ${AC_SCRIPTS_DIR}/Northrend/VioletHold/boss_zuramat.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/VioletHold/instance_violet_hold.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/VioletHold/boss_lavanthor.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/VioletHold/boss_cyanigosa.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/VioletHold/violet_hold.h
+  ${AC_SCRIPTS_DIR}/Northrend/VioletHold/boss_ichoron.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/VioletHold/boss_moragg.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/VioletHold/boss_xevozz.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/VioletHold/boss_erekem.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/VioletHold/violet_hold.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/IcecrownCitadel/icecrown_citadel.h
+  ${AC_SCRIPTS_DIR}/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/IcecrownCitadel/boss_festergut.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/IcecrownCitadel/boss_rotface.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/IcecrownCitadel/boss_sindragosa.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/zone_zuldrak.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/zone_wintergrasp.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/zone_icecrown.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Gundrak/boss_slad_ran.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Gundrak/instance_gundrak.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Gundrak/boss_drakkari_colossus.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Gundrak/gundrak.h
+  ${AC_SCRIPTS_DIR}/Northrend/Gundrak/boss_gal_darah.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Gundrak/boss_moorabi.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/Gundrak/boss_eck.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/zone_borean_tundra.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/zone_howling_fjord.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/zone_dalaran.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/DraktharonKeep/boss_trollgore.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/DraktharonKeep/boss_novos.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/DraktharonKeep/drak_tharon_keep.h
+  ${AC_SCRIPTS_DIR}/Northrend/DraktharonKeep/boss_tharon_ja.cpp
+  ${AC_SCRIPTS_DIR}/Northrend/DraktharonKeep/boss_dred.cpp
+)
+
+AC_ADD_SCRIPT_LOADER("Northrend" "${AC_SCRIPTS_DIR}/ScriptLoader.h")
+
+message("  -> Prepared: Northrend")
diff --git a/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
index 644cb882ff..644cb882ff 100644
--- a/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
+++ b/src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
index 13660f150a..13660f150a 100644
--- a/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
+++ b/src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h b/src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h
index 12764a1089..12764a1089 100644
--- a/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h
+++ b/src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h
diff --git a/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
index 86877fe1b6..86877fe1b6 100644
--- a/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
+++ b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
index 5df6762a03..5df6762a03 100644
--- a/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
+++ b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
index cdeb03bc1e..cdeb03bc1e 100644
--- a/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+++ b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
index e13751cc4c..e13751cc4c 100644
--- a/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
+++ b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
index c3e03e9407..c3e03e9407 100644
--- a/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
+++ b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h
index be7006015f..be7006015f 100644
--- a/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h
+++ b/src/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h
diff --git a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
index 6cd687e8cf..6cd687e8cf 100644
--- a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
+++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
index 2485f3e8a6..2485f3e8a6 100644
--- a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
+++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
index f2177ed976..f2177ed976 100644
--- a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
index 7a882fd2a9..7a882fd2a9 100644
--- a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
+++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
index c69f2c8228..c69f2c8228 100644
--- a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
+++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
index a337ca006e..a337ca006e 100644
--- a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
+++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
diff --git a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
index e34fb1f2e3..e34fb1f2e3 100644
--- a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
index f7f33122fa..f7f33122fa 100644
--- a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
+++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
index 505fd3f21e..505fd3f21e 100644
--- a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
index 167dc88940..167dc88940 100644
--- a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
index 6c8d0cc854..6c8d0cc854 100644
--- a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
index c3754805da..c3754805da 100644
--- a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
+++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
index ef14494ca6..ef14494ca6 100644
--- a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
+++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
index 628dddd9f8..628dddd9f8 100644
--- a/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
+++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
diff --git a/modules/acore/scripts-wotlk/Northrend/DraktharonKeep/boss_dred.cpp b/src/scripts/Northrend/DraktharonKeep/boss_dred.cpp
index 85b35befcd..85b35befcd 100644
--- a/modules/acore/scripts-wotlk/Northrend/DraktharonKeep/boss_dred.cpp
+++ b/src/scripts/Northrend/DraktharonKeep/boss_dred.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/DraktharonKeep/boss_novos.cpp b/src/scripts/Northrend/DraktharonKeep/boss_novos.cpp
index 314c0bf68f..314c0bf68f 100644
--- a/modules/acore/scripts-wotlk/Northrend/DraktharonKeep/boss_novos.cpp
+++ b/src/scripts/Northrend/DraktharonKeep/boss_novos.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
index 3d6680561a..3d6680561a 100644
--- a/modules/acore/scripts-wotlk/Northrend/DraktharonKeep/boss_tharon_ja.cpp
+++ b/src/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
index 8ecaf6dc25..8ecaf6dc25 100644
--- a/modules/acore/scripts-wotlk/Northrend/DraktharonKeep/boss_trollgore.cpp
+++ b/src/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/DraktharonKeep/drak_tharon_keep.h b/src/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h
index 9662120202..9662120202 100644
--- a/modules/acore/scripts-wotlk/Northrend/DraktharonKeep/drak_tharon_keep.h
+++ b/src/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h
diff --git a/modules/acore/scripts-wotlk/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
index 4f3d187022..4f3d187022 100644
--- a/modules/acore/scripts-wotlk/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
+++ b/src/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
index 9a3cbb086b..9a3cbb086b 100644
--- a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+++ b/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
index 1e6374a8b1..1e6374a8b1 100644
--- a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
+++ b/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
index 4e866de086..4e866de086 100644
--- a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
+++ b/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h b/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
index 827343609a..827343609a 100644
--- a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
+++ b/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
diff --git a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
index c4e89210c9..c4e89210c9 100644
--- a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
+++ b/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
index b7e188994a..b7e188994a 100644
--- a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
+++ b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
index ffd6d649e6..ffd6d649e6 100644
--- a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
+++ b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
index c309c6db6a..c309c6db6a 100644
--- a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+++ b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
index 24de4de997..24de4de997 100644
--- a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
+++ b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
diff --git a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
index b08ddc60ae..b08ddc60ae 100644
--- a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+++ b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
index 96a201c673..96a201c673 100644
--- a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+++ b/src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
index d4bbae2b95..d4bbae2b95 100644
--- a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+++ b/src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
index 50118f479c..50118f479c 100644
--- a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
+++ b/src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
index f1d92cf908..f1d92cf908 100644
--- a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
+++ b/src/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
index 867f510432..867f510432 100644
--- a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
+++ b/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h b/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
index 97effee536..97effee536 100644
--- a/modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
+++ b/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
diff --git a/modules/acore/scripts-wotlk/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
index c6ffa47922..c6ffa47922 100644
--- a/modules/acore/scripts-wotlk/Northrend/Gundrak/boss_drakkari_colossus.cpp
+++ b/src/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Gundrak/boss_eck.cpp b/src/scripts/Northrend/Gundrak/boss_eck.cpp
index fc28e8431c..fc28e8431c 100644
--- a/modules/acore/scripts-wotlk/Northrend/Gundrak/boss_eck.cpp
+++ b/src/scripts/Northrend/Gundrak/boss_eck.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Gundrak/boss_gal_darah.cpp b/src/scripts/Northrend/Gundrak/boss_gal_darah.cpp
index 5603cba1ad..5603cba1ad 100644
--- a/modules/acore/scripts-wotlk/Northrend/Gundrak/boss_gal_darah.cpp
+++ b/src/scripts/Northrend/Gundrak/boss_gal_darah.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Gundrak/boss_moorabi.cpp b/src/scripts/Northrend/Gundrak/boss_moorabi.cpp
index b8e4baba28..b8e4baba28 100644
--- a/modules/acore/scripts-wotlk/Northrend/Gundrak/boss_moorabi.cpp
+++ b/src/scripts/Northrend/Gundrak/boss_moorabi.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Gundrak/boss_slad_ran.cpp b/src/scripts/Northrend/Gundrak/boss_slad_ran.cpp
index a8dcb98174..a8dcb98174 100644
--- a/modules/acore/scripts-wotlk/Northrend/Gundrak/boss_slad_ran.cpp
+++ b/src/scripts/Northrend/Gundrak/boss_slad_ran.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Gundrak/gundrak.h b/src/scripts/Northrend/Gundrak/gundrak.h
index f8fa15b7e7..f8fa15b7e7 100644
--- a/modules/acore/scripts-wotlk/Northrend/Gundrak/gundrak.h
+++ b/src/scripts/Northrend/Gundrak/gundrak.h
diff --git a/modules/acore/scripts-wotlk/Northrend/Gundrak/instance_gundrak.cpp b/src/scripts/Northrend/Gundrak/instance_gundrak.cpp
index 332f61198f..332f61198f 100644
--- a/modules/acore/scripts-wotlk/Northrend/Gundrak/instance_gundrak.cpp
+++ b/src/scripts/Northrend/Gundrak/instance_gundrak.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
index 62c9998720..62c9998720 100644
--- a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
+++ b/src/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
index 3b1dc19576..3b1dc19576 100644
--- a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+++ b/src/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
index 72258a2ce8..72258a2ce8 100644
--- a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
+++ b/src/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
index 546876fae2..546876fae2 100644
--- a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_festergut.cpp
+++ b/src/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
index ea56eb634d..ea56eb634d 100644
--- a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
+++ b/src/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
index 454ddbbde5..454ddbbde5 100644
--- a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
+++ b/src/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
index 2b259d76ee..2b259d76ee 100644
--- a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
+++ b/src/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
index 70a7869471..70a7869471 100644
--- a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
+++ b/src/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
index 64a411ee2f..64a411ee2f 100644
--- a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_rotface.cpp
+++ b/src/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
index b4b29a62e9..b4b29a62e9 100644
--- a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_sindragosa.cpp
+++ b/src/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
index deeef24de7..deeef24de7 100644
--- a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+++ b/src/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
index f1b63ff484..f1b63ff484 100644
--- a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
+++ b/src/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
index 00495855a6..00495855a6 100644
--- a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+++ b/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
index d3f9ddc7df..d3f9ddc7df 100644
--- a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/icecrown_citadel.h
+++ b/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
diff --git a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp b/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
index 6327a22e72..6327a22e72 100644
--- a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
+++ b/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
index 951e613b27..951e613b27 100644
--- a/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+++ b/src/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
index ad34df46d1..ad34df46d1 100644
--- a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_anubrekhan.cpp
+++ b/src/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_faerlina.cpp b/src/scripts/Northrend/Naxxramas/boss_faerlina.cpp
index 7cd7c96a9f..7cd7c96a9f 100644
--- a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_faerlina.cpp
+++ b/src/scripts/Northrend/Naxxramas/boss_faerlina.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
index b4ca9a5441..b4ca9a5441 100644
--- a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_four_horsemen.cpp
+++ b/src/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_gluth.cpp b/src/scripts/Northrend/Naxxramas/boss_gluth.cpp
index c8b7b80008..c8b7b80008 100644
--- a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_gluth.cpp
+++ b/src/scripts/Northrend/Naxxramas/boss_gluth.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_gothik.cpp b/src/scripts/Northrend/Naxxramas/boss_gothik.cpp
index 5b196f9137..5b196f9137 100644
--- a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_gothik.cpp
+++ b/src/scripts/Northrend/Naxxramas/boss_gothik.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_grobbulus.cpp b/src/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
index c59d58f091..c59d58f091 100644
--- a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_grobbulus.cpp
+++ b/src/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_heigan.cpp b/src/scripts/Northrend/Naxxramas/boss_heigan.cpp
index 5a388ac479..5a388ac479 100644
--- a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_heigan.cpp
+++ b/src/scripts/Northrend/Naxxramas/boss_heigan.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
index 8de6f2b70d..8de6f2b70d 100644
--- a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_kelthuzad.cpp
+++ b/src/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_loatheb.cpp b/src/scripts/Northrend/Naxxramas/boss_loatheb.cpp
index 3b82192f44..3b82192f44 100644
--- a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_loatheb.cpp
+++ b/src/scripts/Northrend/Naxxramas/boss_loatheb.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_maexxna.cpp b/src/scripts/Northrend/Naxxramas/boss_maexxna.cpp
index 5ca0f55f49..5ca0f55f49 100644
--- a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_maexxna.cpp
+++ b/src/scripts/Northrend/Naxxramas/boss_maexxna.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_noth.cpp b/src/scripts/Northrend/Naxxramas/boss_noth.cpp
index 58553c3c9f..58553c3c9f 100644
--- a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_noth.cpp
+++ b/src/scripts/Northrend/Naxxramas/boss_noth.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_patchwerk.cpp b/src/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
index e792509335..e792509335 100644
--- a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_patchwerk.cpp
+++ b/src/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_razuvious.cpp b/src/scripts/Northrend/Naxxramas/boss_razuvious.cpp
index 3ccbbb5720..3ccbbb5720 100644
--- a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_razuvious.cpp
+++ b/src/scripts/Northrend/Naxxramas/boss_razuvious.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_sapphiron.cpp b/src/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
index 3b55f2adfa..3b55f2adfa 100644
--- a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_sapphiron.cpp
+++ b/src/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_thaddius.cpp b/src/scripts/Northrend/Naxxramas/boss_thaddius.cpp
index 0f092ee78a..0f092ee78a 100644
--- a/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_thaddius.cpp
+++ b/src/scripts/Northrend/Naxxramas/boss_thaddius.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Naxxramas/instance_naxxramas.cpp b/src/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
index 51a5e07701..51a5e07701 100644
--- a/modules/acore/scripts-wotlk/Northrend/Naxxramas/instance_naxxramas.cpp
+++ b/src/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Naxxramas/naxxramas.h b/src/scripts/Northrend/Naxxramas/naxxramas.h
index d9de0fb605..d9de0fb605 100644
--- a/modules/acore/scripts-wotlk/Northrend/Naxxramas/naxxramas.h
+++ b/src/scripts/Northrend/Naxxramas/naxxramas.h
diff --git a/modules/acore/scripts-wotlk/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
index 4bbd806707..4bbd806707 100644
--- a/modules/acore/scripts-wotlk/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+++ b/src/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h b/src/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
index 9322239070..9322239070 100644
--- a/modules/acore/scripts-wotlk/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
+++ b/src/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
diff --git a/modules/acore/scripts-wotlk/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
index f52628dbec..f52628dbec 100644
--- a/modules/acore/scripts-wotlk/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
+++ b/src/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
index 7ed901c5c0..7ed901c5c0 100644
--- a/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/boss_anomalus.cpp
+++ b/src/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp b/src/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp
index 9c3f9ae58b..9c3f9ae58b 100644
--- a/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp
+++ b/src/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
index ce42913406..ce42913406 100644
--- a/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/boss_keristrasza.cpp
+++ b/src/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
index 0152408231..0152408231 100644
--- a/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+++ b/src/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
index b9c2ff4b37..b9c2ff4b37 100644
--- a/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/boss_ormorok.cpp
+++ b/src/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
index 532d078c58..532d078c58 100644
--- a/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/instance_nexus.cpp
+++ b/src/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/nexus.h b/src/scripts/Northrend/Nexus/Nexus/nexus.h
index 8d275edbcf..8d275edbcf 100644
--- a/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/nexus.h
+++ b/src/scripts/Northrend/Nexus/Nexus/nexus.h
diff --git a/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
index 49c5be90f3..49c5be90f3 100644
--- a/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/boss_drakos.cpp
+++ b/src/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
index e76b5b73e9..e76b5b73e9 100644
--- a/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/boss_eregos.cpp
+++ b/src/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/boss_urom.cpp b/src/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
index 9fd7b6a5a3..9fd7b6a5a3 100644
--- a/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/boss_urom.cpp
+++ b/src/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/boss_varos.cpp b/src/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
index 4bc3bf93d1..4bc3bf93d1 100644
--- a/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/boss_varos.cpp
+++ b/src/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
index 15c2e0101c..15c2e0101c 100644
--- a/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/instance_oculus.cpp
+++ b/src/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/oculus.cpp b/src/scripts/Northrend/Nexus/Oculus/oculus.cpp
index 1de6b7525b..1de6b7525b 100644
--- a/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/oculus.cpp
+++ b/src/scripts/Northrend/Nexus/Oculus/oculus.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/oculus.h b/src/scripts/Northrend/Nexus/Oculus/oculus.h
index 76812607e2..76812607e2 100644
--- a/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/oculus.h
+++ b/src/scripts/Northrend/Nexus/Oculus/oculus.h
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
index 73fec131e5..73fec131e5 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
+++ b/src/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
index bd0eff7baf..bd0eff7baf 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
+++ b/src/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
index 068446b8e2..068446b8e2 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
+++ b/src/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
index fdab1377f8..fdab1377f8 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
+++ b/src/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h b/src/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
index a5cd5da90d..a5cd5da90d 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
+++ b/src/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
index bb3e7e6ab6..bb3e7e6ab6 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
+++ b/src/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
index fd941671d7..fd941671d7 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
+++ b/src/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
index a8134ded92..a8134ded92 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
+++ b/src/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
index b8d6fead42..b8d6fead42 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
+++ b/src/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp b/src/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
index 35da0f744a..35da0f744a 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
+++ b/src/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/halls_of_stone.h b/src/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
index 6c6e529b93..6c6e529b93 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
+++ b/src/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
index 0347a54f5e..0347a54f5e 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
+++ b/src/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
index c15969d45e..c15969d45e 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
+++ b/src/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
index bb7b8a2606..bb7b8a2606 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
+++ b/src/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
index d060f44a0f..d060f44a0f 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
+++ b/src/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
index 009456e64d..009456e64d 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+++ b/src/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
index 4a77d7e50c..4a77d7e50c 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_freya.cpp
+++ b/src/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
index 1ed0600fa7..1ed0600fa7 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
+++ b/src/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
index 79d4a7c5aa..79d4a7c5aa 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_hodir.cpp
+++ b/src/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
index 66f29bde53..66f29bde53 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_ignis.cpp
+++ b/src/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
index eea4947c80..eea4947c80 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
+++ b/src/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
index f9e7868f8a..f9e7868f8a 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
+++ b/src/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
index c618f4dd81..c618f4dd81 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
+++ b/src/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
index 2e8eaa14ad..2e8eaa14ad 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_thorim.cpp
+++ b/src/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
index 3b09163f2b..3b09163f2b 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_xt002.cpp
+++ b/src/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp b/src/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
index 88626d9f6d..88626d9f6d 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
+++ b/src/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
index 1ad6049800..1ad6049800 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
+++ b/src/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/ulduar.cpp b/src/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp
index f04bc22548..f04bc22548 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/ulduar.cpp
+++ b/src/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/ulduar.h b/src/scripts/Northrend/Ulduar/Ulduar/ulduar.h
index cf478822b7..cf478822b7 100644
--- a/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/ulduar.h
+++ b/src/scripts/Northrend/Ulduar/Ulduar/ulduar.h
diff --git a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
index 6d55956dd6..6d55956dd6 100644
--- a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+++ b/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
index 0a5a764c22..0a5a764c22 100644
--- a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
+++ b/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
index 1e4de98558..1e4de98558 100644
--- a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
+++ b/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
index c671e76f55..c671e76f55 100644
--- a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
+++ b/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
index c95a996b5a..c95a996b5a 100644
--- a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
+++ b/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h b/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
index 7c41be1d59..7c41be1d59 100644
--- a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
+++ b/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
diff --git a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
index 4ec277183b..4ec277183b 100644
--- a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
+++ b/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
index 2e581e6c96..2e581e6c96 100644
--- a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+++ b/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
index 87b4197617..87b4197617 100644
--- a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+++ b/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
index 4be999e0cd..4be999e0cd 100644
--- a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
+++ b/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
index e38b10596e..e38b10596e 100644
--- a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
+++ b/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h b/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
index 4486ed64f3..4486ed64f3 100644
--- a/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
+++ b/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
diff --git a/modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
index 14f8f5e56d..14f8f5e56d 100644
--- a/modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/boss_archavon.cpp
+++ b/src/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
index 66c1abef07..66c1abef07 100644
--- a/modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/boss_emalon.cpp
+++ b/src/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
index d945af1b09..d945af1b09 100644
--- a/modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/boss_koralon.cpp
+++ b/src/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
index 8ebe9bea37..8ebe9bea37 100644
--- a/modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/boss_toravon.cpp
+++ b/src/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp b/src/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
index 88ec14c329..88ec14c329 100644
--- a/modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
+++ b/src/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/vault_of_archavon.h b/src/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h
index cd09aa9706..cd09aa9706 100644
--- a/modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/vault_of_archavon.h
+++ b/src/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h
diff --git a/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_cyanigosa.cpp b/src/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
index 710af5c2a7..710af5c2a7 100644
--- a/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_cyanigosa.cpp
+++ b/src/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_erekem.cpp b/src/scripts/Northrend/VioletHold/boss_erekem.cpp
index e5a31ff36a..e5a31ff36a 100644
--- a/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_erekem.cpp
+++ b/src/scripts/Northrend/VioletHold/boss_erekem.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_ichoron.cpp b/src/scripts/Northrend/VioletHold/boss_ichoron.cpp
index 2aec3b5fa1..2aec3b5fa1 100644
--- a/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_ichoron.cpp
+++ b/src/scripts/Northrend/VioletHold/boss_ichoron.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_lavanthor.cpp b/src/scripts/Northrend/VioletHold/boss_lavanthor.cpp
index 99fe854c3b..99fe854c3b 100644
--- a/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_lavanthor.cpp
+++ b/src/scripts/Northrend/VioletHold/boss_lavanthor.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_moragg.cpp b/src/scripts/Northrend/VioletHold/boss_moragg.cpp
index e5f73d24b9..e5f73d24b9 100644
--- a/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_moragg.cpp
+++ b/src/scripts/Northrend/VioletHold/boss_moragg.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_xevozz.cpp b/src/scripts/Northrend/VioletHold/boss_xevozz.cpp
index e3fe758664..e3fe758664 100644
--- a/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_xevozz.cpp
+++ b/src/scripts/Northrend/VioletHold/boss_xevozz.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_zuramat.cpp b/src/scripts/Northrend/VioletHold/boss_zuramat.cpp
index b276fe2d92..b276fe2d92 100644
--- a/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_zuramat.cpp
+++ b/src/scripts/Northrend/VioletHold/boss_zuramat.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/VioletHold/instance_violet_hold.cpp b/src/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index f843f56ca3..f843f56ca3 100644
--- a/modules/acore/scripts-wotlk/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/scripts/Northrend/VioletHold/instance_violet_hold.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/VioletHold/violet_hold.cpp b/src/scripts/Northrend/VioletHold/violet_hold.cpp
index f467850b93..f467850b93 100644
--- a/modules/acore/scripts-wotlk/Northrend/VioletHold/violet_hold.cpp
+++ b/src/scripts/Northrend/VioletHold/violet_hold.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/VioletHold/violet_hold.h b/src/scripts/Northrend/VioletHold/violet_hold.h
index 8ed4fa80bf..8ed4fa80bf 100644
--- a/modules/acore/scripts-wotlk/Northrend/VioletHold/violet_hold.h
+++ b/src/scripts/Northrend/VioletHold/violet_hold.h
diff --git a/modules/acore/scripts-wotlk/Northrend/isle_of_conquest.cpp b/src/scripts/Northrend/isle_of_conquest.cpp
index f731c4bfaa..f731c4bfaa 100644
--- a/modules/acore/scripts-wotlk/Northrend/isle_of_conquest.cpp
+++ b/src/scripts/Northrend/isle_of_conquest.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/zone_borean_tundra.cpp b/src/scripts/Northrend/zone_borean_tundra.cpp
index b22630bec2..b22630bec2 100644
--- a/modules/acore/scripts-wotlk/Northrend/zone_borean_tundra.cpp
+++ b/src/scripts/Northrend/zone_borean_tundra.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/zone_crystalsong_forest.cpp b/src/scripts/Northrend/zone_crystalsong_forest.cpp
index 463c12ae25..463c12ae25 100644
--- a/modules/acore/scripts-wotlk/Northrend/zone_crystalsong_forest.cpp
+++ b/src/scripts/Northrend/zone_crystalsong_forest.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/zone_dalaran.cpp b/src/scripts/Northrend/zone_dalaran.cpp
index 546c91c3c5..546c91c3c5 100644
--- a/modules/acore/scripts-wotlk/Northrend/zone_dalaran.cpp
+++ b/src/scripts/Northrend/zone_dalaran.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/zone_dragonblight.cpp b/src/scripts/Northrend/zone_dragonblight.cpp
index 09153e73b5..09153e73b5 100644
--- a/modules/acore/scripts-wotlk/Northrend/zone_dragonblight.cpp
+++ b/src/scripts/Northrend/zone_dragonblight.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/zone_grizzly_hills.cpp b/src/scripts/Northrend/zone_grizzly_hills.cpp
index e9e7619faa..e9e7619faa 100644
--- a/modules/acore/scripts-wotlk/Northrend/zone_grizzly_hills.cpp
+++ b/src/scripts/Northrend/zone_grizzly_hills.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/zone_howling_fjord.cpp b/src/scripts/Northrend/zone_howling_fjord.cpp
index 4ce16fa6cd..4ce16fa6cd 100644
--- a/modules/acore/scripts-wotlk/Northrend/zone_howling_fjord.cpp
+++ b/src/scripts/Northrend/zone_howling_fjord.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/zone_icecrown.cpp b/src/scripts/Northrend/zone_icecrown.cpp
index 0f23cc53aa..0f23cc53aa 100644
--- a/modules/acore/scripts-wotlk/Northrend/zone_icecrown.cpp
+++ b/src/scripts/Northrend/zone_icecrown.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/zone_sholazar_basin.cpp b/src/scripts/Northrend/zone_sholazar_basin.cpp
index 0ec9a21411..0ec9a21411 100644
--- a/modules/acore/scripts-wotlk/Northrend/zone_sholazar_basin.cpp
+++ b/src/scripts/Northrend/zone_sholazar_basin.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/zone_storm_peaks.cpp b/src/scripts/Northrend/zone_storm_peaks.cpp
index bf6c247e46..bf6c247e46 100644
--- a/modules/acore/scripts-wotlk/Northrend/zone_storm_peaks.cpp
+++ b/src/scripts/Northrend/zone_storm_peaks.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/zone_wintergrasp.cpp b/src/scripts/Northrend/zone_wintergrasp.cpp
index 8ed8d325a7..8ed8d325a7 100644
--- a/modules/acore/scripts-wotlk/Northrend/zone_wintergrasp.cpp
+++ b/src/scripts/Northrend/zone_wintergrasp.cpp
diff --git a/modules/acore/scripts-wotlk/Northrend/zone_zuldrak.cpp b/src/scripts/Northrend/zone_zuldrak.cpp
index aa7062471c..aa7062471c 100644
--- a/modules/acore/scripts-wotlk/Northrend/zone_zuldrak.cpp
+++ b/src/scripts/Northrend/zone_zuldrak.cpp
diff --git a/src/scripts/OutdoorPvP/CMakeLists.txt b/src/scripts/OutdoorPvP/CMakeLists.txt
new file mode 100644
index 0000000000..6d4b6241d4
--- /dev/null
+++ b/src/scripts/OutdoorPvP/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Copyright (C) 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+set(scripts_STAT_SRCS
+  ${scripts_STAT_SRCS}
+  ${AC_SCRIPTS_DIR}/OutdoorPvP/OutdoorPvPTF.cpp
+  ${AC_SCRIPTS_DIR}/OutdoorPvP/OutdoorPvPSI.cpp
+  ${AC_SCRIPTS_DIR}/OutdoorPvP/OutdoorPvPSI.h
+  ${AC_SCRIPTS_DIR}/OutdoorPvP/OutdoorPvPZM.cpp
+  ${AC_SCRIPTS_DIR}/OutdoorPvP/OutdoorPvPNA.cpp
+  ${AC_SCRIPTS_DIR}/OutdoorPvP/OutdoorPvPHP.cpp
+  ${AC_SCRIPTS_DIR}/OutdoorPvP/OutdoorPvPTF.h
+  ${AC_SCRIPTS_DIR}/OutdoorPvP/OutdoorPvPEP.h
+  ${AC_SCRIPTS_DIR}/OutdoorPvP/OutdoorPvPEP.cpp
+  ${AC_SCRIPTS_DIR}/OutdoorPvP/OutdoorPvPHP.h
+  ${AC_SCRIPTS_DIR}/OutdoorPvP/OutdoorPvPZM.h
+  ${AC_SCRIPTS_DIR}/OutdoorPvP/OutdoorPvPNA.h
+  ${AC_SCRIPTS_DIR}/OutdoorPvP/OutdoorPvPGH.cpp
+  ${AC_SCRIPTS_DIR}/OutdoorPvP/OutdoorPvPGH.h
+)
+
+AC_ADD_SCRIPT_LOADER("OutdoorPvP" "${AC_SCRIPTS_DIR}/ScriptLoader.h")
+
+message("  -> Prepared: Outdoor PVP Zones")
diff --git a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPEP.cpp b/src/scripts/OutdoorPvP/OutdoorPvPEP.cpp
index 2c5dcd7a36..2c5dcd7a36 100644
--- a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPEP.cpp
+++ b/src/scripts/OutdoorPvP/OutdoorPvPEP.cpp
diff --git a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPEP.h b/src/scripts/OutdoorPvP/OutdoorPvPEP.h
index 7208af5721..7208af5721 100644
--- a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPEP.h
+++ b/src/scripts/OutdoorPvP/OutdoorPvPEP.h
diff --git a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPGH.cpp b/src/scripts/OutdoorPvP/OutdoorPvPGH.cpp
index 8205bdc763..8205bdc763 100644
--- a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPGH.cpp
+++ b/src/scripts/OutdoorPvP/OutdoorPvPGH.cpp
diff --git a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPGH.h b/src/scripts/OutdoorPvP/OutdoorPvPGH.h
index 01437b2b5c..01437b2b5c 100644
--- a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPGH.h
+++ b/src/scripts/OutdoorPvP/OutdoorPvPGH.h
diff --git a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPHP.cpp b/src/scripts/OutdoorPvP/OutdoorPvPHP.cpp
index fa9ed12534..fa9ed12534 100644
--- a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPHP.cpp
+++ b/src/scripts/OutdoorPvP/OutdoorPvPHP.cpp
diff --git a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPHP.h b/src/scripts/OutdoorPvP/OutdoorPvPHP.h
index 49acede922..49acede922 100644
--- a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPHP.h
+++ b/src/scripts/OutdoorPvP/OutdoorPvPHP.h
diff --git a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPNA.cpp b/src/scripts/OutdoorPvP/OutdoorPvPNA.cpp
index 0c6acab618..0c6acab618 100644
--- a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPNA.cpp
+++ b/src/scripts/OutdoorPvP/OutdoorPvPNA.cpp
diff --git a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPNA.h b/src/scripts/OutdoorPvP/OutdoorPvPNA.h
index 3e9909c220..3e9909c220 100644
--- a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPNA.h
+++ b/src/scripts/OutdoorPvP/OutdoorPvPNA.h
diff --git a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPSI.cpp b/src/scripts/OutdoorPvP/OutdoorPvPSI.cpp
index ae17829f88..ae17829f88 100644
--- a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPSI.cpp
+++ b/src/scripts/OutdoorPvP/OutdoorPvPSI.cpp
diff --git a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPSI.h b/src/scripts/OutdoorPvP/OutdoorPvPSI.h
index 9589dfc97e..9589dfc97e 100644
--- a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPSI.h
+++ b/src/scripts/OutdoorPvP/OutdoorPvPSI.h
diff --git a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPTF.cpp b/src/scripts/OutdoorPvP/OutdoorPvPTF.cpp
index 3fa7b8399a..3fa7b8399a 100644
--- a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPTF.cpp
+++ b/src/scripts/OutdoorPvP/OutdoorPvPTF.cpp
diff --git a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPTF.h b/src/scripts/OutdoorPvP/OutdoorPvPTF.h
index 9c672a80ae..9c672a80ae 100644
--- a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPTF.h
+++ b/src/scripts/OutdoorPvP/OutdoorPvPTF.h
diff --git a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPZM.cpp b/src/scripts/OutdoorPvP/OutdoorPvPZM.cpp
index 22418cebb2..22418cebb2 100644
--- a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPZM.cpp
+++ b/src/scripts/OutdoorPvP/OutdoorPvPZM.cpp
diff --git a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPZM.h b/src/scripts/OutdoorPvP/OutdoorPvPZM.h
index 1944989c2a..1944989c2a 100644
--- a/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPZM.h
+++ b/src/scripts/OutdoorPvP/OutdoorPvPZM.h
diff --git a/modules/acore/scripts-wotlk/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
index b96537be4a..b96537be4a 100644
--- a/modules/acore/scripts-wotlk/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
+++ b/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
index 3bd74a3699..3bd74a3699 100644
--- a/modules/acore/scripts-wotlk/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
+++ b/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
index df5a467bfb..df5a467bfb 100644
--- a/modules/acore/scripts-wotlk/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
+++ b/src/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp b/src/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
index 2b2143ace4..2b2143ace4 100644
--- a/modules/acore/scripts-wotlk/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
+++ b/src/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
index 663b4033f8..663b4033f8 100644
--- a/modules/acore/scripts-wotlk/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
+++ b/src/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/Auchindoun/SethekkHalls/sethekk_halls.h b/src/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
index 2899bb5a4d..2899bb5a4d 100644
--- a/modules/acore/scripts-wotlk/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
+++ b/src/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
diff --git a/modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
index 802c5cc7ed..802c5cc7ed 100644
--- a/modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
+++ b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
index 3967015f2a..3967015f2a 100644
--- a/modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+++ b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
index dc27c49a3f..dc27c49a3f 100644
--- a/modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
+++ b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
index 7ef1b59654..7ef1b59654 100644
--- a/modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+++ b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
index 5baaee4a8f..5baaee4a8f 100644
--- a/modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
+++ b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
index 731b99b3eb..731b99b3eb 100644
--- a/modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
+++ b/src/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
diff --git a/modules/acore/scripts-wotlk/Outland/BlackTemple/black_temple.h b/src/scripts/Outland/BlackTemple/black_temple.h
index 71b6d62554..71b6d62554 100644
--- a/modules/acore/scripts-wotlk/Outland/BlackTemple/black_temple.h
+++ b/src/scripts/Outland/BlackTemple/black_temple.h
diff --git a/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_bloodboil.cpp b/src/scripts/Outland/BlackTemple/boss_bloodboil.cpp
index fc519efb7c..fc519efb7c 100644
--- a/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_bloodboil.cpp
+++ b/src/scripts/Outland/BlackTemple/boss_bloodboil.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_illidan.cpp b/src/scripts/Outland/BlackTemple/boss_illidan.cpp
index 3a4385a132..3a4385a132 100644
--- a/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/scripts/Outland/BlackTemple/boss_illidan.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
index 4f901cf9e7..4f901cf9e7 100644
--- a/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_mother_shahraz.cpp
+++ b/src/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
index 1b82156bac..1b82156bac 100644
--- a/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/src/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index 397c3ed6c6..397c3ed6c6 100644
--- a/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_supremus.cpp b/src/scripts/Outland/BlackTemple/boss_supremus.cpp
index b3070d9441..b3070d9441 100644
--- a/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_supremus.cpp
+++ b/src/scripts/Outland/BlackTemple/boss_supremus.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
index 4522597358..4522597358 100644
--- a/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
index ede34accdf..ede34accdf 100644
--- a/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_warlord_najentus.cpp
+++ b/src/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/BlackTemple/illidari_council.cpp b/src/scripts/Outland/BlackTemple/illidari_council.cpp
index cc7796a3c2..cc7796a3c2 100644
--- a/modules/acore/scripts-wotlk/Outland/BlackTemple/illidari_council.cpp
+++ b/src/scripts/Outland/BlackTemple/illidari_council.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/BlackTemple/instance_black_temple.cpp b/src/scripts/Outland/BlackTemple/instance_black_temple.cpp
index 11ba1af159..11ba1af159 100644
--- a/modules/acore/scripts-wotlk/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/scripts/Outland/BlackTemple/instance_black_temple.cpp
diff --git a/src/scripts/Outland/CMakeLists.txt b/src/scripts/Outland/CMakeLists.txt
new file mode 100644
index 0000000000..ecf94201e5
--- /dev/null
+++ b/src/scripts/Outland/CMakeLists.txt
@@ -0,0 +1,114 @@
+# Copyright (C) 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+set(scripts_STAT_SRCS
+  ${scripts_STAT_SRCS}
+  ${AC_SCRIPTS_DIR}/Outland/zone_nagrand.cpp
+  ${AC_SCRIPTS_DIR}/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
+  ${AC_SCRIPTS_DIR}/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
+  ${AC_SCRIPTS_DIR}/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+  ${AC_SCRIPTS_DIR}/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+  ${AC_SCRIPTS_DIR}/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+  ${AC_SCRIPTS_DIR}/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+  ${AC_SCRIPTS_DIR}/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+  ${AC_SCRIPTS_DIR}/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
+  ${AC_SCRIPTS_DIR}/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
+  ${AC_SCRIPTS_DIR}/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+  ${AC_SCRIPTS_DIR}/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
+  ${AC_SCRIPTS_DIR}/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+  ${AC_SCRIPTS_DIR}/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+  ${AC_SCRIPTS_DIR}/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
+  ${AC_SCRIPTS_DIR}/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+  ${AC_SCRIPTS_DIR}/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+  ${AC_SCRIPTS_DIR}/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+  ${AC_SCRIPTS_DIR}/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+  ${AC_SCRIPTS_DIR}/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
+  ${AC_SCRIPTS_DIR}/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+  ${AC_SCRIPTS_DIR}/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
+  ${AC_SCRIPTS_DIR}/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
+  ${AC_SCRIPTS_DIR}/Outland/CoilfangReservoir/SteamVault/steam_vault.h
+  ${AC_SCRIPTS_DIR}/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+  ${AC_SCRIPTS_DIR}/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+  ${AC_SCRIPTS_DIR}/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+  ${AC_SCRIPTS_DIR}/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
+  ${AC_SCRIPTS_DIR}/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+  ${AC_SCRIPTS_DIR}/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+  ${AC_SCRIPTS_DIR}/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+  ${AC_SCRIPTS_DIR}/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+  ${AC_SCRIPTS_DIR}/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
+  ${AC_SCRIPTS_DIR}/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
+  ${AC_SCRIPTS_DIR}/Outland/zone_shattrath_city.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/Mechanar/mechanar.h
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/Eye/the_eye.h
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/Eye/instance_the_eye.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/Eye/boss_astromancer.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/Eye/boss_alar.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/botanica/the_botanica.h
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/botanica/instance_the_botanica.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/botanica/boss_laj.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/arcatraz/arcatraz.h
+  ${AC_SCRIPTS_DIR}/Outland/TempestKeep/arcatraz/arcatraz.cpp
+  ${AC_SCRIPTS_DIR}/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
+  ${AC_SCRIPTS_DIR}/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
+  ${AC_SCRIPTS_DIR}/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
+  ${AC_SCRIPTS_DIR}/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
+  ${AC_SCRIPTS_DIR}/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
+  ${AC_SCRIPTS_DIR}/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
+  ${AC_SCRIPTS_DIR}/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
+  ${AC_SCRIPTS_DIR}/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+  ${AC_SCRIPTS_DIR}/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
+  ${AC_SCRIPTS_DIR}/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+  ${AC_SCRIPTS_DIR}/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
+  ${AC_SCRIPTS_DIR}/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
+  ${AC_SCRIPTS_DIR}/Outland/boss_doomwalker.cpp
+  ${AC_SCRIPTS_DIR}/Outland/zone_terokkar_forest.cpp
+  ${AC_SCRIPTS_DIR}/Outland/zone_hellfire_peninsula.cpp
+  ${AC_SCRIPTS_DIR}/Outland/boss_doomlord_kazzak.cpp
+  ${AC_SCRIPTS_DIR}/Outland/BlackTemple/boss_teron_gorefiend.cpp
+  ${AC_SCRIPTS_DIR}/Outland/BlackTemple/black_temple.h
+  ${AC_SCRIPTS_DIR}/Outland/BlackTemple/illidari_council.cpp
+  ${AC_SCRIPTS_DIR}/Outland/BlackTemple/boss_shade_of_akama.cpp
+  ${AC_SCRIPTS_DIR}/Outland/BlackTemple/boss_supremus.cpp
+  ${AC_SCRIPTS_DIR}/Outland/BlackTemple/boss_mother_shahraz.cpp
+  ${AC_SCRIPTS_DIR}/Outland/BlackTemple/instance_black_temple.cpp
+  ${AC_SCRIPTS_DIR}/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+  ${AC_SCRIPTS_DIR}/Outland/BlackTemple/boss_warlord_najentus.cpp
+  ${AC_SCRIPTS_DIR}/Outland/BlackTemple/boss_bloodboil.cpp
+  ${AC_SCRIPTS_DIR}/Outland/BlackTemple/boss_illidan.cpp
+  ${AC_SCRIPTS_DIR}/Outland/zone_shadowmoon_valley.cpp
+  ${AC_SCRIPTS_DIR}/Outland/zone_blades_edge_mountains.cpp
+  ${AC_SCRIPTS_DIR}/Outland/GruulsLair/boss_high_king_maulgar.cpp
+  ${AC_SCRIPTS_DIR}/Outland/GruulsLair/boss_gruul.cpp
+  ${AC_SCRIPTS_DIR}/Outland/GruulsLair/gruuls_lair.h
+  ${AC_SCRIPTS_DIR}/Outland/GruulsLair/instance_gruuls_lair.cpp
+  ${AC_SCRIPTS_DIR}/Outland/zone_netherstorm.cpp
+  ${AC_SCRIPTS_DIR}/Outland/zone_zangarmarsh.cpp
+)
+
+AC_ADD_SCRIPT_LOADER("Outland" "${AC_SCRIPTS_DIR}/ScriptLoader.h")
+
+message("  -> Prepared: Outland")
diff --git a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
index 514f5debde..514f5debde 100644
--- a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
index 8e58137112..8e58137112 100644
--- a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
index 1905cd0ab0..1905cd0ab0 100644
--- a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
index 9ee5df3534..9ee5df3534 100644
--- a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
index ff7c474135..ff7c474135 100644
--- a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
index 7d5069f43b..7d5069f43b 100644
--- a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
index 45a280381a..45a280381a 100644
--- a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
index 18d9fab7a2..18d9fab7a2 100644
--- a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
+++ b/src/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
diff --git a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp b/src/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
index bfe42ca1f0..bfe42ca1f0 100644
--- a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
+++ b/src/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
index 1467ab12f4..1467ab12f4 100644
--- a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
+++ b/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
index 379d93c13c..379d93c13c 100644
--- a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
+++ b/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
index d30af83d2d..d30af83d2d 100644
--- a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
+++ b/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
index 0c94ee147c..0c94ee147c 100644
--- a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+++ b/src/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SteamVault/steam_vault.h b/src/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
index 6f3376e249..6f3376e249 100644
--- a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SteamVault/steam_vault.h
+++ b/src/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
diff --git a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
index f488d307b9..f488d307b9 100644
--- a/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
+++ b/src/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/GruulsLair/boss_gruul.cpp b/src/scripts/Outland/GruulsLair/boss_gruul.cpp
index 79d2149cd1..79d2149cd1 100644
--- a/modules/acore/scripts-wotlk/Outland/GruulsLair/boss_gruul.cpp
+++ b/src/scripts/Outland/GruulsLair/boss_gruul.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
index f2eb0cc62c..f2eb0cc62c 100644
--- a/modules/acore/scripts-wotlk/Outland/GruulsLair/boss_high_king_maulgar.cpp
+++ b/src/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/GruulsLair/gruuls_lair.h b/src/scripts/Outland/GruulsLair/gruuls_lair.h
index 751764caf8..751764caf8 100644
--- a/modules/acore/scripts-wotlk/Outland/GruulsLair/gruuls_lair.h
+++ b/src/scripts/Outland/GruulsLair/gruuls_lair.h
diff --git a/modules/acore/scripts-wotlk/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
index 13dd6c0c9a..13dd6c0c9a 100644
--- a/modules/acore/scripts-wotlk/Outland/GruulsLair/instance_gruuls_lair.cpp
+++ b/src/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h b/src/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
index f5aef78362..f5aef78362 100644
--- a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
+++ b/src/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
diff --git a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
index 4af4685834..4af4685834 100644
--- a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+++ b/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
index 84e026ba13..84e026ba13 100644
--- a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+++ b/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
index 3e9fa5e758..3e9fa5e758 100644
--- a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
+++ b/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
index f8a2a7423c..f8a2a7423c 100644
--- a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+++ b/src/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
index 644dc30cfc..644dc30cfc 100644
--- a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+++ b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
index f3a7724b05..f3a7724b05 100644
--- a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
index 7b0d8b53a0..7b0d8b53a0 100644
--- a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+++ b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
index ae18802595..ae18802595 100644
--- a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
+++ b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
diff --git a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
index 6090f3d804..6090f3d804 100644
--- a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/src/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
index df0db28821..df0db28821 100644
--- a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
index 0d459433b2..0d459433b2 100644
--- a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
+++ b/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
index d82a2eb140..d82a2eb140 100644
--- a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
+++ b/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
diff --git a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
index ea336d9c04..ea336d9c04 100644
--- a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
index c67335dcd6..c67335dcd6 100644
--- a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+++ b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
index afb0d64c1e..afb0d64c1e 100644
--- a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+++ b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
index c504dc4230..c504dc4230 100644
--- a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+++ b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
index 4031e21bb6..4031e21bb6 100644
--- a/modules/acore/scripts-wotlk/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
+++ b/src/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/boss_alar.cpp b/src/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index eaa0632f38..eaa0632f38 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index acd4bcbefc..acd4bcbefc 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index dbd29d51f3..dbd29d51f3 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
index 1b658be009..1b658be009 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+++ b/src/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
index 4c94162e1e..4c94162e1e 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/instance_the_eye.cpp
+++ b/src/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/the_eye.h b/src/scripts/Outland/TempestKeep/Eye/the_eye.h
index 12d300789b..12d300789b 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/the_eye.h
+++ b/src/scripts/Outland/TempestKeep/Eye/the_eye.h
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
index 3f280b46eb..3f280b46eb 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
+++ b/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
index 63a5e406db..63a5e406db 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+++ b/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
index 7988a442e5..7988a442e5 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
+++ b/src/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
index 32c6d94dff..32c6d94dff 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
index d34006628a..d34006628a 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
index 6f4897bdc4..6f4897bdc4 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
+++ b/src/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/mechanar.h b/src/scripts/Outland/TempestKeep/Mechanar/mechanar.h
index d9074b0ddd..d9074b0ddd 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/mechanar.h
+++ b/src/scripts/Outland/TempestKeep/Mechanar/mechanar.h
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
index 6e24acb84b..6e24acb84b 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/arcatraz.h b/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
index cf801c4bb2..cf801c4bb2 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/arcatraz.h
+++ b/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp b/src/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
index a508cc7d39..a508cc7d39 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
+++ b/src/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
index 6a4397a0a0..6a4397a0a0 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/src/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
index fef59b753f..fef59b753f 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
+++ b/src/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/src/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
index 822c4e44e1..822c4e44e1 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
+++ b/src/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
index 54f4d92c8d..54f4d92c8d 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+++ b/src/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
index 2136e7264e..2136e7264e 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
+++ b/src/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
index ec5bf54308..ec5bf54308 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
+++ b/src/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/boss_laj.cpp b/src/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
index 1bbde7108b..1bbde7108b 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/boss_laj.cpp
+++ b/src/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/src/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
index 8c7dc3c6d6..8c7dc3c6d6 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
+++ b/src/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
index f06edb3647..f06edb3647 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+++ b/src/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/instance_the_botanica.cpp b/src/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
index e41a934fd5..e41a934fd5 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/instance_the_botanica.cpp
+++ b/src/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/the_botanica.h b/src/scripts/Outland/TempestKeep/botanica/the_botanica.h
index 386bfcf420..386bfcf420 100644
--- a/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/the_botanica.h
+++ b/src/scripts/Outland/TempestKeep/botanica/the_botanica.h
diff --git a/modules/acore/scripts-wotlk/Outland/boss_doomlord_kazzak.cpp b/src/scripts/Outland/boss_doomlord_kazzak.cpp
index e9fb73f956..e9fb73f956 100644
--- a/modules/acore/scripts-wotlk/Outland/boss_doomlord_kazzak.cpp
+++ b/src/scripts/Outland/boss_doomlord_kazzak.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/boss_doomwalker.cpp b/src/scripts/Outland/boss_doomwalker.cpp
index 83c4bdc14d..83c4bdc14d 100644
--- a/modules/acore/scripts-wotlk/Outland/boss_doomwalker.cpp
+++ b/src/scripts/Outland/boss_doomwalker.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/zone_blades_edge_mountains.cpp b/src/scripts/Outland/zone_blades_edge_mountains.cpp
index eba2bf35bc..eba2bf35bc 100644
--- a/modules/acore/scripts-wotlk/Outland/zone_blades_edge_mountains.cpp
+++ b/src/scripts/Outland/zone_blades_edge_mountains.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/zone_hellfire_peninsula.cpp b/src/scripts/Outland/zone_hellfire_peninsula.cpp
index c6d4281772..c6d4281772 100644
--- a/modules/acore/scripts-wotlk/Outland/zone_hellfire_peninsula.cpp
+++ b/src/scripts/Outland/zone_hellfire_peninsula.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/zone_nagrand.cpp b/src/scripts/Outland/zone_nagrand.cpp
index ad039a436c..ad039a436c 100644
--- a/modules/acore/scripts-wotlk/Outland/zone_nagrand.cpp
+++ b/src/scripts/Outland/zone_nagrand.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/zone_netherstorm.cpp b/src/scripts/Outland/zone_netherstorm.cpp
index 317838f157..317838f157 100644
--- a/modules/acore/scripts-wotlk/Outland/zone_netherstorm.cpp
+++ b/src/scripts/Outland/zone_netherstorm.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/zone_shadowmoon_valley.cpp b/src/scripts/Outland/zone_shadowmoon_valley.cpp
index c344234b8c..c344234b8c 100644
--- a/modules/acore/scripts-wotlk/Outland/zone_shadowmoon_valley.cpp
+++ b/src/scripts/Outland/zone_shadowmoon_valley.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/zone_shattrath_city.cpp b/src/scripts/Outland/zone_shattrath_city.cpp
index 89e6530192..89e6530192 100644
--- a/modules/acore/scripts-wotlk/Outland/zone_shattrath_city.cpp
+++ b/src/scripts/Outland/zone_shattrath_city.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/zone_terokkar_forest.cpp b/src/scripts/Outland/zone_terokkar_forest.cpp
index 9634dca786..9634dca786 100644
--- a/modules/acore/scripts-wotlk/Outland/zone_terokkar_forest.cpp
+++ b/src/scripts/Outland/zone_terokkar_forest.cpp
diff --git a/modules/acore/scripts-wotlk/Outland/zone_zangarmarsh.cpp b/src/scripts/Outland/zone_zangarmarsh.cpp
index a647ce56ea..a647ce56ea 100644
--- a/modules/acore/scripts-wotlk/Outland/zone_zangarmarsh.cpp
+++ b/src/scripts/Outland/zone_zangarmarsh.cpp
diff --git a/modules/acore/scripts-wotlk/Pet/CMakeLists.txt b/src/scripts/Pet/CMakeLists.txt
index 1e2f5eb912..a80f85d9c4 100644
--- a/modules/acore/scripts-wotlk/Pet/CMakeLists.txt
+++ b/src/scripts/Pet/CMakeLists.txt
@@ -10,14 +10,14 @@
 
 set(scripts_STAT_SRCS
   ${scripts_STAT_SRCS}
-  ${CMAKE_AC_MODULE_DIR}/Pet/pet_dk.cpp
-  ${CMAKE_AC_MODULE_DIR}/Pet/pet_generic.cpp
-  ${CMAKE_AC_MODULE_DIR}/Pet/pet_hunter.cpp
-  ${CMAKE_AC_MODULE_DIR}/Pet/pet_mage.cpp
-  ${CMAKE_AC_MODULE_DIR}/Pet/pet_priest.cpp
-  ${CMAKE_AC_MODULE_DIR}/Pet/pet_shaman.cpp
+  ${AC_SCRIPTS_DIR}/Pet/pet_dk.cpp
+  ${AC_SCRIPTS_DIR}/Pet/pet_generic.cpp
+  ${AC_SCRIPTS_DIR}/Pet/pet_hunter.cpp
+  ${AC_SCRIPTS_DIR}/Pet/pet_mage.cpp
+  ${AC_SCRIPTS_DIR}/Pet/pet_priest.cpp
+  ${AC_SCRIPTS_DIR}/Pet/pet_shaman.cpp
 )
 
-AC_ADD_SCRIPT_LOADER("Pet" "${CMAKE_AC_MODULE_DIR}/ScriptWotlkLoader.h")
+AC_ADD_SCRIPT_LOADER("Pet" "${AC_SCRIPTS_DIR}/ScriptLoader.h")
 
 message("  -> Prepared: Pet")
diff --git a/modules/acore/scripts-wotlk/Pet/pet_dk.cpp b/src/scripts/Pet/pet_dk.cpp
index 25daa39faf..25daa39faf 100644
--- a/modules/acore/scripts-wotlk/Pet/pet_dk.cpp
+++ b/src/scripts/Pet/pet_dk.cpp
diff --git a/modules/acore/scripts-wotlk/Pet/pet_generic.cpp b/src/scripts/Pet/pet_generic.cpp
index fd214985e8..fd214985e8 100644
--- a/modules/acore/scripts-wotlk/Pet/pet_generic.cpp
+++ b/src/scripts/Pet/pet_generic.cpp
diff --git a/modules/acore/scripts-wotlk/Pet/pet_hunter.cpp b/src/scripts/Pet/pet_hunter.cpp
index 66e6ba38bb..66e6ba38bb 100644
--- a/modules/acore/scripts-wotlk/Pet/pet_hunter.cpp
+++ b/src/scripts/Pet/pet_hunter.cpp
diff --git a/modules/acore/scripts-wotlk/Pet/pet_mage.cpp b/src/scripts/Pet/pet_mage.cpp
index 4f2a32ceff..4f2a32ceff 100644
--- a/modules/acore/scripts-wotlk/Pet/pet_mage.cpp
+++ b/src/scripts/Pet/pet_mage.cpp
diff --git a/modules/acore/scripts-wotlk/Pet/pet_priest.cpp b/src/scripts/Pet/pet_priest.cpp
index 3767034049..3767034049 100644
--- a/modules/acore/scripts-wotlk/Pet/pet_priest.cpp
+++ b/src/scripts/Pet/pet_priest.cpp
diff --git a/modules/acore/scripts-wotlk/Pet/pet_shaman.cpp b/src/scripts/Pet/pet_shaman.cpp
index 3c712a9120..3c712a9120 100644
--- a/modules/acore/scripts-wotlk/Pet/pet_shaman.cpp
+++ b/src/scripts/Pet/pet_shaman.cpp
diff --git a/src/scripts/ScriptLoader.cpp b/src/scripts/ScriptLoader.cpp
index 89ac21bb38..b6869836c7 100644
--- a/src/scripts/ScriptLoader.cpp
+++ b/src/scripts/ScriptLoader.cpp
@@ -18,13 +18,6 @@
 #include "ScriptLoader.h"
 #include "ScriptMgr.h"
 
-//examples
-void AddSC_example_creature();
-void AddSC_example_escort();
-void AddSC_example_gossip_codebox();
-void AddSC_example_misc();
-void AddSC_example_commandscript();
-
 // spells
 void AddSC_deathknight_spell_scripts();
 void AddSC_druid_spell_scripts();
diff --git a/modules/acore/scripts-wotlk/World/CMakeLists.txt b/src/scripts/World/CMakeLists.txt
index 62158d99e0..4fdcbba9e2 100644
--- a/modules/acore/scripts-wotlk/World/CMakeLists.txt
+++ b/src/scripts/World/CMakeLists.txt
@@ -10,17 +10,17 @@
 
 set(scripts_STAT_SRCS
   ${scripts_STAT_SRCS}
-  ${CMAKE_AC_MODULE_DIR}/World/achievement_scripts.cpp
-  ${CMAKE_AC_MODULE_DIR}/World/areatrigger_scripts.cpp
-  ${CMAKE_AC_MODULE_DIR}/World/boss_emerald_dragons.cpp
-  ${CMAKE_AC_MODULE_DIR}/World/go_scripts.cpp
-  ${CMAKE_AC_MODULE_DIR}/World/guards.cpp
-  ${CMAKE_AC_MODULE_DIR}/World/item_scripts.cpp
-  ${CMAKE_AC_MODULE_DIR}/World/mob_generic_creature.cpp
-  ${CMAKE_AC_MODULE_DIR}/World/npc_innkeeper.cpp
-  ${CMAKE_AC_MODULE_DIR}/World/npc_professions.cpp
-  ${CMAKE_AC_MODULE_DIR}/World/npc_taxi.cpp
-  ${CMAKE_AC_MODULE_DIR}/World/npcs_special.cpp
+  ${AC_SCRIPTS_DIR}/World/achievement_scripts.cpp
+  ${AC_SCRIPTS_DIR}/World/areatrigger_scripts.cpp
+  ${AC_SCRIPTS_DIR}/World/boss_emerald_dragons.cpp
+  ${AC_SCRIPTS_DIR}/World/go_scripts.cpp
+  ${AC_SCRIPTS_DIR}/World/guards.cpp
+  ${AC_SCRIPTS_DIR}/World/item_scripts.cpp
+  ${AC_SCRIPTS_DIR}/World/mob_generic_creature.cpp
+  ${AC_SCRIPTS_DIR}/World/npc_innkeeper.cpp
+  ${AC_SCRIPTS_DIR}/World/npc_professions.cpp
+  ${AC_SCRIPTS_DIR}/World/npc_taxi.cpp
+  ${AC_SCRIPTS_DIR}/World/npcs_special.cpp
 )
 
 AC_ADD_SCRIPT_LOADER("World" "ScriptLoader.h")
diff --git a/modules/acore/scripts-wotlk/World/achievement_scripts.cpp b/src/scripts/World/achievement_scripts.cpp
index e67d12b4f6..e67d12b4f6 100644
--- a/modules/acore/scripts-wotlk/World/achievement_scripts.cpp
+++ b/src/scripts/World/achievement_scripts.cpp
diff --git a/modules/acore/scripts-wotlk/World/areatrigger_scripts.cpp b/src/scripts/World/areatrigger_scripts.cpp
index 096b9c5263..096b9c5263 100644
--- a/modules/acore/scripts-wotlk/World/areatrigger_scripts.cpp
+++ b/src/scripts/World/areatrigger_scripts.cpp
diff --git a/modules/acore/scripts-wotlk/World/boss_emerald_dragons.cpp b/src/scripts/World/boss_emerald_dragons.cpp
index abb8134e23..abb8134e23 100644
--- a/modules/acore/scripts-wotlk/World/boss_emerald_dragons.cpp
+++ b/src/scripts/World/boss_emerald_dragons.cpp
diff --git a/modules/acore/scripts-wotlk/World/go_scripts.cpp b/src/scripts/World/go_scripts.cpp
index 329e46f4c3..329e46f4c3 100644
--- a/modules/acore/scripts-wotlk/World/go_scripts.cpp
+++ b/src/scripts/World/go_scripts.cpp
diff --git a/modules/acore/scripts-wotlk/World/guards.cpp b/src/scripts/World/guards.cpp
index ad1fb1ff62..ad1fb1ff62 100644
--- a/modules/acore/scripts-wotlk/World/guards.cpp
+++ b/src/scripts/World/guards.cpp
diff --git a/modules/acore/scripts-wotlk/World/item_scripts.cpp b/src/scripts/World/item_scripts.cpp
index 0eb1ac2116..0eb1ac2116 100644
--- a/modules/acore/scripts-wotlk/World/item_scripts.cpp
+++ b/src/scripts/World/item_scripts.cpp
diff --git a/modules/acore/scripts-wotlk/World/mob_generic_creature.cpp b/src/scripts/World/mob_generic_creature.cpp
index 6efe0b8f47..6efe0b8f47 100644
--- a/modules/acore/scripts-wotlk/World/mob_generic_creature.cpp
+++ b/src/scripts/World/mob_generic_creature.cpp
diff --git a/modules/acore/scripts-wotlk/World/npc_innkeeper.cpp b/src/scripts/World/npc_innkeeper.cpp
index dd765a7909..dd765a7909 100644
--- a/modules/acore/scripts-wotlk/World/npc_innkeeper.cpp
+++ b/src/scripts/World/npc_innkeeper.cpp
diff --git a/modules/acore/scripts-wotlk/World/npc_professions.cpp b/src/scripts/World/npc_professions.cpp
index 701874a794..701874a794 100644
--- a/modules/acore/scripts-wotlk/World/npc_professions.cpp
+++ b/src/scripts/World/npc_professions.cpp
diff --git a/modules/acore/scripts-wotlk/World/npc_taxi.cpp b/src/scripts/World/npc_taxi.cpp
index c0abad9fd7..c0abad9fd7 100644
--- a/modules/acore/scripts-wotlk/World/npc_taxi.cpp
+++ b/src/scripts/World/npc_taxi.cpp
diff --git a/modules/acore/scripts-wotlk/World/npcs_special.cpp b/src/scripts/World/npcs_special.cpp
index ed47d22d77..ed47d22d77 100644
--- a/modules/acore/scripts-wotlk/World/npcs_special.cpp
+++ b/src/scripts/World/npcs_special.cpp