diff --git a/data/sql/anticheat/anticheat.sql b/modules/azerothshard/data/sql/db-extra/anticheat.sql
similarity index 100%
rename from data/sql/anticheat/anticheat.sql
rename to modules/azerothshard/data/sql/db-extra/anticheat.sql
diff --git a/src/server/game/Anticheat/AntiCheatScripts.cpp b/modules/azerothshard/src/server/game/Anticheat/AntiCheatScripts.cpp
similarity index 100%
rename from src/server/game/Anticheat/AntiCheatScripts.cpp
rename to modules/azerothshard/src/server/game/Anticheat/AntiCheatScripts.cpp
diff --git a/src/server/game/Anticheat/AnticheatData.cpp b/modules/azerothshard/src/server/game/Anticheat/AnticheatData.cpp
similarity index 100%
rename from src/server/game/Anticheat/AnticheatData.cpp
rename to modules/azerothshard/src/server/game/Anticheat/AnticheatData.cpp
diff --git a/src/server/game/Anticheat/AnticheatData.h b/modules/azerothshard/src/server/game/Anticheat/AnticheatData.h
similarity index 100%
rename from src/server/game/Anticheat/AnticheatData.h
rename to modules/azerothshard/src/server/game/Anticheat/AnticheatData.h
diff --git a/src/server/game/Anticheat/AnticheatMgr.cpp b/modules/azerothshard/src/server/game/Anticheat/AnticheatMgr.cpp
similarity index 100%
rename from src/server/game/Anticheat/AnticheatMgr.cpp
rename to modules/azerothshard/src/server/game/Anticheat/AnticheatMgr.cpp
diff --git a/src/server/game/Anticheat/AnticheatMgr.h b/modules/azerothshard/src/server/game/Anticheat/AnticheatMgr.h
similarity index 100%
rename from src/server/game/Anticheat/AnticheatMgr.h
rename to modules/azerothshard/src/server/game/Anticheat/AnticheatMgr.h
diff --git a/src/server/game/Anticheat/AnticheatScripts.h b/modules/azerothshard/src/server/game/Anticheat/AnticheatScripts.h
similarity index 100%
rename from src/server/game/Anticheat/AnticheatScripts.h
rename to modules/azerothshard/src/server/game/Anticheat/AnticheatScripts.h
diff --git a/modules/azerothshard/src/server/plugins/AzthPlgLoader.cpp b/modules/azerothshard/src/server/plugins/AzthPlgLoader.cpp
index 5e07f17512..92693cc2d8 100644
--- a/modules/azerothshard/src/server/plugins/AzthPlgLoader.cpp
+++ b/modules/azerothshard/src/server/plugins/AzthPlgLoader.cpp
@@ -13,6 +13,8 @@
 // void AddSC_CS_Transmogrification();
 // void AddSC_npc_1v1arena();
 void AddSC_npc_lottery();
+void AddSC_anticheat_commandscript();
+
 
 void AddAzthScripts()
 {
@@ -26,6 +28,7 @@ void AddAzthScripts()
 //     AddSC_CS_Transmogrification();
 //     AddSC_npc_1v1arena();
 	AddSC_npc_lottery();
+    AddSC_anticheat_commandscript();
 }
 
 
diff --git a/src/server/scripts/Commands/cs_anticheat.cpp b/modules/azerothshard/src/server/plugins/cs_anticheat.cpp
similarity index 100%
rename from src/server/scripts/Commands/cs_anticheat.cpp
rename to modules/azerothshard/src/server/plugins/cs_anticheat.cpp
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index b090afb9f8..ee35f39416 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -144,7 +144,6 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/AI/CoreAI
   ${CMAKE_CURRENT_SOURCE_DIR}/AI/ScriptedAI
   ${CMAKE_CURRENT_SOURCE_DIR}/AI/SmartScripts
-  ${CMAKE_CURRENT_SOURCE_DIR}/Anticheat
   ${CMAKE_CURRENT_SOURCE_DIR}/AuctionHouse
   ${CMAKE_CURRENT_SOURCE_DIR}/Battlefield
   ${CMAKE_CURRENT_SOURCE_DIR}/Battlefield/Zones
@@ -204,7 +203,6 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/Texts
   ${CMAKE_CURRENT_SOURCE_DIR}/Tools
   ${CMAKE_CURRENT_SOURCE_DIR}/Tickets
-  ${CMAKE_CURRENT_SOURCE_DIR}/Transmogrification
   ${CMAKE_CURRENT_SOURCE_DIR}/Warden
   ${CMAKE_CURRENT_SOURCE_DIR}/Warden/Modules
   ${CMAKE_CURRENT_SOURCE_DIR}/Weather
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp
index b1eed72c55..00d981ceee 100644
--- a/src/server/game/Scripting/ScriptLoader.cpp
+++ b/src/server/game/Scripting/ScriptLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 
+ * 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
@@ -17,7 +17,7 @@
 
 #include "ScriptLoader.h"
 #include "ScriptMgr.h"
-#include "AnticheatMgr.h"
+#include "AnticheatMgr.h" //[AZTH]
 
 //examples
 void AddSC_example_creature();
@@ -75,7 +75,6 @@ void AddSC_tele_commandscript();
 void AddSC_ticket_commandscript();
 void AddSC_titles_commandscript();
 void AddSC_wp_commandscript();
-void AddSC_anticheat_commandscript();
 
 #ifdef SCRIPTS
 //world
@@ -240,7 +239,7 @@ void AddSC_western_plaguelands();
 void AddSC_westfall();
 void AddSC_wetlands();
 
-//kalimdor     
+//kalimdor
 void AddSC_instance_blackfathom_deeps();     //Blackfathom Depths
 void AddSC_hyjal();                          //CoT Battle for Mt. Hyjal
 void AddSC_boss_archimonde();
@@ -696,7 +695,6 @@ void AddCommandScripts()
     AddSC_ticket_commandscript();
     AddSC_titles_commandscript();
     AddSC_wp_commandscript();
-    AddSC_anticheat_commandscript();
 }
 
 void AddWorldScripts()