diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0b051f8..1a53f793 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,8 +36,11 @@ add_subdirectory( "deps/datReader" )
 add_subdirectory( "deps/mysqlConnector" )
 add_subdirectory( "src/common" )
 
-add_subdirectory( "src/servers" )
+add_subdirectory( "src/api" )
+add_subdirectory( "src/lobby" )
+add_subdirectory( "src/world" )
 add_subdirectory( "src/dbm" )
+add_subdirectory( "src/scripts" )
 
 add_subdirectory( "src/tools/exd_common_gen" )
 add_subdirectory( "src/tools/exd_struct_gen" )
diff --git a/src/servers/sapphire_api/CMakeLists.txt b/src/api/CMakeLists.txt
similarity index 50%
rename from src/servers/sapphire_api/CMakeLists.txt
rename to src/api/CMakeLists.txt
index ab5f9d6f..c30aded2 100644
--- a/src/servers/sapphire_api/CMakeLists.txt
+++ b/src/api/CMakeLists.txt
@@ -1,13 +1,13 @@
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0015 NEW)
-project(Sapphire)
+cmake_minimum_required( VERSION 2.6 )
+cmake_policy( SET CMP0015 NEW )
+project( Sapphire )
 
-file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
-file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
+file( GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*" )
+file( GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*" )
 
-add_executable(sapphire_api ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
+add_executable( api ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} )
 
-set_target_properties(sapphire_api PROPERTIES
+set_target_properties( api PROPERTIES
     CXX_STANDARD 17
     CXX_STANDARD_REQUIRED ON
     CXX_EXTENSIONS ON
@@ -18,10 +18,10 @@ set_target_properties(sapphire_api PROPERTIES
     VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
 )
 
-target_link_libraries( sapphire_api common )
+target_link_libraries( api common )
 if( UNIX )
-    target_link_libraries( sapphire_api mysqlclient stdc++fs )
+    target_link_libraries( api mysqlclient stdc++fs )
 
 else()
-    target_link_libraries( sapphire_api mysql )
+    target_link_libraries( api mysql )
 endif()
diff --git a/src/servers/sapphire_api/Forwards.h b/src/api/Forwards.h
similarity index 100%
rename from src/servers/sapphire_api/Forwards.h
rename to src/api/Forwards.h
diff --git a/src/servers/sapphire_api/LoginSession.cpp b/src/api/LoginSession.cpp
similarity index 100%
rename from src/servers/sapphire_api/LoginSession.cpp
rename to src/api/LoginSession.cpp
diff --git a/src/servers/sapphire_api/LoginSession.h b/src/api/LoginSession.h
similarity index 100%
rename from src/servers/sapphire_api/LoginSession.h
rename to src/api/LoginSession.h
diff --git a/src/servers/sapphire_api/PlayerMinimal.cpp b/src/api/PlayerMinimal.cpp
similarity index 100%
rename from src/servers/sapphire_api/PlayerMinimal.cpp
rename to src/api/PlayerMinimal.cpp
diff --git a/src/servers/sapphire_api/PlayerMinimal.h b/src/api/PlayerMinimal.h
similarity index 100%
rename from src/servers/sapphire_api/PlayerMinimal.h
rename to src/api/PlayerMinimal.h
diff --git a/src/servers/sapphire_api/SapphireAPI.cpp b/src/api/SapphireAPI.cpp
similarity index 100%
rename from src/servers/sapphire_api/SapphireAPI.cpp
rename to src/api/SapphireAPI.cpp
diff --git a/src/servers/sapphire_api/SapphireAPI.h b/src/api/SapphireAPI.h
similarity index 100%
rename from src/servers/sapphire_api/SapphireAPI.h
rename to src/api/SapphireAPI.h
diff --git a/src/servers/sapphire_api/Session.cpp b/src/api/Session.cpp
similarity index 100%
rename from src/servers/sapphire_api/Session.cpp
rename to src/api/Session.cpp
diff --git a/src/servers/sapphire_api/Session.h b/src/api/Session.h
similarity index 100%
rename from src/servers/sapphire_api/Session.h
rename to src/api/Session.h
diff --git a/src/servers/sapphire_api/client_http.hpp b/src/api/client_http.hpp
similarity index 100%
rename from src/servers/sapphire_api/client_http.hpp
rename to src/api/client_http.hpp
diff --git a/src/servers/sapphire_api/main.cpp b/src/api/main.cpp
similarity index 100%
rename from src/servers/sapphire_api/main.cpp
rename to src/api/main.cpp
diff --git a/src/servers/sapphire_api/server_http.hpp b/src/api/server_http.hpp
similarity index 100%
rename from src/servers/sapphire_api/server_http.hpp
rename to src/api/server_http.hpp
diff --git a/src/dbm/CMakeLists.txt b/src/dbm/CMakeLists.txt
index 0736265e..f731b609 100644
--- a/src/dbm/CMakeLists.txt
+++ b/src/dbm/CMakeLists.txt
@@ -1,13 +1,13 @@
-cmake_minimum_required(VERSION 3.0)
-cmake_policy(SET CMP0015 NEW)
-project(sapphire_dbm)
+cmake_minimum_required( VERSION 3.0 )
+cmake_policy( SET CMP0015 NEW )
+project( dbm )
 
-file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*" )
-file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
+file( GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*" )
+file( GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*" )
 
-add_executable(sapphire_dbm ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
+add_executable( dbm ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} )
 
-set_target_properties(sapphire_dbm PROPERTIES
+set_target_properties( dbm PROPERTIES
     CXX_STANDARD 17
     CXX_STANDARD_REQUIRED ON
     CXX_EXTENSIONS ON
@@ -17,15 +17,15 @@ set_target_properties(sapphire_dbm PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/"
 )
 
-target_include_directories( sapphire_dbm
+target_include_directories( dbm
                               PUBLIC
                                 "${CMAKE_CURRENT_SOURCE_DIR}/"
                               PRIVATE
                                 "${CMAKE_CURRENT_SOURCE_DIR}/../" )
-			target_link_libraries( sapphire_dbm PRIVATE mysqlConnector common xivdat )
+target_link_libraries( dbm PRIVATE mysqlConnector common xivdat )
 if (UNIX)
-    target_link_libraries( sapphire_dbm PRIVATE stdc++fs )
+    target_link_libraries( dbm PRIVATE stdc++fs )
 else()
-    target_link_libraries( sapphire_dbm PRIVATE mysql )
+    target_link_libraries( dbm PRIVATE mysql )
 endif()
 
diff --git a/src/servers/sapphire_lobby/CMakeLists.txt b/src/lobby/CMakeLists.txt
similarity index 75%
rename from src/servers/sapphire_lobby/CMakeLists.txt
rename to src/lobby/CMakeLists.txt
index b6000a47..cc262001 100644
--- a/src/servers/sapphire_lobby/CMakeLists.txt
+++ b/src/lobby/CMakeLists.txt
@@ -6,9 +6,9 @@ file( GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*" )
 file( GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*" )
 
 
-add_executable( sapphire_lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} )
+add_executable( lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} )
 
-set_target_properties( sapphire_lobby 
+set_target_properties( lobby 
 	                 PROPERTIES
                            CXX_STANDARD 17
                            CXX_STANDARD_REQUIRED ON
@@ -18,15 +18,16 @@ set_target_properties( sapphire_lobby
                            RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
                            RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
                            VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
-                     )
-target_link_libraries( sapphire_lobby 
-	                     PRIVATE
-			               common mysql )
+)
+target_link_libraries( lobby 
+                         PRIVATE
+		           common 
+                           mysql )
 if( UNIX )
-  target_link_libraries( sapphire_lobby 
+  target_link_libraries( lobby 
   	                   PRIVATE 
 			     stdc++fs )
 
 endif()
 
-		   #cotire( sapphire_lobby )
+#cotire( lobby )
diff --git a/src/servers/sapphire_lobby/Forwards.h b/src/lobby/Forwards.h
similarity index 100%
rename from src/servers/sapphire_lobby/Forwards.h
rename to src/lobby/Forwards.h
diff --git a/src/servers/sapphire_lobby/GameConnection.cpp b/src/lobby/GameConnection.cpp
similarity index 100%
rename from src/servers/sapphire_lobby/GameConnection.cpp
rename to src/lobby/GameConnection.cpp
diff --git a/src/servers/sapphire_lobby/GameConnection.h b/src/lobby/GameConnection.h
similarity index 100%
rename from src/servers/sapphire_lobby/GameConnection.h
rename to src/lobby/GameConnection.h
diff --git a/src/servers/sapphire_lobby/LobbyPacketContainer.cpp b/src/lobby/LobbyPacketContainer.cpp
similarity index 100%
rename from src/servers/sapphire_lobby/LobbyPacketContainer.cpp
rename to src/lobby/LobbyPacketContainer.cpp
diff --git a/src/servers/sapphire_lobby/LobbyPacketContainer.h b/src/lobby/LobbyPacketContainer.h
similarity index 100%
rename from src/servers/sapphire_lobby/LobbyPacketContainer.h
rename to src/lobby/LobbyPacketContainer.h
diff --git a/src/servers/sapphire_lobby/LobbySession.cpp b/src/lobby/LobbySession.cpp
similarity index 100%
rename from src/servers/sapphire_lobby/LobbySession.cpp
rename to src/lobby/LobbySession.cpp
diff --git a/src/servers/sapphire_lobby/LobbySession.h b/src/lobby/LobbySession.h
similarity index 100%
rename from src/servers/sapphire_lobby/LobbySession.h
rename to src/lobby/LobbySession.h
diff --git a/src/servers/sapphire_lobby/RestConnector.cpp b/src/lobby/RestConnector.cpp
similarity index 100%
rename from src/servers/sapphire_lobby/RestConnector.cpp
rename to src/lobby/RestConnector.cpp
diff --git a/src/servers/sapphire_lobby/RestConnector.h b/src/lobby/RestConnector.h
similarity index 100%
rename from src/servers/sapphire_lobby/RestConnector.h
rename to src/lobby/RestConnector.h
diff --git a/src/servers/sapphire_lobby/ServerLobby.cpp b/src/lobby/ServerLobby.cpp
similarity index 100%
rename from src/servers/sapphire_lobby/ServerLobby.cpp
rename to src/lobby/ServerLobby.cpp
diff --git a/src/servers/sapphire_lobby/ServerLobby.h b/src/lobby/ServerLobby.h
similarity index 100%
rename from src/servers/sapphire_lobby/ServerLobby.h
rename to src/lobby/ServerLobby.h
diff --git a/src/servers/sapphire_lobby/client_http.hpp b/src/lobby/client_http.hpp
similarity index 100%
rename from src/servers/sapphire_lobby/client_http.hpp
rename to src/lobby/client_http.hpp
diff --git a/src/servers/sapphire_lobby/mainLobbyServer.cpp b/src/lobby/mainLobbyServer.cpp
similarity index 100%
rename from src/servers/sapphire_lobby/mainLobbyServer.cpp
rename to src/lobby/mainLobbyServer.cpp
diff --git a/src/servers/Scripts/CMakeLists.txt b/src/scripts/CMakeLists.txt
similarity index 96%
rename from src/servers/Scripts/CMakeLists.txt
rename to src/scripts/CMakeLists.txt
index 06ea6827..dd9f0759 100644
--- a/src/servers/Scripts/CMakeLists.txt
+++ b/src/scripts/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
-project(Sapphire_Script)
+project(Script)
 
 file(GLOB SCRIPT_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
 
@@ -36,7 +36,7 @@ foreach(_scriptDir ${children})
         endforeach()
 
         add_library("script_${_name}" MODULE ${SCRIPT_BUILD_FILES} "${SCRIPT_INCLUDE_FILES}" "${_scriptDir}/ScriptLoader.cpp")
-        target_link_libraries( "script_${_name}" sapphire_zone )
+        target_link_libraries( "script_${_name}" world )
 
         if(MSVC)
             set_target_properties( "script_${_name}" PROPERTIES
@@ -56,7 +56,7 @@ foreach(_scriptDir ${children})
 
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ScriptLoader.cpp.in" "${_scriptDir}/ScriptLoader.cpp")
 
-        #cotire("script_${_name}")
+        cotire("script_${_name}")
 
         if(MSVC)
             add_custom_command(TARGET "script_${_name}" POST_BUILD
diff --git a/src/servers/Scripts/ScriptLoader.cpp.in b/src/scripts/ScriptLoader.cpp.in
similarity index 100%
rename from src/servers/Scripts/ScriptLoader.cpp.in
rename to src/scripts/ScriptLoader.cpp.in
diff --git a/src/servers/Scripts/ScriptObject.h b/src/scripts/ScriptObject.h
similarity index 100%
rename from src/servers/Scripts/ScriptObject.h
rename to src/scripts/ScriptObject.h
diff --git a/src/servers/Scripts/action/ActionReturn6.cpp b/src/scripts/action/ActionReturn6.cpp
similarity index 100%
rename from src/servers/Scripts/action/ActionReturn6.cpp
rename to src/scripts/action/ActionReturn6.cpp
diff --git a/src/servers/Scripts/action/ActionSprint3.cpp b/src/scripts/action/ActionSprint3.cpp
similarity index 100%
rename from src/servers/Scripts/action/ActionSprint3.cpp
rename to src/scripts/action/ActionSprint3.cpp
diff --git a/src/scripts/action/ScriptLoader.cpp b/src/scripts/action/ScriptLoader.cpp
new file mode 100644
index 00000000..53a1a372
--- /dev/null
+++ b/src/scripts/action/ScriptLoader.cpp
@@ -0,0 +1,17 @@
+#include <Script/NativeScriptApi.h>
+
+#include "ActionReturn6.cpp"
+#include "ActionSprint3.cpp"
+
+const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
+{
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ActionReturn6 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ActionSprint3 ),
+
+   nullptr
+};
+
+extern "C" EXPORT const Sapphire::ScriptAPI::ScriptObject** getScripts()
+{
+   return ptrs;
+}
diff --git a/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp b/src/scripts/common/CmnDefCutSceneReplay.cpp
similarity index 100%
rename from src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
rename to src/scripts/common/CmnDefCutSceneReplay.cpp
diff --git a/src/servers/Scripts/common/CmnDefInnBed.cpp b/src/scripts/common/CmnDefInnBed.cpp
similarity index 100%
rename from src/servers/Scripts/common/CmnDefInnBed.cpp
rename to src/scripts/common/CmnDefInnBed.cpp
diff --git a/src/servers/Scripts/common/CmnDefLinkShell.cpp b/src/scripts/common/CmnDefLinkShell.cpp
similarity index 100%
rename from src/servers/Scripts/common/CmnDefLinkShell.cpp
rename to src/scripts/common/CmnDefLinkShell.cpp
diff --git a/src/servers/Scripts/common/CmnDefMarketBoardGridania.cpp b/src/scripts/common/CmnDefMarketBoardGridania.cpp
similarity index 100%
rename from src/servers/Scripts/common/CmnDefMarketBoardGridania.cpp
rename to src/scripts/common/CmnDefMarketBoardGridania.cpp
diff --git a/src/servers/Scripts/common/CmnDefMogLetter.cpp b/src/scripts/common/CmnDefMogLetter.cpp
similarity index 100%
rename from src/servers/Scripts/common/CmnDefMogLetter.cpp
rename to src/scripts/common/CmnDefMogLetter.cpp
diff --git a/src/servers/Scripts/common/CmnDefNpcRepair.cpp b/src/scripts/common/CmnDefNpcRepair.cpp
similarity index 100%
rename from src/servers/Scripts/common/CmnDefNpcRepair.cpp
rename to src/scripts/common/CmnDefNpcRepair.cpp
diff --git a/src/servers/Scripts/common/CmnDefWeatherForeCast.cpp b/src/scripts/common/CmnDefWeatherForeCast.cpp
similarity index 100%
rename from src/servers/Scripts/common/CmnDefWeatherForeCast.cpp
rename to src/scripts/common/CmnDefWeatherForeCast.cpp
diff --git a/src/servers/Scripts/common/ComDefMobHuntBoard.cpp b/src/scripts/common/ComDefMobHuntBoard.cpp
similarity index 100%
rename from src/servers/Scripts/common/ComDefMobHuntBoard.cpp
rename to src/scripts/common/ComDefMobHuntBoard.cpp
diff --git a/src/servers/Scripts/common/GilShop.cpp b/src/scripts/common/GilShop.cpp
similarity index 100%
rename from src/servers/Scripts/common/GilShop.cpp
rename to src/scripts/common/GilShop.cpp
diff --git a/src/servers/Scripts/common/HouFurOrchestrion.cpp b/src/scripts/common/HouFurOrchestrion.cpp
similarity index 100%
rename from src/servers/Scripts/common/HouFurOrchestrion.cpp
rename to src/scripts/common/HouFurOrchestrion.cpp
diff --git a/src/scripts/common/ScriptLoader.cpp b/src/scripts/common/ScriptLoader.cpp
new file mode 100644
index 00000000..dd307879
--- /dev/null
+++ b/src/scripts/common/ScriptLoader.cpp
@@ -0,0 +1,47 @@
+#include <Script/NativeScriptApi.h>
+
+#include "CmnDefCutSceneReplay.cpp"
+#include "CmnDefInnBed.cpp"
+#include "CmnDefLinkShell.cpp"
+#include "CmnDefMarketBoardGridania.cpp"
+#include "CmnDefMogLetter.cpp"
+#include "CmnDefNpcRepair.cpp"
+#include "CmnDefWeatherForeCast.cpp"
+#include "ComDefMobHuntBoard.cpp"
+#include "GilShop.cpp"
+#include "HouFurOrchestrion.cpp"
+#include "aethernet/Aetheryte.cpp"
+#include "aethernet/HousingAethernet.cpp"
+#include "eobj/HousingEstateEntrance.cpp"
+#include "housing/CmnDefHousingPersonalRoomEntrance.cpp"
+#include "housing/CmnDefHousingSignboard.cpp"
+#include "warptaxi/HousingWarpTaxiExitEstate.cpp"
+#include "warptaxi/WarpTaxi.cpp"
+
+const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
+{
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new CmnDefCutSceneReplay ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new CmnDefInnBed ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new CmnDefLinkShell ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new CmnDefMarketBoardGridania ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new CmnDefMogLetter ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new CmnDefNpcRepair ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new CmnDefWeatherForeCast ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ComDefMobHuntBoard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new GilShop ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new HouFurOrchestrion ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new Aetheryte ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new HousingAethernet ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new HousingEstateEntrance ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new CmnDefHousingPersonalRoomEntrance ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new CmnDefHousingSignboard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new HousingWarpTaxiExitEstate ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new WarpTaxi ),
+
+   nullptr
+};
+
+extern "C" EXPORT const Sapphire::ScriptAPI::ScriptObject** getScripts()
+{
+   return ptrs;
+}
diff --git a/src/servers/Scripts/common/aethernet/Aetheryte.cpp b/src/scripts/common/aethernet/Aetheryte.cpp
similarity index 100%
rename from src/servers/Scripts/common/aethernet/Aetheryte.cpp
rename to src/scripts/common/aethernet/Aetheryte.cpp
diff --git a/src/servers/Scripts/common/aethernet/HousingAethernet.cpp b/src/scripts/common/aethernet/HousingAethernet.cpp
similarity index 100%
rename from src/servers/Scripts/common/aethernet/HousingAethernet.cpp
rename to src/scripts/common/aethernet/HousingAethernet.cpp
diff --git a/src/servers/Scripts/common/eobj/HousingEstateEntrance.cpp b/src/scripts/common/eobj/HousingEstateEntrance.cpp
similarity index 100%
rename from src/servers/Scripts/common/eobj/HousingEstateEntrance.cpp
rename to src/scripts/common/eobj/HousingEstateEntrance.cpp
diff --git a/src/servers/Scripts/common/housing/CmnDefHousingPersonalRoomEntrance.cpp b/src/scripts/common/housing/CmnDefHousingPersonalRoomEntrance.cpp
similarity index 100%
rename from src/servers/Scripts/common/housing/CmnDefHousingPersonalRoomEntrance.cpp
rename to src/scripts/common/housing/CmnDefHousingPersonalRoomEntrance.cpp
diff --git a/src/servers/Scripts/common/housing/CmnDefHousingSignboard.cpp b/src/scripts/common/housing/CmnDefHousingSignboard.cpp
similarity index 100%
rename from src/servers/Scripts/common/housing/CmnDefHousingSignboard.cpp
rename to src/scripts/common/housing/CmnDefHousingSignboard.cpp
diff --git a/src/servers/Scripts/common/warptaxi/HousingWarpTaxiExitEstate.cpp b/src/scripts/common/warptaxi/HousingWarpTaxiExitEstate.cpp
similarity index 100%
rename from src/servers/Scripts/common/warptaxi/HousingWarpTaxiExitEstate.cpp
rename to src/scripts/common/warptaxi/HousingWarpTaxiExitEstate.cpp
diff --git a/src/servers/Scripts/common/warptaxi/WarpTaxi.cpp b/src/scripts/common/warptaxi/WarpTaxi.cpp
similarity index 100%
rename from src/servers/Scripts/common/warptaxi/WarpTaxi.cpp
rename to src/scripts/common/warptaxi/WarpTaxi.cpp
diff --git a/src/scripts/instances/ScriptLoader.cpp b/src/scripts/instances/ScriptLoader.cpp
new file mode 100644
index 00000000..3cf4659b
--- /dev/null
+++ b/src/scripts/instances/ScriptLoader.cpp
@@ -0,0 +1,549 @@
+#include <Script/NativeScriptApi.h>
+
+#include "deepdungeon/ThePalaceoftheDeadFloors101110.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors110.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors111120.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors1120.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors121130.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors131140.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors141150.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors151160.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors161170.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors171180.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors181190.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors191200.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors2130.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors3140.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors4150.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors5160.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors6170.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors7180.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors8190.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors91100.cpp"
+#include "dungeons/AlaMhigo.cpp"
+#include "dungeons/AmdaporKeep.cpp"
+#include "dungeons/AmdaporKeepHard.cpp"
+#include "dungeons/BaelsarsWall.cpp"
+#include "dungeons/BardamsMettle.cpp"
+#include "dungeons/BrayfloxsLongstop.cpp"
+#include "dungeons/BrayfloxsLongstopHard.cpp"
+#include "dungeons/CastrumAbania.cpp"
+#include "dungeons/CastrumMeridianum.cpp"
+#include "dungeons/CopperbellMines.cpp"
+#include "dungeons/CopperbellMinesHard.cpp"
+#include "dungeons/CuttersCry.cpp"
+#include "dungeons/DomaCastle.cpp"
+#include "dungeons/DzemaelDarkhold.cpp"
+#include "dungeons/Halatali.cpp"
+#include "dungeons/HalataliHard.cpp"
+#include "dungeons/HaukkeManor.cpp"
+#include "dungeons/HaukkeManorHard.cpp"
+#include "dungeons/HellsLid.cpp"
+#include "dungeons/HullbreakerIsle.cpp"
+#include "dungeons/HullbreakerIsleHard.cpp"
+#include "dungeons/KuganeCastle.cpp"
+#include "dungeons/Neverreap.cpp"
+#include "dungeons/PharosSirius.cpp"
+#include "dungeons/PharosSiriusHard.cpp"
+#include "dungeons/SaintMociannesArboretum.cpp"
+#include "dungeons/Sastasha.cpp"
+#include "dungeons/SastashaHard.cpp"
+#include "dungeons/ShisuioftheVioletTides.cpp"
+#include "dungeons/Snowcloak.cpp"
+#include "dungeons/SohmAl.cpp"
+#include "dungeons/SohmAlHard.cpp"
+#include "dungeons/SohrKhai.cpp"
+#include "dungeons/TheAery.cpp"
+#include "dungeons/TheAetherochemicalResearchFacility.cpp"
+#include "dungeons/TheAntitower.cpp"
+#include "dungeons/TheAurumVale.cpp"
+#include "dungeons/TheDrownedCityofSkalla.cpp"
+#include "dungeons/TheDuskVigil.cpp"
+#include "dungeons/TheFractalContinuum.cpp"
+#include "dungeons/TheFractalContinuumHard.cpp"
+#include "dungeons/TheGreatGubalLibrary.cpp"
+#include "dungeons/TheGreatGubalLibraryHard.cpp"
+#include "dungeons/TheKeeperoftheLake.cpp"
+#include "dungeons/TheLostCityofAmdapor.cpp"
+#include "dungeons/TheLostCityofAmdaporHard.cpp"
+#include "dungeons/ThePraetorium.cpp"
+#include "dungeons/TheSirensongSea.cpp"
+#include "dungeons/TheStoneVigil.cpp"
+#include "dungeons/TheStoneVigilHard.cpp"
+#include "dungeons/TheSunkenTempleofQarn.cpp"
+#include "dungeons/TheSunkenTempleofQarnHard.cpp"
+#include "dungeons/TheTamTaraDeepcroft.cpp"
+#include "dungeons/TheTamTaraDeepcroftHard.cpp"
+#include "dungeons/TheTempleoftheFist.cpp"
+#include "dungeons/TheThousandMawsofTotoRak.cpp"
+#include "dungeons/TheVault.cpp"
+#include "dungeons/TheWanderersPalace.cpp"
+#include "dungeons/TheWanderersPalaceHard.cpp"
+#include "dungeons/Xelphatol.cpp"
+#include "events/TheHauntedManor.cpp"
+#include "events/TheValentionesCeremony.cpp"
+#include "guildhests/AllsWellthatEndsintheWell.cpp"
+#include "guildhests/AnnoytheVoid.cpp"
+#include "guildhests/BasicTrainingEnemyParties.cpp"
+#include "guildhests/BasicTrainingEnemyStrongholds.cpp"
+#include "guildhests/FlickingSticksandTakingNames.cpp"
+#include "guildhests/HeroontheHalfShell.cpp"
+#include "guildhests/LongLivetheQueen.cpp"
+#include "guildhests/MorethanaFeeler.cpp"
+#include "guildhests/PullingPoisonPosies.cpp"
+#include "guildhests/ShadowandClaw.cpp"
+#include "guildhests/SolemnTrinity.cpp"
+#include "guildhests/StingingBack.cpp"
+#include "guildhests/UndertheArmor.cpp"
+#include "guildhests/WardUp.cpp"
+#include "hallofthenovice/AccrueEnmityfromMultipleTargets.cpp"
+#include "hallofthenovice/AssistAlliesinDefeatingaTarget.cpp"
+#include "hallofthenovice/AvoidAreaofEffectAttacks.cpp"
+#include "hallofthenovice/AvoidEngagedTargets.cpp"
+#include "hallofthenovice/DefeatanOccupiedTarget.cpp"
+#include "hallofthenovice/EngageEnemyReinforcements.cpp"
+#include "hallofthenovice/EngageMultipleTargets.cpp"
+#include "hallofthenovice/ExecuteaComboinBattle.cpp"
+#include "hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp"
+#include "hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp"
+#include "hallofthenovice/FinalExercise.cpp"
+#include "hallofthenovice/HealMultipleAllies.cpp"
+#include "hallofthenovice/HealanAlly.cpp"
+#include "hallofthenovice/InteractwiththeBattlefield.cpp"
+#include "pvp/Astragalos.cpp"
+#include "pvp/SealRockSeize.cpp"
+#include "pvp/TheBorderlandRuinsSecure.cpp"
+#include "pvp/TheFeast4on4LightParty.cpp"
+#include "pvp/TheFeast4on4Ranked.cpp"
+#include "pvp/TheFeast4on4Training.cpp"
+#include "pvp/TheFeastCustomMatchCrystalTower.cpp"
+#include "pvp/TheFeastCustomMatchFeastingGrounds.cpp"
+#include "pvp/TheFeastCustomMatchLichenweed.cpp"
+#include "pvp/TheFeastRanked.cpp"
+#include "pvp/TheFeastTeamRanked.cpp"
+#include "pvp/TheFeastTraining.cpp"
+#include "pvp/TheFieldsofGloryShatter.cpp"
+#include "questbattles/ABloodyReunion.cpp"
+#include "questbattles/ASpectaclefortheAges.cpp"
+#include "questbattles/BloodDragoon.cpp"
+#include "questbattles/BloodontheDeck.cpp"
+#include "questbattles/CuriousGorgeMeetsHisMatch.cpp"
+#include "questbattles/DarkwingDragon.cpp"
+#include "questbattles/InThalsName.cpp"
+#include "questbattles/InterdimensionalRift.cpp"
+#include "questbattles/ItsProbablyaTrap.cpp"
+#include "questbattles/MatsubaMayhem.cpp"
+#include "questbattles/Naadam.cpp"
+#include "questbattles/OneLifeforOneWorld.cpp"
+#include "questbattles/OurCompromise.cpp"
+#include "questbattles/OurUnsungHeroes.cpp"
+#include "questbattles/RaisingtheSword.cpp"
+#include "questbattles/ReturnoftheBull.cpp"
+#include "questbattles/TheBattleonBekko.cpp"
+#include "questbattles/TheCarteneauFlatsHeliodrome.cpp"
+#include "questbattles/TheFaceofTrueEvil.cpp"
+#include "questbattles/TheHeartoftheProblem.cpp"
+#include "questbattles/TheOrphansandtheBrokenBlade.cpp"
+#include "questbattles/TheResonant.cpp"
+#include "questbattles/WhenClansCollide.cpp"
+#include "questbattles/WithHeartandSteel.cpp"
+#include "raids/AlexanderTheArmoftheFather.cpp"
+#include "raids/AlexanderTheArmoftheFatherSavage.cpp"
+#include "raids/AlexanderTheArmoftheSon.cpp"
+#include "raids/AlexanderTheArmoftheSonSavage.cpp"
+#include "raids/AlexanderTheBreathoftheCreator.cpp"
+#include "raids/AlexanderTheBreathoftheCreatorSavage.cpp"
+#include "raids/AlexanderTheBurdenoftheFather.cpp"
+#include "raids/AlexanderTheBurdenoftheFatherSavage.cpp"
+#include "raids/AlexanderTheBurdenoftheSon.cpp"
+#include "raids/AlexanderTheBurdenoftheSonSavage.cpp"
+#include "raids/AlexanderTheCuffoftheFather.cpp"
+#include "raids/AlexanderTheCuffoftheFatherSavage.cpp"
+#include "raids/AlexanderTheCuffoftheSon.cpp"
+#include "raids/AlexanderTheCuffoftheSonSavage.cpp"
+#include "raids/AlexanderTheEyesoftheCreator.cpp"
+#include "raids/AlexanderTheEyesoftheCreatorSavage.cpp"
+#include "raids/AlexanderTheFistoftheFather.cpp"
+#include "raids/AlexanderTheFistoftheFatherSavage.cpp"
+#include "raids/AlexanderTheFistoftheSon.cpp"
+#include "raids/AlexanderTheFistoftheSonSavage.cpp"
+#include "raids/AlexanderTheHeartoftheCreator.cpp"
+#include "raids/AlexanderTheHeartoftheCreatorSavage.cpp"
+#include "raids/AlexanderTheSouloftheCreator.cpp"
+#include "raids/AlexanderTheSouloftheCreatorSavage.cpp"
+#include "raids/DeltascapeV10.cpp"
+#include "raids/DeltascapeV10Savage.cpp"
+#include "raids/DeltascapeV20.cpp"
+#include "raids/DeltascapeV20Savage.cpp"
+#include "raids/DeltascapeV30.cpp"
+#include "raids/DeltascapeV30Savage.cpp"
+#include "raids/DeltascapeV40.cpp"
+#include "raids/DeltascapeV40Savage.cpp"
+#include "raids/DunScaith.cpp"
+#include "raids/SigmascapeV10.cpp"
+#include "raids/SigmascapeV10Savage.cpp"
+#include "raids/SigmascapeV20.cpp"
+#include "raids/SigmascapeV20Savage.cpp"
+#include "raids/SigmascapeV30.cpp"
+#include "raids/SigmascapeV30Savage.cpp"
+#include "raids/SigmascapeV40.cpp"
+#include "raids/SigmascapeV40Savage.cpp"
+#include "raids/SyrcusTower.cpp"
+#include "raids/TheBindingCoilofBahamutTurn1.cpp"
+#include "raids/TheBindingCoilofBahamutTurn2.cpp"
+#include "raids/TheBindingCoilofBahamutTurn3.cpp"
+#include "raids/TheBindingCoilofBahamutTurn4.cpp"
+#include "raids/TheBindingCoilofBahamutTurn5.cpp"
+#include "raids/TheFinalCoilofBahamutTurn1.cpp"
+#include "raids/TheFinalCoilofBahamutTurn2.cpp"
+#include "raids/TheFinalCoilofBahamutTurn3.cpp"
+#include "raids/TheFinalCoilofBahamutTurn4.cpp"
+#include "raids/TheLabyrinthoftheAncients.cpp"
+#include "raids/TheRoyalCityofRabanastre.cpp"
+#include "raids/TheSecondCoilofBahamutSavageTurn1.cpp"
+#include "raids/TheSecondCoilofBahamutSavageTurn2.cpp"
+#include "raids/TheSecondCoilofBahamutSavageTurn3.cpp"
+#include "raids/TheSecondCoilofBahamutSavageTurn4.cpp"
+#include "raids/TheSecondCoilofBahamutTurn1.cpp"
+#include "raids/TheSecondCoilofBahamutTurn2.cpp"
+#include "raids/TheSecondCoilofBahamutTurn3.cpp"
+#include "raids/TheSecondCoilofBahamutTurn4.cpp"
+#include "raids/TheUnendingCoilofBahamutUltimate.cpp"
+#include "raids/TheVoidArk.cpp"
+#include "raids/TheWeaponsRefrainUltimate.cpp"
+#include "raids/TheWeepingCityofMhach.cpp"
+#include "raids/TheWorldofDarkness.cpp"
+#include "treasurehunt/TheAquapolis.cpp"
+#include "treasurehunt/TheHiddenCanalsofUznair.cpp"
+#include "treasurehunt/TheLostCanalsofUznair.cpp"
+#include "trials/ARelicReborntheChimera.cpp"
+#include "trials/ARelicReborntheHydra.cpp"
+#include "trials/AkhAfahAmphitheatreExtreme.cpp"
+#include "trials/AkhAfahAmphitheatreHard.cpp"
+#include "trials/BattleintheBigKeep.cpp"
+#include "trials/BattleontheBigBridge.cpp"
+#include "trials/CapeWestwind.cpp"
+#include "trials/ContainmentBayP1T6.cpp"
+#include "trials/ContainmentBayP1T6Extreme.cpp"
+#include "trials/ContainmentBayS1T7.cpp"
+#include "trials/ContainmentBayS1T7Extreme.cpp"
+#include "trials/ContainmentBayZ1T9.cpp"
+#include "trials/ContainmentBayZ1T9Extreme.cpp"
+#include "trials/Emanation.cpp"
+#include "trials/EmanationExtreme.cpp"
+#include "trials/SpecialEventI.cpp"
+#include "trials/SpecialEventII.cpp"
+#include "trials/SpecialEventIII.cpp"
+#include "trials/TheBowlofEmbers.cpp"
+#include "trials/TheBowlofEmbersExtreme.cpp"
+#include "trials/TheBowlofEmbersHard.cpp"
+#include "trials/TheChrysalis.cpp"
+#include "trials/TheDragonsNeck.cpp"
+#include "trials/TheFinalStepsofFaith.cpp"
+#include "trials/TheHowlingEye.cpp"
+#include "trials/TheHowlingEyeExtreme.cpp"
+#include "trials/TheHowlingEyeHard.cpp"
+#include "trials/TheJadeStoa.cpp"
+#include "trials/TheJadeStoaExtreme.cpp"
+#include "trials/TheLimitlessBlueExtreme.cpp"
+#include "trials/TheLimitlessBlueHard.cpp"
+#include "trials/TheMinstrelsBalladNidhoggsRage.cpp"
+#include "trials/TheMinstrelsBalladShinryusDomain.cpp"
+#include "trials/TheMinstrelsBalladThordansReign.cpp"
+#include "trials/TheMinstrelsBalladUltimasBane.cpp"
+#include "trials/TheNavel.cpp"
+#include "trials/TheNavelExtreme.cpp"
+#include "trials/TheNavelHard.cpp"
+#include "trials/ThePoolofTribute.cpp"
+#include "trials/ThePoolofTributeExtreme.cpp"
+#include "trials/TheRoyalMenagerie.cpp"
+#include "trials/TheSingularityReactor.cpp"
+#include "trials/TheStepsofFaith.cpp"
+#include "trials/TheStrikingTreeExtreme.cpp"
+#include "trials/TheStrikingTreeHard.cpp"
+#include "trials/TheWhorleaterExtreme.cpp"
+#include "trials/TheWhorleaterHard.cpp"
+#include "trials/ThokastThokExtreme.cpp"
+#include "trials/ThokastThokHard.cpp"
+#include "trials/ThornmarchExtreme.cpp"
+#include "trials/ThornmarchHard.cpp"
+#include "trials/UrthsFount.cpp"
+
+const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
+{
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePalaceoftheDeadFloors101110 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePalaceoftheDeadFloors110 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePalaceoftheDeadFloors111120 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePalaceoftheDeadFloors1120 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePalaceoftheDeadFloors121130 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePalaceoftheDeadFloors131140 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePalaceoftheDeadFloors141150 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePalaceoftheDeadFloors151160 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePalaceoftheDeadFloors161170 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePalaceoftheDeadFloors171180 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePalaceoftheDeadFloors181190 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePalaceoftheDeadFloors191200 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePalaceoftheDeadFloors2130 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePalaceoftheDeadFloors3140 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePalaceoftheDeadFloors4150 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePalaceoftheDeadFloors5160 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePalaceoftheDeadFloors6170 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePalaceoftheDeadFloors7180 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePalaceoftheDeadFloors8190 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePalaceoftheDeadFloors91100 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlaMhigo ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AmdaporKeep ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AmdaporKeepHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new BaelsarsWall ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new BardamsMettle ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new BrayfloxsLongstop ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new BrayfloxsLongstopHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new CastrumAbania ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new CastrumMeridianum ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new CopperbellMines ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new CopperbellMinesHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new CuttersCry ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new DomaCastle ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new DzemaelDarkhold ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new Halatali ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new HalataliHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new HaukkeManor ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new HaukkeManorHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new HellsLid ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new HullbreakerIsle ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new HullbreakerIsleHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new KuganeCastle ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new Neverreap ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new PharosSirius ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new PharosSiriusHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SaintMociannesArboretum ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new Sastasha ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SastashaHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ShisuioftheVioletTides ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new Snowcloak ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SohmAl ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SohmAlHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SohrKhai ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheAery ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheAetherochemicalResearchFacility ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheAntitower ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheAurumVale ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheDrownedCityofSkalla ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheDuskVigil ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheFractalContinuum ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheFractalContinuumHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheGreatGubalLibrary ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheGreatGubalLibraryHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheKeeperoftheLake ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheLostCityofAmdapor ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheLostCityofAmdaporHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePraetorium ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheSirensongSea ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheStoneVigil ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheStoneVigilHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheSunkenTempleofQarn ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheSunkenTempleofQarnHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheTamTaraDeepcroft ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheTamTaraDeepcroftHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheTempleoftheFist ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheThousandMawsofTotoRak ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheVault ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheWanderersPalace ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheWanderersPalaceHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new Xelphatol ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheHauntedManor ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheValentionesCeremony ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AllsWellthatEndsintheWell ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AnnoytheVoid ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new BasicTrainingEnemyParties ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new BasicTrainingEnemyStrongholds ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new FlickingSticksandTakingNames ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new HeroontheHalfShell ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new LongLivetheQueen ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new MorethanaFeeler ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new PullingPoisonPosies ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ShadowandClaw ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SolemnTrinity ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new StingingBack ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new UndertheArmor ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new WardUp ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AccrueEnmityfromMultipleTargets ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AssistAlliesinDefeatingaTarget ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AvoidAreaofEffectAttacks ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AvoidEngagedTargets ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new DefeatanOccupiedTarget ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new EngageEnemyReinforcements ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new EngageMultipleTargets ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ExecuteaComboinBattle ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ExecuteaCombotoIncreaseEnmity ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ExecuteaRangedAttacktoIncreaseEnmity ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new FinalExercise ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new HealMultipleAllies ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new HealanAlly ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new InteractwiththeBattlefield ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new Astragalos ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SealRockSeize ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheBorderlandRuinsSecure ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheFeast4on4LightParty ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheFeast4on4Ranked ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheFeast4on4Training ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheFeastCustomMatchCrystalTower ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheFeastCustomMatchFeastingGrounds ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheFeastCustomMatchLichenweed ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheFeastRanked ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheFeastTeamRanked ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheFeastTraining ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheFieldsofGloryShatter ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ABloodyReunion ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ASpectaclefortheAges ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new BloodDragoon ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new BloodontheDeck ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new CuriousGorgeMeetsHisMatch ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new DarkwingDragon ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new InThalsName ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new InterdimensionalRift ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ItsProbablyaTrap ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new MatsubaMayhem ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new Naadam ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new OneLifeforOneWorld ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new OurCompromise ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new OurUnsungHeroes ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new RaisingtheSword ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ReturnoftheBull ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheBattleonBekko ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheCarteneauFlatsHeliodrome ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheFaceofTrueEvil ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheHeartoftheProblem ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheOrphansandtheBrokenBlade ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheResonant ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new WhenClansCollide ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new WithHeartandSteel ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheArmoftheFather ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheArmoftheFatherSavage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheArmoftheSon ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheArmoftheSonSavage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheBreathoftheCreator ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheBreathoftheCreatorSavage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheBurdenoftheFather ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheBurdenoftheFatherSavage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheBurdenoftheSon ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheBurdenoftheSonSavage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheCuffoftheFather ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheCuffoftheFatherSavage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheCuffoftheSon ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheCuffoftheSonSavage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheEyesoftheCreator ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheEyesoftheCreatorSavage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheFistoftheFather ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheFistoftheFatherSavage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheFistoftheSon ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheFistoftheSonSavage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheHeartoftheCreator ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheHeartoftheCreatorSavage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheSouloftheCreator ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AlexanderTheSouloftheCreatorSavage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new DeltascapeV10 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new DeltascapeV10Savage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new DeltascapeV20 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new DeltascapeV20Savage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new DeltascapeV30 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new DeltascapeV30Savage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new DeltascapeV40 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new DeltascapeV40Savage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new DunScaith ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SigmascapeV10 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SigmascapeV10Savage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SigmascapeV20 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SigmascapeV20Savage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SigmascapeV30 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SigmascapeV30Savage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SigmascapeV40 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SigmascapeV40Savage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SyrcusTower ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheBindingCoilofBahamutTurn1 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheBindingCoilofBahamutTurn2 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheBindingCoilofBahamutTurn3 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheBindingCoilofBahamutTurn4 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheBindingCoilofBahamutTurn5 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheFinalCoilofBahamutTurn1 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheFinalCoilofBahamutTurn2 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheFinalCoilofBahamutTurn3 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheFinalCoilofBahamutTurn4 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheLabyrinthoftheAncients ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheRoyalCityofRabanastre ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheSecondCoilofBahamutSavageTurn1 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheSecondCoilofBahamutSavageTurn2 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheSecondCoilofBahamutSavageTurn3 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheSecondCoilofBahamutSavageTurn4 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheSecondCoilofBahamutTurn1 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheSecondCoilofBahamutTurn2 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheSecondCoilofBahamutTurn3 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheSecondCoilofBahamutTurn4 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheUnendingCoilofBahamutUltimate ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheVoidArk ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheWeaponsRefrainUltimate ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheWeepingCityofMhach ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheWorldofDarkness ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheAquapolis ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheHiddenCanalsofUznair ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheLostCanalsofUznair ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ARelicReborntheChimera ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ARelicReborntheHydra ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AkhAfahAmphitheatreExtreme ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new AkhAfahAmphitheatreHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new BattleintheBigKeep ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new BattleontheBigBridge ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new CapeWestwind ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ContainmentBayP1T6 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ContainmentBayP1T6Extreme ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ContainmentBayS1T7 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ContainmentBayS1T7Extreme ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ContainmentBayZ1T9 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ContainmentBayZ1T9Extreme ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new Emanation ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new EmanationExtreme ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SpecialEventI ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SpecialEventII ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SpecialEventIII ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheBowlofEmbers ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheBowlofEmbersExtreme ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheBowlofEmbersHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheChrysalis ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheDragonsNeck ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheFinalStepsofFaith ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheHowlingEye ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheHowlingEyeExtreme ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheHowlingEyeHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheJadeStoa ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheJadeStoaExtreme ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheLimitlessBlueExtreme ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheLimitlessBlueHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheMinstrelsBalladNidhoggsRage ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheMinstrelsBalladShinryusDomain ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheMinstrelsBalladThordansReign ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheMinstrelsBalladUltimasBane ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheNavel ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheNavelExtreme ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheNavelHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePoolofTribute ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThePoolofTributeExtreme ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheRoyalMenagerie ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheSingularityReactor ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheStepsofFaith ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheStrikingTreeExtreme ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheStrikingTreeHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheWhorleaterExtreme ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new TheWhorleaterHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThokastThokExtreme ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThokastThokHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThornmarchExtreme ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ThornmarchHard ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new UrthsFount ),
+
+   nullptr
+};
+
+extern "C" EXPORT const Sapphire::ScriptAPI::ScriptObject** getScripts()
+{
+   return ptrs;
+}
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
similarity index 100%
rename from src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
rename to src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
similarity index 100%
rename from src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
rename to src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
similarity index 100%
rename from src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
rename to src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
similarity index 100%
rename from src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
rename to src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
similarity index 100%
rename from src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
rename to src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
similarity index 100%
rename from src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
rename to src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
similarity index 100%
rename from src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
rename to src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
similarity index 100%
rename from src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
rename to src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
similarity index 100%
rename from src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
rename to src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
similarity index 100%
rename from src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
rename to src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
similarity index 100%
rename from src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
rename to src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
similarity index 100%
rename from src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
rename to src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
similarity index 100%
rename from src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
rename to src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
similarity index 100%
rename from src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
rename to src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
similarity index 100%
rename from src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
rename to src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
similarity index 100%
rename from src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
rename to src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
similarity index 100%
rename from src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
rename to src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
similarity index 100%
rename from src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
rename to src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
similarity index 100%
rename from src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
rename to src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
similarity index 100%
rename from src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
rename to src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
diff --git a/src/servers/Scripts/instances/dungeons/AlaMhigo.cpp b/src/scripts/instances/dungeons/AlaMhigo.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/AlaMhigo.cpp
rename to src/scripts/instances/dungeons/AlaMhigo.cpp
diff --git a/src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp b/src/scripts/instances/dungeons/AmdaporKeep.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp
rename to src/scripts/instances/dungeons/AmdaporKeep.cpp
diff --git a/src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp b/src/scripts/instances/dungeons/AmdaporKeepHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp
rename to src/scripts/instances/dungeons/AmdaporKeepHard.cpp
diff --git a/src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp b/src/scripts/instances/dungeons/BaelsarsWall.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp
rename to src/scripts/instances/dungeons/BaelsarsWall.cpp
diff --git a/src/servers/Scripts/instances/dungeons/BardamsMettle.cpp b/src/scripts/instances/dungeons/BardamsMettle.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/BardamsMettle.cpp
rename to src/scripts/instances/dungeons/BardamsMettle.cpp
diff --git a/src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp b/src/scripts/instances/dungeons/BrayfloxsLongstop.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
rename to src/scripts/instances/dungeons/BrayfloxsLongstop.cpp
diff --git a/src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp b/src/scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
rename to src/scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
diff --git a/src/servers/Scripts/instances/dungeons/CastrumAbania.cpp b/src/scripts/instances/dungeons/CastrumAbania.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/CastrumAbania.cpp
rename to src/scripts/instances/dungeons/CastrumAbania.cpp
diff --git a/src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp b/src/scripts/instances/dungeons/CastrumMeridianum.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp
rename to src/scripts/instances/dungeons/CastrumMeridianum.cpp
diff --git a/src/servers/Scripts/instances/dungeons/CopperbellMines.cpp b/src/scripts/instances/dungeons/CopperbellMines.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/CopperbellMines.cpp
rename to src/scripts/instances/dungeons/CopperbellMines.cpp
diff --git a/src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp b/src/scripts/instances/dungeons/CopperbellMinesHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp
rename to src/scripts/instances/dungeons/CopperbellMinesHard.cpp
diff --git a/src/servers/Scripts/instances/dungeons/CuttersCry.cpp b/src/scripts/instances/dungeons/CuttersCry.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/CuttersCry.cpp
rename to src/scripts/instances/dungeons/CuttersCry.cpp
diff --git a/src/servers/Scripts/instances/dungeons/DomaCastle.cpp b/src/scripts/instances/dungeons/DomaCastle.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/DomaCastle.cpp
rename to src/scripts/instances/dungeons/DomaCastle.cpp
diff --git a/src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp b/src/scripts/instances/dungeons/DzemaelDarkhold.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp
rename to src/scripts/instances/dungeons/DzemaelDarkhold.cpp
diff --git a/src/servers/Scripts/instances/dungeons/Halatali.cpp b/src/scripts/instances/dungeons/Halatali.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/Halatali.cpp
rename to src/scripts/instances/dungeons/Halatali.cpp
diff --git a/src/servers/Scripts/instances/dungeons/HalataliHard.cpp b/src/scripts/instances/dungeons/HalataliHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/HalataliHard.cpp
rename to src/scripts/instances/dungeons/HalataliHard.cpp
diff --git a/src/servers/Scripts/instances/dungeons/HaukkeManor.cpp b/src/scripts/instances/dungeons/HaukkeManor.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/HaukkeManor.cpp
rename to src/scripts/instances/dungeons/HaukkeManor.cpp
diff --git a/src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp b/src/scripts/instances/dungeons/HaukkeManorHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp
rename to src/scripts/instances/dungeons/HaukkeManorHard.cpp
diff --git a/src/servers/Scripts/instances/dungeons/HellsLid.cpp b/src/scripts/instances/dungeons/HellsLid.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/HellsLid.cpp
rename to src/scripts/instances/dungeons/HellsLid.cpp
diff --git a/src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp b/src/scripts/instances/dungeons/HullbreakerIsle.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp
rename to src/scripts/instances/dungeons/HullbreakerIsle.cpp
diff --git a/src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp b/src/scripts/instances/dungeons/HullbreakerIsleHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
rename to src/scripts/instances/dungeons/HullbreakerIsleHard.cpp
diff --git a/src/servers/Scripts/instances/dungeons/KuganeCastle.cpp b/src/scripts/instances/dungeons/KuganeCastle.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/KuganeCastle.cpp
rename to src/scripts/instances/dungeons/KuganeCastle.cpp
diff --git a/src/servers/Scripts/instances/dungeons/Neverreap.cpp b/src/scripts/instances/dungeons/Neverreap.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/Neverreap.cpp
rename to src/scripts/instances/dungeons/Neverreap.cpp
diff --git a/src/servers/Scripts/instances/dungeons/PharosSirius.cpp b/src/scripts/instances/dungeons/PharosSirius.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/PharosSirius.cpp
rename to src/scripts/instances/dungeons/PharosSirius.cpp
diff --git a/src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp b/src/scripts/instances/dungeons/PharosSiriusHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp
rename to src/scripts/instances/dungeons/PharosSiriusHard.cpp
diff --git a/src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp b/src/scripts/instances/dungeons/SaintMociannesArboretum.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
rename to src/scripts/instances/dungeons/SaintMociannesArboretum.cpp
diff --git a/src/servers/Scripts/instances/dungeons/Sastasha.cpp b/src/scripts/instances/dungeons/Sastasha.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/Sastasha.cpp
rename to src/scripts/instances/dungeons/Sastasha.cpp
diff --git a/src/servers/Scripts/instances/dungeons/SastashaHard.cpp b/src/scripts/instances/dungeons/SastashaHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/SastashaHard.cpp
rename to src/scripts/instances/dungeons/SastashaHard.cpp
diff --git a/src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp b/src/scripts/instances/dungeons/ShisuioftheVioletTides.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
rename to src/scripts/instances/dungeons/ShisuioftheVioletTides.cpp
diff --git a/src/servers/Scripts/instances/dungeons/Snowcloak.cpp b/src/scripts/instances/dungeons/Snowcloak.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/Snowcloak.cpp
rename to src/scripts/instances/dungeons/Snowcloak.cpp
diff --git a/src/servers/Scripts/instances/dungeons/SohmAl.cpp b/src/scripts/instances/dungeons/SohmAl.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/SohmAl.cpp
rename to src/scripts/instances/dungeons/SohmAl.cpp
diff --git a/src/servers/Scripts/instances/dungeons/SohmAlHard.cpp b/src/scripts/instances/dungeons/SohmAlHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/SohmAlHard.cpp
rename to src/scripts/instances/dungeons/SohmAlHard.cpp
diff --git a/src/servers/Scripts/instances/dungeons/SohrKhai.cpp b/src/scripts/instances/dungeons/SohrKhai.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/SohrKhai.cpp
rename to src/scripts/instances/dungeons/SohrKhai.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheAery.cpp b/src/scripts/instances/dungeons/TheAery.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheAery.cpp
rename to src/scripts/instances/dungeons/TheAery.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp b/src/scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
rename to src/scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheAntitower.cpp b/src/scripts/instances/dungeons/TheAntitower.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheAntitower.cpp
rename to src/scripts/instances/dungeons/TheAntitower.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheAurumVale.cpp b/src/scripts/instances/dungeons/TheAurumVale.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheAurumVale.cpp
rename to src/scripts/instances/dungeons/TheAurumVale.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp b/src/scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
rename to src/scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp b/src/scripts/instances/dungeons/TheDuskVigil.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp
rename to src/scripts/instances/dungeons/TheDuskVigil.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp b/src/scripts/instances/dungeons/TheFractalContinuum.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp
rename to src/scripts/instances/dungeons/TheFractalContinuum.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp b/src/scripts/instances/dungeons/TheFractalContinuumHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
rename to src/scripts/instances/dungeons/TheFractalContinuumHard.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp b/src/scripts/instances/dungeons/TheGreatGubalLibrary.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
rename to src/scripts/instances/dungeons/TheGreatGubalLibrary.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp b/src/scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
rename to src/scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp b/src/scripts/instances/dungeons/TheKeeperoftheLake.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
rename to src/scripts/instances/dungeons/TheKeeperoftheLake.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp b/src/scripts/instances/dungeons/TheLostCityofAmdapor.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
rename to src/scripts/instances/dungeons/TheLostCityofAmdapor.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp b/src/scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
rename to src/scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
diff --git a/src/servers/Scripts/instances/dungeons/ThePraetorium.cpp b/src/scripts/instances/dungeons/ThePraetorium.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/ThePraetorium.cpp
rename to src/scripts/instances/dungeons/ThePraetorium.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp b/src/scripts/instances/dungeons/TheSirensongSea.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp
rename to src/scripts/instances/dungeons/TheSirensongSea.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp b/src/scripts/instances/dungeons/TheStoneVigil.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp
rename to src/scripts/instances/dungeons/TheStoneVigil.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp b/src/scripts/instances/dungeons/TheStoneVigilHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp
rename to src/scripts/instances/dungeons/TheStoneVigilHard.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp b/src/scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
rename to src/scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp b/src/scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
rename to src/scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp b/src/scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
rename to src/scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp b/src/scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
rename to src/scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp b/src/scripts/instances/dungeons/TheTempleoftheFist.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp
rename to src/scripts/instances/dungeons/TheTempleoftheFist.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp b/src/scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
rename to src/scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheVault.cpp b/src/scripts/instances/dungeons/TheVault.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheVault.cpp
rename to src/scripts/instances/dungeons/TheVault.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp b/src/scripts/instances/dungeons/TheWanderersPalace.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp
rename to src/scripts/instances/dungeons/TheWanderersPalace.cpp
diff --git a/src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp b/src/scripts/instances/dungeons/TheWanderersPalaceHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
rename to src/scripts/instances/dungeons/TheWanderersPalaceHard.cpp
diff --git a/src/servers/Scripts/instances/dungeons/Xelphatol.cpp b/src/scripts/instances/dungeons/Xelphatol.cpp
similarity index 100%
rename from src/servers/Scripts/instances/dungeons/Xelphatol.cpp
rename to src/scripts/instances/dungeons/Xelphatol.cpp
diff --git a/src/servers/Scripts/instances/events/TheHauntedManor.cpp b/src/scripts/instances/events/TheHauntedManor.cpp
similarity index 100%
rename from src/servers/Scripts/instances/events/TheHauntedManor.cpp
rename to src/scripts/instances/events/TheHauntedManor.cpp
diff --git a/src/servers/Scripts/instances/events/TheValentionesCeremony.cpp b/src/scripts/instances/events/TheValentionesCeremony.cpp
similarity index 100%
rename from src/servers/Scripts/instances/events/TheValentionesCeremony.cpp
rename to src/scripts/instances/events/TheValentionesCeremony.cpp
diff --git a/src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp b/src/scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
similarity index 100%
rename from src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
rename to src/scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
diff --git a/src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp b/src/scripts/instances/guildhests/AnnoytheVoid.cpp
similarity index 100%
rename from src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp
rename to src/scripts/instances/guildhests/AnnoytheVoid.cpp
diff --git a/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp b/src/scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
similarity index 100%
rename from src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
rename to src/scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
diff --git a/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp b/src/scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
similarity index 100%
rename from src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
rename to src/scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
diff --git a/src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp b/src/scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
similarity index 100%
rename from src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
rename to src/scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
diff --git a/src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp b/src/scripts/instances/guildhests/HeroontheHalfShell.cpp
similarity index 100%
rename from src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp
rename to src/scripts/instances/guildhests/HeroontheHalfShell.cpp
diff --git a/src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp b/src/scripts/instances/guildhests/LongLivetheQueen.cpp
similarity index 100%
rename from src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp
rename to src/scripts/instances/guildhests/LongLivetheQueen.cpp
diff --git a/src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp b/src/scripts/instances/guildhests/MorethanaFeeler.cpp
similarity index 100%
rename from src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp
rename to src/scripts/instances/guildhests/MorethanaFeeler.cpp
diff --git a/src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp b/src/scripts/instances/guildhests/PullingPoisonPosies.cpp
similarity index 100%
rename from src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp
rename to src/scripts/instances/guildhests/PullingPoisonPosies.cpp
diff --git a/src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp b/src/scripts/instances/guildhests/ShadowandClaw.cpp
similarity index 100%
rename from src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp
rename to src/scripts/instances/guildhests/ShadowandClaw.cpp
diff --git a/src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp b/src/scripts/instances/guildhests/SolemnTrinity.cpp
similarity index 100%
rename from src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp
rename to src/scripts/instances/guildhests/SolemnTrinity.cpp
diff --git a/src/servers/Scripts/instances/guildhests/StingingBack.cpp b/src/scripts/instances/guildhests/StingingBack.cpp
similarity index 100%
rename from src/servers/Scripts/instances/guildhests/StingingBack.cpp
rename to src/scripts/instances/guildhests/StingingBack.cpp
diff --git a/src/servers/Scripts/instances/guildhests/UndertheArmor.cpp b/src/scripts/instances/guildhests/UndertheArmor.cpp
similarity index 100%
rename from src/servers/Scripts/instances/guildhests/UndertheArmor.cpp
rename to src/scripts/instances/guildhests/UndertheArmor.cpp
diff --git a/src/servers/Scripts/instances/guildhests/WardUp.cpp b/src/scripts/instances/guildhests/WardUp.cpp
similarity index 100%
rename from src/servers/Scripts/instances/guildhests/WardUp.cpp
rename to src/scripts/instances/guildhests/WardUp.cpp
diff --git a/src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp b/src/scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
similarity index 100%
rename from src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
rename to src/scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
diff --git a/src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp b/src/scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
similarity index 100%
rename from src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
rename to src/scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
diff --git a/src/servers/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp b/src/scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
similarity index 100%
rename from src/servers/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
rename to src/scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
diff --git a/src/servers/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp b/src/scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
similarity index 100%
rename from src/servers/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
rename to src/scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
diff --git a/src/servers/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp b/src/scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
similarity index 100%
rename from src/servers/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
rename to src/scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
diff --git a/src/servers/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp b/src/scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
similarity index 100%
rename from src/servers/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
rename to src/scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
diff --git a/src/servers/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp b/src/scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
similarity index 100%
rename from src/servers/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
rename to src/scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
diff --git a/src/servers/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp b/src/scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
similarity index 100%
rename from src/servers/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
rename to src/scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
diff --git a/src/servers/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp b/src/scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
similarity index 100%
rename from src/servers/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
rename to src/scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
diff --git a/src/servers/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp b/src/scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
similarity index 100%
rename from src/servers/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
rename to src/scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
diff --git a/src/servers/Scripts/instances/hallofthenovice/FinalExercise.cpp b/src/scripts/instances/hallofthenovice/FinalExercise.cpp
similarity index 100%
rename from src/servers/Scripts/instances/hallofthenovice/FinalExercise.cpp
rename to src/scripts/instances/hallofthenovice/FinalExercise.cpp
diff --git a/src/servers/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp b/src/scripts/instances/hallofthenovice/HealMultipleAllies.cpp
similarity index 100%
rename from src/servers/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
rename to src/scripts/instances/hallofthenovice/HealMultipleAllies.cpp
diff --git a/src/servers/Scripts/instances/hallofthenovice/HealanAlly.cpp b/src/scripts/instances/hallofthenovice/HealanAlly.cpp
similarity index 100%
rename from src/servers/Scripts/instances/hallofthenovice/HealanAlly.cpp
rename to src/scripts/instances/hallofthenovice/HealanAlly.cpp
diff --git a/src/servers/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp b/src/scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
similarity index 100%
rename from src/servers/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
rename to src/scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
diff --git a/src/servers/Scripts/instances/pvp/Astragalos.cpp b/src/scripts/instances/pvp/Astragalos.cpp
similarity index 100%
rename from src/servers/Scripts/instances/pvp/Astragalos.cpp
rename to src/scripts/instances/pvp/Astragalos.cpp
diff --git a/src/servers/Scripts/instances/pvp/SealRockSeize.cpp b/src/scripts/instances/pvp/SealRockSeize.cpp
similarity index 100%
rename from src/servers/Scripts/instances/pvp/SealRockSeize.cpp
rename to src/scripts/instances/pvp/SealRockSeize.cpp
diff --git a/src/servers/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp b/src/scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
similarity index 100%
rename from src/servers/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
rename to src/scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
diff --git a/src/servers/Scripts/instances/pvp/TheFeast4on4LightParty.cpp b/src/scripts/instances/pvp/TheFeast4on4LightParty.cpp
similarity index 100%
rename from src/servers/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
rename to src/scripts/instances/pvp/TheFeast4on4LightParty.cpp
diff --git a/src/servers/Scripts/instances/pvp/TheFeast4on4Ranked.cpp b/src/scripts/instances/pvp/TheFeast4on4Ranked.cpp
similarity index 100%
rename from src/servers/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
rename to src/scripts/instances/pvp/TheFeast4on4Ranked.cpp
diff --git a/src/servers/Scripts/instances/pvp/TheFeast4on4Training.cpp b/src/scripts/instances/pvp/TheFeast4on4Training.cpp
similarity index 100%
rename from src/servers/Scripts/instances/pvp/TheFeast4on4Training.cpp
rename to src/scripts/instances/pvp/TheFeast4on4Training.cpp
diff --git a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp b/src/scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
similarity index 100%
rename from src/servers/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
rename to src/scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
diff --git a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp b/src/scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
similarity index 100%
rename from src/servers/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
rename to src/scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
diff --git a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp b/src/scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
similarity index 100%
rename from src/servers/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
rename to src/scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
diff --git a/src/servers/Scripts/instances/pvp/TheFeastRanked.cpp b/src/scripts/instances/pvp/TheFeastRanked.cpp
similarity index 100%
rename from src/servers/Scripts/instances/pvp/TheFeastRanked.cpp
rename to src/scripts/instances/pvp/TheFeastRanked.cpp
diff --git a/src/servers/Scripts/instances/pvp/TheFeastTeamRanked.cpp b/src/scripts/instances/pvp/TheFeastTeamRanked.cpp
similarity index 100%
rename from src/servers/Scripts/instances/pvp/TheFeastTeamRanked.cpp
rename to src/scripts/instances/pvp/TheFeastTeamRanked.cpp
diff --git a/src/servers/Scripts/instances/pvp/TheFeastTraining.cpp b/src/scripts/instances/pvp/TheFeastTraining.cpp
similarity index 100%
rename from src/servers/Scripts/instances/pvp/TheFeastTraining.cpp
rename to src/scripts/instances/pvp/TheFeastTraining.cpp
diff --git a/src/servers/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp b/src/scripts/instances/pvp/TheFieldsofGloryShatter.cpp
similarity index 100%
rename from src/servers/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
rename to src/scripts/instances/pvp/TheFieldsofGloryShatter.cpp
diff --git a/src/servers/Scripts/instances/questbattles/ABloodyReunion.cpp b/src/scripts/instances/questbattles/ABloodyReunion.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/ABloodyReunion.cpp
rename to src/scripts/instances/questbattles/ABloodyReunion.cpp
diff --git a/src/servers/Scripts/instances/questbattles/ASpectaclefortheAges.cpp b/src/scripts/instances/questbattles/ASpectaclefortheAges.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/ASpectaclefortheAges.cpp
rename to src/scripts/instances/questbattles/ASpectaclefortheAges.cpp
diff --git a/src/servers/Scripts/instances/questbattles/BloodDragoon.cpp b/src/scripts/instances/questbattles/BloodDragoon.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/BloodDragoon.cpp
rename to src/scripts/instances/questbattles/BloodDragoon.cpp
diff --git a/src/servers/Scripts/instances/questbattles/BloodontheDeck.cpp b/src/scripts/instances/questbattles/BloodontheDeck.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/BloodontheDeck.cpp
rename to src/scripts/instances/questbattles/BloodontheDeck.cpp
diff --git a/src/servers/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp b/src/scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
rename to src/scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
diff --git a/src/servers/Scripts/instances/questbattles/DarkwingDragon.cpp b/src/scripts/instances/questbattles/DarkwingDragon.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/DarkwingDragon.cpp
rename to src/scripts/instances/questbattles/DarkwingDragon.cpp
diff --git a/src/servers/Scripts/instances/questbattles/InThalsName.cpp b/src/scripts/instances/questbattles/InThalsName.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/InThalsName.cpp
rename to src/scripts/instances/questbattles/InThalsName.cpp
diff --git a/src/servers/Scripts/instances/questbattles/InterdimensionalRift.cpp b/src/scripts/instances/questbattles/InterdimensionalRift.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/InterdimensionalRift.cpp
rename to src/scripts/instances/questbattles/InterdimensionalRift.cpp
diff --git a/src/servers/Scripts/instances/questbattles/ItsProbablyaTrap.cpp b/src/scripts/instances/questbattles/ItsProbablyaTrap.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/ItsProbablyaTrap.cpp
rename to src/scripts/instances/questbattles/ItsProbablyaTrap.cpp
diff --git a/src/servers/Scripts/instances/questbattles/MatsubaMayhem.cpp b/src/scripts/instances/questbattles/MatsubaMayhem.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/MatsubaMayhem.cpp
rename to src/scripts/instances/questbattles/MatsubaMayhem.cpp
diff --git a/src/servers/Scripts/instances/questbattles/Naadam.cpp b/src/scripts/instances/questbattles/Naadam.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/Naadam.cpp
rename to src/scripts/instances/questbattles/Naadam.cpp
diff --git a/src/servers/Scripts/instances/questbattles/OneLifeforOneWorld.cpp b/src/scripts/instances/questbattles/OneLifeforOneWorld.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/OneLifeforOneWorld.cpp
rename to src/scripts/instances/questbattles/OneLifeforOneWorld.cpp
diff --git a/src/servers/Scripts/instances/questbattles/OurCompromise.cpp b/src/scripts/instances/questbattles/OurCompromise.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/OurCompromise.cpp
rename to src/scripts/instances/questbattles/OurCompromise.cpp
diff --git a/src/servers/Scripts/instances/questbattles/OurUnsungHeroes.cpp b/src/scripts/instances/questbattles/OurUnsungHeroes.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/OurUnsungHeroes.cpp
rename to src/scripts/instances/questbattles/OurUnsungHeroes.cpp
diff --git a/src/servers/Scripts/instances/questbattles/RaisingtheSword.cpp b/src/scripts/instances/questbattles/RaisingtheSword.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/RaisingtheSword.cpp
rename to src/scripts/instances/questbattles/RaisingtheSword.cpp
diff --git a/src/servers/Scripts/instances/questbattles/ReturnoftheBull.cpp b/src/scripts/instances/questbattles/ReturnoftheBull.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/ReturnoftheBull.cpp
rename to src/scripts/instances/questbattles/ReturnoftheBull.cpp
diff --git a/src/servers/Scripts/instances/questbattles/TheBattleonBekko.cpp b/src/scripts/instances/questbattles/TheBattleonBekko.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/TheBattleonBekko.cpp
rename to src/scripts/instances/questbattles/TheBattleonBekko.cpp
diff --git a/src/servers/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp b/src/scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
rename to src/scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
diff --git a/src/servers/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp b/src/scripts/instances/questbattles/TheFaceofTrueEvil.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp
rename to src/scripts/instances/questbattles/TheFaceofTrueEvil.cpp
diff --git a/src/servers/Scripts/instances/questbattles/TheHeartoftheProblem.cpp b/src/scripts/instances/questbattles/TheHeartoftheProblem.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/TheHeartoftheProblem.cpp
rename to src/scripts/instances/questbattles/TheHeartoftheProblem.cpp
diff --git a/src/servers/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp b/src/scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
rename to src/scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
diff --git a/src/servers/Scripts/instances/questbattles/TheResonant.cpp b/src/scripts/instances/questbattles/TheResonant.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/TheResonant.cpp
rename to src/scripts/instances/questbattles/TheResonant.cpp
diff --git a/src/servers/Scripts/instances/questbattles/WhenClansCollide.cpp b/src/scripts/instances/questbattles/WhenClansCollide.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/WhenClansCollide.cpp
rename to src/scripts/instances/questbattles/WhenClansCollide.cpp
diff --git a/src/servers/Scripts/instances/questbattles/WithHeartandSteel.cpp b/src/scripts/instances/questbattles/WithHeartandSteel.cpp
similarity index 100%
rename from src/servers/Scripts/instances/questbattles/WithHeartandSteel.cpp
rename to src/scripts/instances/questbattles/WithHeartandSteel.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp b/src/scripts/instances/raids/AlexanderTheArmoftheFather.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp
rename to src/scripts/instances/raids/AlexanderTheArmoftheFather.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp b/src/scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
rename to src/scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp b/src/scripts/instances/raids/AlexanderTheArmoftheSon.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp
rename to src/scripts/instances/raids/AlexanderTheArmoftheSon.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp b/src/scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
rename to src/scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp b/src/scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
rename to src/scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp b/src/scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
rename to src/scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp b/src/scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
rename to src/scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp b/src/scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
rename to src/scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp b/src/scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
rename to src/scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp b/src/scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
rename to src/scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp b/src/scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
rename to src/scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp b/src/scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
rename to src/scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp b/src/scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
rename to src/scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp b/src/scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
rename to src/scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp b/src/scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
rename to src/scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp b/src/scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
rename to src/scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp b/src/scripts/instances/raids/AlexanderTheFistoftheFather.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp
rename to src/scripts/instances/raids/AlexanderTheFistoftheFather.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp b/src/scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
rename to src/scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp b/src/scripts/instances/raids/AlexanderTheFistoftheSon.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp
rename to src/scripts/instances/raids/AlexanderTheFistoftheSon.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp b/src/scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
rename to src/scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp b/src/scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
rename to src/scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp b/src/scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
rename to src/scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp b/src/scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
rename to src/scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp b/src/scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
rename to src/scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV10.cpp b/src/scripts/instances/raids/DeltascapeV10.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/DeltascapeV10.cpp
rename to src/scripts/instances/raids/DeltascapeV10.cpp
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV10Savage.cpp b/src/scripts/instances/raids/DeltascapeV10Savage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/DeltascapeV10Savage.cpp
rename to src/scripts/instances/raids/DeltascapeV10Savage.cpp
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV20.cpp b/src/scripts/instances/raids/DeltascapeV20.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/DeltascapeV20.cpp
rename to src/scripts/instances/raids/DeltascapeV20.cpp
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV20Savage.cpp b/src/scripts/instances/raids/DeltascapeV20Savage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/DeltascapeV20Savage.cpp
rename to src/scripts/instances/raids/DeltascapeV20Savage.cpp
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV30.cpp b/src/scripts/instances/raids/DeltascapeV30.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/DeltascapeV30.cpp
rename to src/scripts/instances/raids/DeltascapeV30.cpp
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV30Savage.cpp b/src/scripts/instances/raids/DeltascapeV30Savage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/DeltascapeV30Savage.cpp
rename to src/scripts/instances/raids/DeltascapeV30Savage.cpp
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV40.cpp b/src/scripts/instances/raids/DeltascapeV40.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/DeltascapeV40.cpp
rename to src/scripts/instances/raids/DeltascapeV40.cpp
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV40Savage.cpp b/src/scripts/instances/raids/DeltascapeV40Savage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/DeltascapeV40Savage.cpp
rename to src/scripts/instances/raids/DeltascapeV40Savage.cpp
diff --git a/src/servers/Scripts/instances/raids/DunScaith.cpp b/src/scripts/instances/raids/DunScaith.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/DunScaith.cpp
rename to src/scripts/instances/raids/DunScaith.cpp
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV10.cpp b/src/scripts/instances/raids/SigmascapeV10.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/SigmascapeV10.cpp
rename to src/scripts/instances/raids/SigmascapeV10.cpp
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV10Savage.cpp b/src/scripts/instances/raids/SigmascapeV10Savage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/SigmascapeV10Savage.cpp
rename to src/scripts/instances/raids/SigmascapeV10Savage.cpp
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV20.cpp b/src/scripts/instances/raids/SigmascapeV20.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/SigmascapeV20.cpp
rename to src/scripts/instances/raids/SigmascapeV20.cpp
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV20Savage.cpp b/src/scripts/instances/raids/SigmascapeV20Savage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/SigmascapeV20Savage.cpp
rename to src/scripts/instances/raids/SigmascapeV20Savage.cpp
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV30.cpp b/src/scripts/instances/raids/SigmascapeV30.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/SigmascapeV30.cpp
rename to src/scripts/instances/raids/SigmascapeV30.cpp
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV30Savage.cpp b/src/scripts/instances/raids/SigmascapeV30Savage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/SigmascapeV30Savage.cpp
rename to src/scripts/instances/raids/SigmascapeV30Savage.cpp
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV40.cpp b/src/scripts/instances/raids/SigmascapeV40.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/SigmascapeV40.cpp
rename to src/scripts/instances/raids/SigmascapeV40.cpp
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV40Savage.cpp b/src/scripts/instances/raids/SigmascapeV40Savage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/SigmascapeV40Savage.cpp
rename to src/scripts/instances/raids/SigmascapeV40Savage.cpp
diff --git a/src/servers/Scripts/instances/raids/SyrcusTower.cpp b/src/scripts/instances/raids/SyrcusTower.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/SyrcusTower.cpp
rename to src/scripts/instances/raids/SyrcusTower.cpp
diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
rename to src/scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
rename to src/scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
rename to src/scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
rename to src/scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
rename to src/scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
diff --git a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp b/src/scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
rename to src/scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
diff --git a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp b/src/scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
rename to src/scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
diff --git a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp b/src/scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
rename to src/scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
diff --git a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp b/src/scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
rename to src/scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
diff --git a/src/servers/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp b/src/scripts/instances/raids/TheLabyrinthoftheAncients.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp
rename to src/scripts/instances/raids/TheLabyrinthoftheAncients.cpp
diff --git a/src/servers/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp b/src/scripts/instances/raids/TheRoyalCityofRabanastre.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp
rename to src/scripts/instances/raids/TheRoyalCityofRabanastre.cpp
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
rename to src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
rename to src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
rename to src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
rename to src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
rename to src/scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
rename to src/scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
rename to src/scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
rename to src/scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
diff --git a/src/servers/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp b/src/scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
rename to src/scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
diff --git a/src/servers/Scripts/instances/raids/TheVoidArk.cpp b/src/scripts/instances/raids/TheVoidArk.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheVoidArk.cpp
rename to src/scripts/instances/raids/TheVoidArk.cpp
diff --git a/src/servers/Scripts/instances/raids/TheWeaponsRefrainUltimate.cpp b/src/scripts/instances/raids/TheWeaponsRefrainUltimate.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheWeaponsRefrainUltimate.cpp
rename to src/scripts/instances/raids/TheWeaponsRefrainUltimate.cpp
diff --git a/src/servers/Scripts/instances/raids/TheWeepingCityofMhach.cpp b/src/scripts/instances/raids/TheWeepingCityofMhach.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheWeepingCityofMhach.cpp
rename to src/scripts/instances/raids/TheWeepingCityofMhach.cpp
diff --git a/src/servers/Scripts/instances/raids/TheWorldofDarkness.cpp b/src/scripts/instances/raids/TheWorldofDarkness.cpp
similarity index 100%
rename from src/servers/Scripts/instances/raids/TheWorldofDarkness.cpp
rename to src/scripts/instances/raids/TheWorldofDarkness.cpp
diff --git a/src/servers/Scripts/instances/treasurehunt/TheAquapolis.cpp b/src/scripts/instances/treasurehunt/TheAquapolis.cpp
similarity index 100%
rename from src/servers/Scripts/instances/treasurehunt/TheAquapolis.cpp
rename to src/scripts/instances/treasurehunt/TheAquapolis.cpp
diff --git a/src/servers/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp b/src/scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
similarity index 100%
rename from src/servers/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
rename to src/scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
diff --git a/src/servers/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp b/src/scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
similarity index 100%
rename from src/servers/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
rename to src/scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
diff --git a/src/servers/Scripts/instances/trials/ARelicReborntheChimera.cpp b/src/scripts/instances/trials/ARelicReborntheChimera.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/ARelicReborntheChimera.cpp
rename to src/scripts/instances/trials/ARelicReborntheChimera.cpp
diff --git a/src/servers/Scripts/instances/trials/ARelicReborntheHydra.cpp b/src/scripts/instances/trials/ARelicReborntheHydra.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/ARelicReborntheHydra.cpp
rename to src/scripts/instances/trials/ARelicReborntheHydra.cpp
diff --git a/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp b/src/scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
rename to src/scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
diff --git a/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp b/src/scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
rename to src/scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
diff --git a/src/servers/Scripts/instances/trials/BattleintheBigKeep.cpp b/src/scripts/instances/trials/BattleintheBigKeep.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/BattleintheBigKeep.cpp
rename to src/scripts/instances/trials/BattleintheBigKeep.cpp
diff --git a/src/servers/Scripts/instances/trials/BattleontheBigBridge.cpp b/src/scripts/instances/trials/BattleontheBigBridge.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/BattleontheBigBridge.cpp
rename to src/scripts/instances/trials/BattleontheBigBridge.cpp
diff --git a/src/servers/Scripts/instances/trials/CapeWestwind.cpp b/src/scripts/instances/trials/CapeWestwind.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/CapeWestwind.cpp
rename to src/scripts/instances/trials/CapeWestwind.cpp
diff --git a/src/servers/Scripts/instances/trials/ContainmentBayP1T6.cpp b/src/scripts/instances/trials/ContainmentBayP1T6.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/ContainmentBayP1T6.cpp
rename to src/scripts/instances/trials/ContainmentBayP1T6.cpp
diff --git a/src/servers/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp b/src/scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
rename to src/scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
diff --git a/src/servers/Scripts/instances/trials/ContainmentBayS1T7.cpp b/src/scripts/instances/trials/ContainmentBayS1T7.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/ContainmentBayS1T7.cpp
rename to src/scripts/instances/trials/ContainmentBayS1T7.cpp
diff --git a/src/servers/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp b/src/scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
rename to src/scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
diff --git a/src/servers/Scripts/instances/trials/ContainmentBayZ1T9.cpp b/src/scripts/instances/trials/ContainmentBayZ1T9.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/ContainmentBayZ1T9.cpp
rename to src/scripts/instances/trials/ContainmentBayZ1T9.cpp
diff --git a/src/servers/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp b/src/scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
rename to src/scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
diff --git a/src/servers/Scripts/instances/trials/Emanation.cpp b/src/scripts/instances/trials/Emanation.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/Emanation.cpp
rename to src/scripts/instances/trials/Emanation.cpp
diff --git a/src/servers/Scripts/instances/trials/EmanationExtreme.cpp b/src/scripts/instances/trials/EmanationExtreme.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/EmanationExtreme.cpp
rename to src/scripts/instances/trials/EmanationExtreme.cpp
diff --git a/src/servers/Scripts/instances/trials/SpecialEventI.cpp b/src/scripts/instances/trials/SpecialEventI.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/SpecialEventI.cpp
rename to src/scripts/instances/trials/SpecialEventI.cpp
diff --git a/src/servers/Scripts/instances/trials/SpecialEventII.cpp b/src/scripts/instances/trials/SpecialEventII.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/SpecialEventII.cpp
rename to src/scripts/instances/trials/SpecialEventII.cpp
diff --git a/src/servers/Scripts/instances/trials/SpecialEventIII.cpp b/src/scripts/instances/trials/SpecialEventIII.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/SpecialEventIII.cpp
rename to src/scripts/instances/trials/SpecialEventIII.cpp
diff --git a/src/servers/Scripts/instances/trials/TheBowlofEmbers.cpp b/src/scripts/instances/trials/TheBowlofEmbers.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheBowlofEmbers.cpp
rename to src/scripts/instances/trials/TheBowlofEmbers.cpp
diff --git a/src/servers/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp b/src/scripts/instances/trials/TheBowlofEmbersExtreme.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
rename to src/scripts/instances/trials/TheBowlofEmbersExtreme.cpp
diff --git a/src/servers/Scripts/instances/trials/TheBowlofEmbersHard.cpp b/src/scripts/instances/trials/TheBowlofEmbersHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheBowlofEmbersHard.cpp
rename to src/scripts/instances/trials/TheBowlofEmbersHard.cpp
diff --git a/src/servers/Scripts/instances/trials/TheChrysalis.cpp b/src/scripts/instances/trials/TheChrysalis.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheChrysalis.cpp
rename to src/scripts/instances/trials/TheChrysalis.cpp
diff --git a/src/servers/Scripts/instances/trials/TheDragonsNeck.cpp b/src/scripts/instances/trials/TheDragonsNeck.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheDragonsNeck.cpp
rename to src/scripts/instances/trials/TheDragonsNeck.cpp
diff --git a/src/servers/Scripts/instances/trials/TheFinalStepsofFaith.cpp b/src/scripts/instances/trials/TheFinalStepsofFaith.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheFinalStepsofFaith.cpp
rename to src/scripts/instances/trials/TheFinalStepsofFaith.cpp
diff --git a/src/servers/Scripts/instances/trials/TheHowlingEye.cpp b/src/scripts/instances/trials/TheHowlingEye.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheHowlingEye.cpp
rename to src/scripts/instances/trials/TheHowlingEye.cpp
diff --git a/src/servers/Scripts/instances/trials/TheHowlingEyeExtreme.cpp b/src/scripts/instances/trials/TheHowlingEyeExtreme.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
rename to src/scripts/instances/trials/TheHowlingEyeExtreme.cpp
diff --git a/src/servers/Scripts/instances/trials/TheHowlingEyeHard.cpp b/src/scripts/instances/trials/TheHowlingEyeHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheHowlingEyeHard.cpp
rename to src/scripts/instances/trials/TheHowlingEyeHard.cpp
diff --git a/src/servers/Scripts/instances/trials/TheJadeStoa.cpp b/src/scripts/instances/trials/TheJadeStoa.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheJadeStoa.cpp
rename to src/scripts/instances/trials/TheJadeStoa.cpp
diff --git a/src/servers/Scripts/instances/trials/TheJadeStoaExtreme.cpp b/src/scripts/instances/trials/TheJadeStoaExtreme.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheJadeStoaExtreme.cpp
rename to src/scripts/instances/trials/TheJadeStoaExtreme.cpp
diff --git a/src/servers/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp b/src/scripts/instances/trials/TheLimitlessBlueExtreme.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
rename to src/scripts/instances/trials/TheLimitlessBlueExtreme.cpp
diff --git a/src/servers/Scripts/instances/trials/TheLimitlessBlueHard.cpp b/src/scripts/instances/trials/TheLimitlessBlueHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheLimitlessBlueHard.cpp
rename to src/scripts/instances/trials/TheLimitlessBlueHard.cpp
diff --git a/src/servers/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp b/src/scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
rename to src/scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
diff --git a/src/servers/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp b/src/scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
rename to src/scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
diff --git a/src/servers/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp b/src/scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
rename to src/scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
diff --git a/src/servers/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp b/src/scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
rename to src/scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
diff --git a/src/servers/Scripts/instances/trials/TheNavel.cpp b/src/scripts/instances/trials/TheNavel.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheNavel.cpp
rename to src/scripts/instances/trials/TheNavel.cpp
diff --git a/src/servers/Scripts/instances/trials/TheNavelExtreme.cpp b/src/scripts/instances/trials/TheNavelExtreme.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheNavelExtreme.cpp
rename to src/scripts/instances/trials/TheNavelExtreme.cpp
diff --git a/src/servers/Scripts/instances/trials/TheNavelHard.cpp b/src/scripts/instances/trials/TheNavelHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheNavelHard.cpp
rename to src/scripts/instances/trials/TheNavelHard.cpp
diff --git a/src/servers/Scripts/instances/trials/ThePoolofTribute.cpp b/src/scripts/instances/trials/ThePoolofTribute.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/ThePoolofTribute.cpp
rename to src/scripts/instances/trials/ThePoolofTribute.cpp
diff --git a/src/servers/Scripts/instances/trials/ThePoolofTributeExtreme.cpp b/src/scripts/instances/trials/ThePoolofTributeExtreme.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
rename to src/scripts/instances/trials/ThePoolofTributeExtreme.cpp
diff --git a/src/servers/Scripts/instances/trials/TheRoyalMenagerie.cpp b/src/scripts/instances/trials/TheRoyalMenagerie.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheRoyalMenagerie.cpp
rename to src/scripts/instances/trials/TheRoyalMenagerie.cpp
diff --git a/src/servers/Scripts/instances/trials/TheSingularityReactor.cpp b/src/scripts/instances/trials/TheSingularityReactor.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheSingularityReactor.cpp
rename to src/scripts/instances/trials/TheSingularityReactor.cpp
diff --git a/src/servers/Scripts/instances/trials/TheStepsofFaith.cpp b/src/scripts/instances/trials/TheStepsofFaith.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheStepsofFaith.cpp
rename to src/scripts/instances/trials/TheStepsofFaith.cpp
diff --git a/src/servers/Scripts/instances/trials/TheStrikingTreeExtreme.cpp b/src/scripts/instances/trials/TheStrikingTreeExtreme.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
rename to src/scripts/instances/trials/TheStrikingTreeExtreme.cpp
diff --git a/src/servers/Scripts/instances/trials/TheStrikingTreeHard.cpp b/src/scripts/instances/trials/TheStrikingTreeHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheStrikingTreeHard.cpp
rename to src/scripts/instances/trials/TheStrikingTreeHard.cpp
diff --git a/src/servers/Scripts/instances/trials/TheWhorleaterExtreme.cpp b/src/scripts/instances/trials/TheWhorleaterExtreme.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheWhorleaterExtreme.cpp
rename to src/scripts/instances/trials/TheWhorleaterExtreme.cpp
diff --git a/src/servers/Scripts/instances/trials/TheWhorleaterHard.cpp b/src/scripts/instances/trials/TheWhorleaterHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/TheWhorleaterHard.cpp
rename to src/scripts/instances/trials/TheWhorleaterHard.cpp
diff --git a/src/servers/Scripts/instances/trials/ThokastThokExtreme.cpp b/src/scripts/instances/trials/ThokastThokExtreme.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/ThokastThokExtreme.cpp
rename to src/scripts/instances/trials/ThokastThokExtreme.cpp
diff --git a/src/servers/Scripts/instances/trials/ThokastThokHard.cpp b/src/scripts/instances/trials/ThokastThokHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/ThokastThokHard.cpp
rename to src/scripts/instances/trials/ThokastThokHard.cpp
diff --git a/src/servers/Scripts/instances/trials/ThornmarchExtreme.cpp b/src/scripts/instances/trials/ThornmarchExtreme.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/ThornmarchExtreme.cpp
rename to src/scripts/instances/trials/ThornmarchExtreme.cpp
diff --git a/src/servers/Scripts/instances/trials/ThornmarchHard.cpp b/src/scripts/instances/trials/ThornmarchHard.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/ThornmarchHard.cpp
rename to src/scripts/instances/trials/ThornmarchHard.cpp
diff --git a/src/servers/Scripts/instances/trials/UrthsFount.cpp b/src/scripts/instances/trials/UrthsFount.cpp
similarity index 100%
rename from src/servers/Scripts/instances/trials/UrthsFount.cpp
rename to src/scripts/instances/trials/UrthsFount.cpp
diff --git a/src/servers/Scripts/opening/OpeningGridania.cpp b/src/scripts/opening/OpeningGridania.cpp
similarity index 100%
rename from src/servers/Scripts/opening/OpeningGridania.cpp
rename to src/scripts/opening/OpeningGridania.cpp
diff --git a/src/servers/Scripts/opening/OpeningLimsa.cpp b/src/scripts/opening/OpeningLimsa.cpp
similarity index 100%
rename from src/servers/Scripts/opening/OpeningLimsa.cpp
rename to src/scripts/opening/OpeningLimsa.cpp
diff --git a/src/servers/Scripts/opening/OpeningUldah.cpp b/src/scripts/opening/OpeningUldah.cpp
similarity index 100%
rename from src/servers/Scripts/opening/OpeningUldah.cpp
rename to src/scripts/opening/OpeningUldah.cpp
diff --git a/src/scripts/opening/ScriptLoader.cpp b/src/scripts/opening/ScriptLoader.cpp
new file mode 100644
index 00000000..2b6f9fc4
--- /dev/null
+++ b/src/scripts/opening/ScriptLoader.cpp
@@ -0,0 +1,19 @@
+#include <Script/NativeScriptApi.h>
+
+#include "OpeningGridania.cpp"
+#include "OpeningLimsa.cpp"
+#include "OpeningUldah.cpp"
+
+const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
+{
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new OpeningGridania ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new OpeningLimsa ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new OpeningUldah ),
+
+   nullptr
+};
+
+extern "C" EXPORT const Sapphire::ScriptAPI::ScriptObject** getScripts()
+{
+   return ptrs;
+}
diff --git a/src/servers/Scripts/quest/ManFst001.cpp b/src/scripts/quest/ManFst001.cpp
similarity index 100%
rename from src/servers/Scripts/quest/ManFst001.cpp
rename to src/scripts/quest/ManFst001.cpp
diff --git a/src/servers/Scripts/quest/ManFst002.cpp b/src/scripts/quest/ManFst002.cpp
similarity index 100%
rename from src/servers/Scripts/quest/ManFst002.cpp
rename to src/scripts/quest/ManFst002.cpp
diff --git a/src/servers/Scripts/quest/ManFst003.cpp b/src/scripts/quest/ManFst003.cpp
similarity index 100%
rename from src/servers/Scripts/quest/ManFst003.cpp
rename to src/scripts/quest/ManFst003.cpp
diff --git a/src/servers/Scripts/quest/ManFst004.cpp b/src/scripts/quest/ManFst004.cpp
similarity index 100%
rename from src/servers/Scripts/quest/ManFst004.cpp
rename to src/scripts/quest/ManFst004.cpp
diff --git a/src/servers/Scripts/quest/ManSea001.cpp b/src/scripts/quest/ManSea001.cpp
similarity index 100%
rename from src/servers/Scripts/quest/ManSea001.cpp
rename to src/scripts/quest/ManSea001.cpp
diff --git a/src/servers/Scripts/quest/ManSea002.cpp b/src/scripts/quest/ManSea002.cpp
similarity index 100%
rename from src/servers/Scripts/quest/ManSea002.cpp
rename to src/scripts/quest/ManSea002.cpp
diff --git a/src/servers/Scripts/quest/ManSea003.cpp b/src/scripts/quest/ManSea003.cpp
similarity index 100%
rename from src/servers/Scripts/quest/ManSea003.cpp
rename to src/scripts/quest/ManSea003.cpp
diff --git a/src/servers/Scripts/quest/ManWil001.cpp b/src/scripts/quest/ManWil001.cpp
similarity index 100%
rename from src/servers/Scripts/quest/ManWil001.cpp
rename to src/scripts/quest/ManWil001.cpp
diff --git a/src/servers/Scripts/quest/ManWil002.cpp b/src/scripts/quest/ManWil002.cpp
similarity index 100%
rename from src/servers/Scripts/quest/ManWil002.cpp
rename to src/scripts/quest/ManWil002.cpp
diff --git a/src/scripts/quest/ScriptLoader.cpp b/src/scripts/quest/ScriptLoader.cpp
new file mode 100644
index 00000000..2c05f339
--- /dev/null
+++ b/src/scripts/quest/ScriptLoader.cpp
@@ -0,0 +1,91 @@
+#include <Script/NativeScriptApi.h>
+
+#include "ManFst001.cpp"
+#include "ManFst002.cpp"
+#include "ManFst003.cpp"
+#include "ManFst004.cpp"
+#include "ManSea001.cpp"
+#include "ManSea002.cpp"
+#include "ManSea003.cpp"
+#include "ManWil001.cpp"
+#include "ManWil002.cpp"
+#include "subquest/gridania/SubFst001.cpp"
+#include "subquest/gridania/SubFst002.cpp"
+#include "subquest/gridania/SubFst003.cpp"
+#include "subquest/gridania/SubFst004.cpp"
+#include "subquest/gridania/SubFst008.cpp"
+#include "subquest/gridania/SubFst009.cpp"
+#include "subquest/gridania/SubFst010.cpp"
+#include "subquest/gridania/SubFst011.cpp"
+#include "subquest/gridania/SubFst013.cpp"
+#include "subquest/gridania/SubFst014.cpp"
+#include "subquest/gridania/SubFst015.cpp"
+#include "subquest/gridania/SubFst019.cpp"
+#include "subquest/gridania/SubFst026.cpp"
+#include "subquest/gridania/SubFst029.cpp"
+#include "subquest/gridania/SubFst030.cpp"
+#include "subquest/gridania/SubFst041.cpp"
+#include "subquest/limsa/SubSea001.cpp"
+#include "subquest/uldah/SubWil000.cpp"
+#include "subquest/uldah/SubWil001.cpp"
+#include "subquest/uldah/SubWil002.cpp"
+#include "subquest/uldah/SubWil004.cpp"
+#include "subquest/uldah/SubWil006.cpp"
+#include "subquest/uldah/SubWil007.cpp"
+#include "subquest/uldah/SubWil018.cpp"
+#include "subquest/uldah/SubWil019.cpp"
+#include "subquest/uldah/SubWil021.cpp"
+#include "subquest/uldah/SubWil022.cpp"
+#include "subquest/uldah/SubWil027.cpp"
+#include "subquest/uldah/SubWil028.cpp"
+#include "subquest/uldah/SubWil029.cpp"
+
+const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
+{
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ManFst001 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ManFst002 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ManFst003 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ManFst004 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ManSea001 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ManSea002 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ManSea003 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ManWil001 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new ManWil002 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubFst001 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubFst002 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubFst003 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubFst004 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubFst008 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubFst009 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubFst010 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubFst011 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubFst013 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubFst014 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubFst015 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubFst019 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubFst026 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubFst029 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubFst030 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubFst041 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubSea001 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubWil000 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubWil001 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubWil002 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubWil004 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubWil006 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubWil007 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubWil018 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubWil019 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubWil021 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubWil022 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubWil027 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubWil028 ),
+   static_cast< Sapphire::ScriptAPI::ScriptObject* >( new SubWil029 ),
+
+   nullptr
+};
+
+extern "C" EXPORT const Sapphire::ScriptAPI::ScriptObject** getScripts()
+{
+   return ptrs;
+}
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp b/src/scripts/quest/subquest/gridania/SubFst001.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp
rename to src/scripts/quest/subquest/gridania/SubFst001.cpp
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp b/src/scripts/quest/subquest/gridania/SubFst002.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp
rename to src/scripts/quest/subquest/gridania/SubFst002.cpp
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst003.cpp b/src/scripts/quest/subquest/gridania/SubFst003.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/gridania/SubFst003.cpp
rename to src/scripts/quest/subquest/gridania/SubFst003.cpp
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst004.cpp b/src/scripts/quest/subquest/gridania/SubFst004.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/gridania/SubFst004.cpp
rename to src/scripts/quest/subquest/gridania/SubFst004.cpp
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst008.cpp b/src/scripts/quest/subquest/gridania/SubFst008.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/gridania/SubFst008.cpp
rename to src/scripts/quest/subquest/gridania/SubFst008.cpp
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst009.cpp b/src/scripts/quest/subquest/gridania/SubFst009.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/gridania/SubFst009.cpp
rename to src/scripts/quest/subquest/gridania/SubFst009.cpp
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp b/src/scripts/quest/subquest/gridania/SubFst010.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp
rename to src/scripts/quest/subquest/gridania/SubFst010.cpp
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst011.cpp b/src/scripts/quest/subquest/gridania/SubFst011.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/gridania/SubFst011.cpp
rename to src/scripts/quest/subquest/gridania/SubFst011.cpp
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp b/src/scripts/quest/subquest/gridania/SubFst013.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp
rename to src/scripts/quest/subquest/gridania/SubFst013.cpp
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst014.cpp b/src/scripts/quest/subquest/gridania/SubFst014.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/gridania/SubFst014.cpp
rename to src/scripts/quest/subquest/gridania/SubFst014.cpp
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst015.cpp b/src/scripts/quest/subquest/gridania/SubFst015.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/gridania/SubFst015.cpp
rename to src/scripts/quest/subquest/gridania/SubFst015.cpp
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst019.cpp b/src/scripts/quest/subquest/gridania/SubFst019.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/gridania/SubFst019.cpp
rename to src/scripts/quest/subquest/gridania/SubFst019.cpp
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst026.cpp b/src/scripts/quest/subquest/gridania/SubFst026.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/gridania/SubFst026.cpp
rename to src/scripts/quest/subquest/gridania/SubFst026.cpp
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst029.cpp b/src/scripts/quest/subquest/gridania/SubFst029.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/gridania/SubFst029.cpp
rename to src/scripts/quest/subquest/gridania/SubFst029.cpp
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst030.cpp b/src/scripts/quest/subquest/gridania/SubFst030.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/gridania/SubFst030.cpp
rename to src/scripts/quest/subquest/gridania/SubFst030.cpp
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst041.cpp b/src/scripts/quest/subquest/gridania/SubFst041.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/gridania/SubFst041.cpp
rename to src/scripts/quest/subquest/gridania/SubFst041.cpp
diff --git a/src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp b/src/scripts/quest/subquest/limsa/SubSea001.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/limsa/SubSea001.cpp
rename to src/scripts/quest/subquest/limsa/SubSea001.cpp
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil000.cpp b/src/scripts/quest/subquest/uldah/SubWil000.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/uldah/SubWil000.cpp
rename to src/scripts/quest/subquest/uldah/SubWil000.cpp
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil001.cpp b/src/scripts/quest/subquest/uldah/SubWil001.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/uldah/SubWil001.cpp
rename to src/scripts/quest/subquest/uldah/SubWil001.cpp
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil002.cpp b/src/scripts/quest/subquest/uldah/SubWil002.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/uldah/SubWil002.cpp
rename to src/scripts/quest/subquest/uldah/SubWil002.cpp
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil004.cpp b/src/scripts/quest/subquest/uldah/SubWil004.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/uldah/SubWil004.cpp
rename to src/scripts/quest/subquest/uldah/SubWil004.cpp
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil006.cpp b/src/scripts/quest/subquest/uldah/SubWil006.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/uldah/SubWil006.cpp
rename to src/scripts/quest/subquest/uldah/SubWil006.cpp
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil007.cpp b/src/scripts/quest/subquest/uldah/SubWil007.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/uldah/SubWil007.cpp
rename to src/scripts/quest/subquest/uldah/SubWil007.cpp
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil018.cpp b/src/scripts/quest/subquest/uldah/SubWil018.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/uldah/SubWil018.cpp
rename to src/scripts/quest/subquest/uldah/SubWil018.cpp
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil019.cpp b/src/scripts/quest/subquest/uldah/SubWil019.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/uldah/SubWil019.cpp
rename to src/scripts/quest/subquest/uldah/SubWil019.cpp
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil021.cpp b/src/scripts/quest/subquest/uldah/SubWil021.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/uldah/SubWil021.cpp
rename to src/scripts/quest/subquest/uldah/SubWil021.cpp
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil022.cpp b/src/scripts/quest/subquest/uldah/SubWil022.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/uldah/SubWil022.cpp
rename to src/scripts/quest/subquest/uldah/SubWil022.cpp
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil027.cpp b/src/scripts/quest/subquest/uldah/SubWil027.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/uldah/SubWil027.cpp
rename to src/scripts/quest/subquest/uldah/SubWil027.cpp
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil028.cpp b/src/scripts/quest/subquest/uldah/SubWil028.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/uldah/SubWil028.cpp
rename to src/scripts/quest/subquest/uldah/SubWil028.cpp
diff --git a/src/servers/Scripts/quest/subquest/uldah/SubWil029.cpp b/src/scripts/quest/subquest/uldah/SubWil029.cpp
similarity index 100%
rename from src/servers/Scripts/quest/subquest/uldah/SubWil029.cpp
rename to src/scripts/quest/subquest/uldah/SubWil029.cpp
diff --git a/src/servers/CMakeLists.txt b/src/servers/CMakeLists.txt
deleted file mode 100644
index ea5a9774..00000000
--- a/src/servers/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-cmake_minimum_required( VERSION 3.0 )
-project( Sapphire )
-
-add_subdirectory(${PROJECT_SOURCE_DIR}/sapphire_lobby)
-add_subdirectory(${PROJECT_SOURCE_DIR}/sapphire_api)
-add_subdirectory(${PROJECT_SOURCE_DIR}/sapphire_zone)
-add_subdirectory(${PROJECT_SOURCE_DIR}/Scripts)
diff --git a/src/servers/sapphire_zone/Action/Action.cpp b/src/world/Action/Action.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Action/Action.cpp
rename to src/world/Action/Action.cpp
diff --git a/src/servers/sapphire_zone/Action/Action.h b/src/world/Action/Action.h
similarity index 100%
rename from src/servers/sapphire_zone/Action/Action.h
rename to src/world/Action/Action.h
diff --git a/src/servers/sapphire_zone/Action/ActionCast.cpp b/src/world/Action/ActionCast.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Action/ActionCast.cpp
rename to src/world/Action/ActionCast.cpp
diff --git a/src/servers/sapphire_zone/Action/ActionCast.h b/src/world/Action/ActionCast.h
similarity index 100%
rename from src/servers/sapphire_zone/Action/ActionCast.h
rename to src/world/Action/ActionCast.h
diff --git a/src/servers/sapphire_zone/Action/ActionCollision.cpp b/src/world/Action/ActionCollision.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Action/ActionCollision.cpp
rename to src/world/Action/ActionCollision.cpp
diff --git a/src/servers/sapphire_zone/Action/ActionCollision.h b/src/world/Action/ActionCollision.h
similarity index 100%
rename from src/servers/sapphire_zone/Action/ActionCollision.h
rename to src/world/Action/ActionCollision.h
diff --git a/src/servers/sapphire_zone/Action/ActionMount.cpp b/src/world/Action/ActionMount.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Action/ActionMount.cpp
rename to src/world/Action/ActionMount.cpp
diff --git a/src/servers/sapphire_zone/Action/ActionMount.h b/src/world/Action/ActionMount.h
similarity index 100%
rename from src/servers/sapphire_zone/Action/ActionMount.h
rename to src/world/Action/ActionMount.h
diff --git a/src/servers/sapphire_zone/Action/ActionTeleport.cpp b/src/world/Action/ActionTeleport.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Action/ActionTeleport.cpp
rename to src/world/Action/ActionTeleport.cpp
diff --git a/src/servers/sapphire_zone/Action/ActionTeleport.h b/src/world/Action/ActionTeleport.h
similarity index 100%
rename from src/servers/sapphire_zone/Action/ActionTeleport.h
rename to src/world/Action/ActionTeleport.h
diff --git a/src/servers/sapphire_zone/Action/EventAction.cpp b/src/world/Action/EventAction.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Action/EventAction.cpp
rename to src/world/Action/EventAction.cpp
diff --git a/src/servers/sapphire_zone/Action/EventAction.h b/src/world/Action/EventAction.h
similarity index 100%
rename from src/servers/sapphire_zone/Action/EventAction.h
rename to src/world/Action/EventAction.h
diff --git a/src/servers/sapphire_zone/Action/EventItemAction.cpp b/src/world/Action/EventItemAction.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Action/EventItemAction.cpp
rename to src/world/Action/EventItemAction.cpp
diff --git a/src/servers/sapphire_zone/Action/EventItemAction.h b/src/world/Action/EventItemAction.h
similarity index 100%
rename from src/servers/sapphire_zone/Action/EventItemAction.h
rename to src/world/Action/EventItemAction.h
diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/world/Actor/Actor.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Actor/Actor.cpp
rename to src/world/Actor/Actor.cpp
diff --git a/src/servers/sapphire_zone/Actor/Actor.h b/src/world/Actor/Actor.h
similarity index 100%
rename from src/servers/sapphire_zone/Actor/Actor.h
rename to src/world/Actor/Actor.h
diff --git a/src/servers/sapphire_zone/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Actor/BNpc.cpp
rename to src/world/Actor/BNpc.cpp
diff --git a/src/servers/sapphire_zone/Actor/BNpc.h b/src/world/Actor/BNpc.h
similarity index 100%
rename from src/servers/sapphire_zone/Actor/BNpc.h
rename to src/world/Actor/BNpc.h
diff --git a/src/servers/sapphire_zone/Actor/BNpcTemplate.cpp b/src/world/Actor/BNpcTemplate.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Actor/BNpcTemplate.cpp
rename to src/world/Actor/BNpcTemplate.cpp
diff --git a/src/servers/sapphire_zone/Actor/BNpcTemplate.h b/src/world/Actor/BNpcTemplate.h
similarity index 100%
rename from src/servers/sapphire_zone/Actor/BNpcTemplate.h
rename to src/world/Actor/BNpcTemplate.h
diff --git a/src/servers/sapphire_zone/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Actor/Chara.cpp
rename to src/world/Actor/Chara.cpp
diff --git a/src/servers/sapphire_zone/Actor/Chara.h b/src/world/Actor/Chara.h
similarity index 100%
rename from src/servers/sapphire_zone/Actor/Chara.h
rename to src/world/Actor/Chara.h
diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/world/Actor/EventObject.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Actor/EventObject.cpp
rename to src/world/Actor/EventObject.cpp
diff --git a/src/servers/sapphire_zone/Actor/EventObject.h b/src/world/Actor/EventObject.h
similarity index 100%
rename from src/servers/sapphire_zone/Actor/EventObject.h
rename to src/world/Actor/EventObject.h
diff --git a/src/servers/sapphire_zone/Actor/Npc.cpp b/src/world/Actor/Npc.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Actor/Npc.cpp
rename to src/world/Actor/Npc.cpp
diff --git a/src/servers/sapphire_zone/Actor/Npc.h b/src/world/Actor/Npc.h
similarity index 100%
rename from src/servers/sapphire_zone/Actor/Npc.h
rename to src/world/Actor/Npc.h
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/world/Actor/Player.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Actor/Player.cpp
rename to src/world/Actor/Player.cpp
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/world/Actor/Player.h
similarity index 100%
rename from src/servers/sapphire_zone/Actor/Player.h
rename to src/world/Actor/Player.h
diff --git a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Actor/PlayerEvent.cpp
rename to src/world/Actor/PlayerEvent.cpp
diff --git a/src/servers/sapphire_zone/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Actor/PlayerInventory.cpp
rename to src/world/Actor/PlayerInventory.cpp
diff --git a/src/servers/sapphire_zone/Actor/PlayerQuest.cpp b/src/world/Actor/PlayerQuest.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Actor/PlayerQuest.cpp
rename to src/world/Actor/PlayerQuest.cpp
diff --git a/src/servers/sapphire_zone/Actor/PlayerSql.cpp b/src/world/Actor/PlayerSql.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Actor/PlayerSql.cpp
rename to src/world/Actor/PlayerSql.cpp
diff --git a/src/servers/sapphire_zone/Actor/SpawnGroup.h b/src/world/Actor/SpawnGroup.h
similarity index 100%
rename from src/servers/sapphire_zone/Actor/SpawnGroup.h
rename to src/world/Actor/SpawnGroup.h
diff --git a/src/servers/sapphire_zone/Actor/SpawnPoint.cpp b/src/world/Actor/SpawnPoint.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Actor/SpawnPoint.cpp
rename to src/world/Actor/SpawnPoint.cpp
diff --git a/src/servers/sapphire_zone/Actor/SpawnPoint.h b/src/world/Actor/SpawnPoint.h
similarity index 100%
rename from src/servers/sapphire_zone/Actor/SpawnPoint.h
rename to src/world/Actor/SpawnPoint.h
diff --git a/src/servers/sapphire_zone/CMakeLists.txt b/src/world/CMakeLists.txt
similarity index 62%
rename from src/servers/sapphire_zone/CMakeLists.txt
rename to src/world/CMakeLists.txt
index 8b8fe877..122bdf93 100644
--- a/src/servers/sapphire_zone/CMakeLists.txt
+++ b/src/world/CMakeLists.txt
@@ -1,10 +1,9 @@
-cmake_minimum_required(VERSION 3.0.2)
-cmake_policy(SET CMP0015 NEW)
-cmake_policy(SET CMP0014 OLD)
+cmake_minimum_required( VERSION 3.0.2 )
+cmake_policy( SET CMP0015 NEW )
 
-project(sapphire_zone)
+project( world )
 
-file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+file( GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
         *.c*
         Actor/*.c*
         Action/*.c*
@@ -22,9 +21,9 @@ file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
         Territory/*.c*
         Territory/Housing/*.c*)
 
-add_executable( sapphire_zone ${SERVER_SOURCE_FILES} )
+add_executable( world ${SERVER_SOURCE_FILES} )
 
-set_target_properties(sapphire_zone PROPERTIES
+set_target_properties( world PROPERTIES
         CXX_STANDARD 17
         CXX_STANDARD_REQUIRED ON
         CXX_EXTENSIONS ON
@@ -35,16 +34,16 @@ set_target_properties(sapphire_zone PROPERTIES
         RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
         RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
         VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
-        )
+)
 
 
-target_link_libraries( sapphire_zone PUBLIC common )
-target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" )
+target_link_libraries( world PUBLIC common )
+target_include_directories( world PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" )
 
 
 if (UNIX)
-	#    cotire( sapphire_zone )
-    target_link_libraries( sapphire_zone PUBLIC stdc++fs )
+#    cotire( world )
+    target_link_libraries( world PUBLIC stdc++fs )
 else()
-    target_link_libraries( sapphire_zone PUBLIC mysql )
+    target_link_libraries( world PUBLIC mysql )
 endif()
diff --git a/src/servers/sapphire_zone/ContentFinder/ContentFinder.cpp b/src/world/ContentFinder/ContentFinder.cpp
similarity index 100%
rename from src/servers/sapphire_zone/ContentFinder/ContentFinder.cpp
rename to src/world/ContentFinder/ContentFinder.cpp
diff --git a/src/servers/sapphire_zone/ContentFinder/ContentFinder.h b/src/world/ContentFinder/ContentFinder.h
similarity index 100%
rename from src/servers/sapphire_zone/ContentFinder/ContentFinder.h
rename to src/world/ContentFinder/ContentFinder.h
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommand.h b/src/world/DebugCommand/DebugCommand.h
similarity index 100%
rename from src/servers/sapphire_zone/DebugCommand/DebugCommand.h
rename to src/world/DebugCommand/DebugCommand.h
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/world/DebugCommand/DebugCommandHandler.cpp
similarity index 100%
rename from src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
rename to src/world/DebugCommand/DebugCommandHandler.cpp
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.h b/src/world/DebugCommand/DebugCommandHandler.h
similarity index 100%
rename from src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.h
rename to src/world/DebugCommand/DebugCommandHandler.h
diff --git a/src/servers/sapphire_zone/Event/Director.cpp b/src/world/Event/Director.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Event/Director.cpp
rename to src/world/Event/Director.cpp
diff --git a/src/servers/sapphire_zone/Event/Director.h b/src/world/Event/Director.h
similarity index 100%
rename from src/servers/sapphire_zone/Event/Director.h
rename to src/world/Event/Director.h
diff --git a/src/servers/sapphire_zone/Event/EventDefs.h b/src/world/Event/EventDefs.h
similarity index 100%
rename from src/servers/sapphire_zone/Event/EventDefs.h
rename to src/world/Event/EventDefs.h
diff --git a/src/servers/sapphire_zone/Event/EventHandler.cpp b/src/world/Event/EventHandler.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Event/EventHandler.cpp
rename to src/world/Event/EventHandler.cpp
diff --git a/src/servers/sapphire_zone/Event/EventHandler.h b/src/world/Event/EventHandler.h
similarity index 100%
rename from src/servers/sapphire_zone/Event/EventHandler.h
rename to src/world/Event/EventHandler.h
diff --git a/src/servers/sapphire_zone/Event/EventHelper.cpp b/src/world/Event/EventHelper.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Event/EventHelper.cpp
rename to src/world/Event/EventHelper.cpp
diff --git a/src/servers/sapphire_zone/Event/EventHelper.h b/src/world/Event/EventHelper.h
similarity index 100%
rename from src/servers/sapphire_zone/Event/EventHelper.h
rename to src/world/Event/EventHelper.h
diff --git a/src/servers/sapphire_zone/ForwardsZone.h b/src/world/ForwardsZone.h
similarity index 100%
rename from src/servers/sapphire_zone/ForwardsZone.h
rename to src/world/ForwardsZone.h
diff --git a/src/servers/sapphire_zone/Inventory/Item.cpp b/src/world/Inventory/Item.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Inventory/Item.cpp
rename to src/world/Inventory/Item.cpp
diff --git a/src/servers/sapphire_zone/Inventory/Item.h b/src/world/Inventory/Item.h
similarity index 100%
rename from src/servers/sapphire_zone/Inventory/Item.h
rename to src/world/Inventory/Item.h
diff --git a/src/servers/sapphire_zone/Inventory/ItemContainer.cpp b/src/world/Inventory/ItemContainer.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Inventory/ItemContainer.cpp
rename to src/world/Inventory/ItemContainer.cpp
diff --git a/src/servers/sapphire_zone/Inventory/ItemContainer.h b/src/world/Inventory/ItemContainer.h
similarity index 100%
rename from src/servers/sapphire_zone/Inventory/ItemContainer.h
rename to src/world/Inventory/ItemContainer.h
diff --git a/src/servers/sapphire_zone/Inventory/ItemUtil.cpp b/src/world/Inventory/ItemUtil.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Inventory/ItemUtil.cpp
rename to src/world/Inventory/ItemUtil.cpp
diff --git a/src/servers/sapphire_zone/Inventory/ItemUtil.h b/src/world/Inventory/ItemUtil.h
similarity index 100%
rename from src/servers/sapphire_zone/Inventory/ItemUtil.h
rename to src/world/Inventory/ItemUtil.h
diff --git a/src/servers/sapphire_zone/Linkshell/Linkshell.cpp b/src/world/Linkshell/Linkshell.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Linkshell/Linkshell.cpp
rename to src/world/Linkshell/Linkshell.cpp
diff --git a/src/servers/sapphire_zone/Linkshell/Linkshell.h b/src/world/Linkshell/Linkshell.h
similarity index 100%
rename from src/servers/sapphire_zone/Linkshell/Linkshell.h
rename to src/world/Linkshell/Linkshell.h
diff --git a/src/servers/sapphire_zone/Manager/HousingMgr.cpp b/src/world/Manager/HousingMgr.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Manager/HousingMgr.cpp
rename to src/world/Manager/HousingMgr.cpp
diff --git a/src/servers/sapphire_zone/Manager/HousingMgr.h b/src/world/Manager/HousingMgr.h
similarity index 100%
rename from src/servers/sapphire_zone/Manager/HousingMgr.h
rename to src/world/Manager/HousingMgr.h
diff --git a/src/servers/sapphire_zone/Manager/LinkshellMgr.cpp b/src/world/Manager/LinkshellMgr.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Manager/LinkshellMgr.cpp
rename to src/world/Manager/LinkshellMgr.cpp
diff --git a/src/servers/sapphire_zone/Manager/LinkshellMgr.h b/src/world/Manager/LinkshellMgr.h
similarity index 100%
rename from src/servers/sapphire_zone/Manager/LinkshellMgr.h
rename to src/world/Manager/LinkshellMgr.h
diff --git a/src/servers/sapphire_zone/Manager/PlayerMgr.cpp b/src/world/Manager/PlayerMgr.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Manager/PlayerMgr.cpp
rename to src/world/Manager/PlayerMgr.cpp
diff --git a/src/servers/sapphire_zone/Manager/PlayerMgr.h b/src/world/Manager/PlayerMgr.h
similarity index 100%
rename from src/servers/sapphire_zone/Manager/PlayerMgr.h
rename to src/world/Manager/PlayerMgr.h
diff --git a/src/servers/sapphire_zone/Manager/ShopMgr.cpp b/src/world/Manager/ShopMgr.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Manager/ShopMgr.cpp
rename to src/world/Manager/ShopMgr.cpp
diff --git a/src/servers/sapphire_zone/Manager/ShopMgr.h b/src/world/Manager/ShopMgr.h
similarity index 100%
rename from src/servers/sapphire_zone/Manager/ShopMgr.h
rename to src/world/Manager/ShopMgr.h
diff --git a/src/servers/sapphire_zone/Manager/TerritoryMgr.cpp b/src/world/Manager/TerritoryMgr.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Manager/TerritoryMgr.cpp
rename to src/world/Manager/TerritoryMgr.cpp
diff --git a/src/servers/sapphire_zone/Manager/TerritoryMgr.h b/src/world/Manager/TerritoryMgr.h
similarity index 100%
rename from src/servers/sapphire_zone/Manager/TerritoryMgr.h
rename to src/world/Manager/TerritoryMgr.h
diff --git a/src/servers/sapphire_zone/Math/CalcBattle.cpp b/src/world/Math/CalcBattle.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Math/CalcBattle.cpp
rename to src/world/Math/CalcBattle.cpp
diff --git a/src/servers/sapphire_zone/Math/CalcBattle.h b/src/world/Math/CalcBattle.h
similarity index 100%
rename from src/servers/sapphire_zone/Math/CalcBattle.h
rename to src/world/Math/CalcBattle.h
diff --git a/src/servers/sapphire_zone/Math/CalcStats.cpp b/src/world/Math/CalcStats.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Math/CalcStats.cpp
rename to src/world/Math/CalcStats.cpp
diff --git a/src/servers/sapphire_zone/Math/CalcStats.h b/src/world/Math/CalcStats.h
similarity index 100%
rename from src/servers/sapphire_zone/Math/CalcStats.h
rename to src/world/Math/CalcStats.h
diff --git a/src/servers/sapphire_zone/Network/GameConnection.cpp b/src/world/Network/GameConnection.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Network/GameConnection.cpp
rename to src/world/Network/GameConnection.cpp
diff --git a/src/servers/sapphire_zone/Network/GameConnection.h b/src/world/Network/GameConnection.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/GameConnection.h
rename to src/world/Network/GameConnection.h
diff --git a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp b/src/world/Network/Handlers/ActionHandler.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
rename to src/world/Network/Handlers/ActionHandler.cpp
diff --git a/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp b/src/world/Network/Handlers/CFHandlers.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp
rename to src/world/Network/Handlers/CFHandlers.cpp
diff --git a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp b/src/world/Network/Handlers/ClientTriggerHandler.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
rename to src/world/Network/Handlers/ClientTriggerHandler.cpp
diff --git a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp b/src/world/Network/Handlers/EventHandlers.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
rename to src/world/Network/Handlers/EventHandlers.cpp
diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/world/Network/Handlers/GMCommandHandlers.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
rename to src/world/Network/Handlers/GMCommandHandlers.cpp
diff --git a/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp b/src/world/Network/Handlers/InventoryHandler.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
rename to src/world/Network/Handlers/InventoryHandler.cpp
diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
rename to src/world/Network/Handlers/PacketHandlers.cpp
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket142.h b/src/world/Network/PacketWrappers/ActorControlPacket142.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket142.h
rename to src/world/Network/PacketWrappers/ActorControlPacket142.h
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket143.h b/src/world/Network/PacketWrappers/ActorControlPacket143.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket143.h
rename to src/world/Network/PacketWrappers/ActorControlPacket143.h
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket144.h b/src/world/Network/PacketWrappers/ActorControlPacket144.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket144.h
rename to src/world/Network/PacketWrappers/ActorControlPacket144.h
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/ChatPacket.h b/src/world/Network/PacketWrappers/ChatPacket.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/ChatPacket.h
rename to src/world/Network/PacketWrappers/ChatPacket.h
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/DirectorPlayScenePacket.h b/src/world/Network/PacketWrappers/DirectorPlayScenePacket.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/DirectorPlayScenePacket.h
rename to src/world/Network/PacketWrappers/DirectorPlayScenePacket.h
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/EffectPacket.h b/src/world/Network/PacketWrappers/EffectPacket.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/EffectPacket.h
rename to src/world/Network/PacketWrappers/EffectPacket.h
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/EventFinishPacket.h b/src/world/Network/PacketWrappers/EventFinishPacket.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/EventFinishPacket.h
rename to src/world/Network/PacketWrappers/EventFinishPacket.h
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/EventPlayPacket.h b/src/world/Network/PacketWrappers/EventPlayPacket.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/EventPlayPacket.h
rename to src/world/Network/PacketWrappers/EventPlayPacket.h
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h b/src/world/Network/PacketWrappers/EventStartPacket.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h
rename to src/world/Network/PacketWrappers/EventStartPacket.h
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/ExaminePacket.h b/src/world/Network/PacketWrappers/ExaminePacket.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/ExaminePacket.h
rename to src/world/Network/PacketWrappers/ExaminePacket.h
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h b/src/world/Network/PacketWrappers/InitUIPacket.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h
rename to src/world/Network/PacketWrappers/InitUIPacket.h
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/ModelEquipPacket.h b/src/world/Network/PacketWrappers/ModelEquipPacket.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/ModelEquipPacket.h
rename to src/world/Network/PacketWrappers/ModelEquipPacket.h
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h b/src/world/Network/PacketWrappers/MoveActorPacket.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h
rename to src/world/Network/PacketWrappers/MoveActorPacket.h
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/NpcSpawnPacket.h b/src/world/Network/PacketWrappers/NpcSpawnPacket.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/NpcSpawnPacket.h
rename to src/world/Network/PacketWrappers/NpcSpawnPacket.h
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/PingPacket.h b/src/world/Network/PacketWrappers/PingPacket.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/PingPacket.h
rename to src/world/Network/PacketWrappers/PingPacket.h
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h
rename to src/world/Network/PacketWrappers/PlayerSpawnPacket.h
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/PlayerStateFlagsPacket.h b/src/world/Network/PacketWrappers/PlayerStateFlagsPacket.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/PlayerStateFlagsPacket.h
rename to src/world/Network/PacketWrappers/PlayerStateFlagsPacket.h
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/QuestMessagePacket.h b/src/world/Network/PacketWrappers/QuestMessagePacket.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/QuestMessagePacket.h
rename to src/world/Network/PacketWrappers/QuestMessagePacket.h
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/ServerNoticePacket.h b/src/world/Network/PacketWrappers/ServerNoticePacket.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/ServerNoticePacket.h
rename to src/world/Network/PacketWrappers/ServerNoticePacket.h
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/UpdateHpMpTpPacket.h b/src/world/Network/PacketWrappers/UpdateHpMpTpPacket.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/UpdateHpMpTpPacket.h
rename to src/world/Network/PacketWrappers/UpdateHpMpTpPacket.h
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/UpdateInventorySlotPacket.h b/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h
similarity index 100%
rename from src/servers/sapphire_zone/Network/PacketWrappers/UpdateInventorySlotPacket.h
rename to src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h
diff --git a/src/servers/sapphire_zone/Script/NativeScriptApi.cpp b/src/world/Script/NativeScriptApi.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/NativeScriptApi.cpp
rename to src/world/Script/NativeScriptApi.cpp
diff --git a/src/servers/sapphire_zone/Script/NativeScriptApi.h b/src/world/Script/NativeScriptApi.h
similarity index 100%
rename from src/servers/sapphire_zone/Script/NativeScriptApi.h
rename to src/world/Script/NativeScriptApi.h
diff --git a/src/servers/sapphire_zone/Script/NativeScriptMgr.cpp b/src/world/Script/NativeScriptMgr.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/NativeScriptMgr.cpp
rename to src/world/Script/NativeScriptMgr.cpp
diff --git a/src/servers/sapphire_zone/Script/NativeScriptMgr.h b/src/world/Script/NativeScriptMgr.h
similarity index 100%
rename from src/servers/sapphire_zone/Script/NativeScriptMgr.h
rename to src/world/Script/NativeScriptMgr.h
diff --git a/src/servers/sapphire_zone/Script/ScriptInfo.h b/src/world/Script/ScriptInfo.h
similarity index 100%
rename from src/servers/sapphire_zone/Script/ScriptInfo.h
rename to src/world/Script/ScriptInfo.h
diff --git a/src/servers/sapphire_zone/Script/ScriptLoader.cpp b/src/world/Script/ScriptLoader.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/ScriptLoader.cpp
rename to src/world/Script/ScriptLoader.cpp
diff --git a/src/servers/sapphire_zone/Script/ScriptLoader.h b/src/world/Script/ScriptLoader.h
similarity index 100%
rename from src/servers/sapphire_zone/Script/ScriptLoader.h
rename to src/world/Script/ScriptLoader.h
diff --git a/src/servers/sapphire_zone/Script/ScriptMgr.cpp b/src/world/Script/ScriptMgr.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/ScriptMgr.cpp
rename to src/world/Script/ScriptMgr.cpp
diff --git a/src/servers/sapphire_zone/Script/ScriptMgr.h b/src/world/Script/ScriptMgr.h
similarity index 100%
rename from src/servers/sapphire_zone/Script/ScriptMgr.h
rename to src/world/Script/ScriptMgr.h
diff --git a/src/servers/sapphire_zone/ServerMgr.cpp b/src/world/ServerMgr.cpp
similarity index 100%
rename from src/servers/sapphire_zone/ServerMgr.cpp
rename to src/world/ServerMgr.cpp
diff --git a/src/servers/sapphire_zone/ServerMgr.h b/src/world/ServerMgr.h
similarity index 100%
rename from src/servers/sapphire_zone/ServerMgr.h
rename to src/world/ServerMgr.h
diff --git a/src/servers/sapphire_zone/Session.cpp b/src/world/Session.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Session.cpp
rename to src/world/Session.cpp
diff --git a/src/servers/sapphire_zone/Session.h b/src/world/Session.h
similarity index 100%
rename from src/servers/sapphire_zone/Session.h
rename to src/world/Session.h
diff --git a/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp b/src/world/StatusEffect/StatusEffect.cpp
similarity index 100%
rename from src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp
rename to src/world/StatusEffect/StatusEffect.cpp
diff --git a/src/servers/sapphire_zone/StatusEffect/StatusEffect.h b/src/world/StatusEffect/StatusEffect.h
similarity index 100%
rename from src/servers/sapphire_zone/StatusEffect/StatusEffect.h
rename to src/world/StatusEffect/StatusEffect.h
diff --git a/src/servers/sapphire_zone/Territory/Cell.cpp b/src/world/Territory/Cell.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Territory/Cell.cpp
rename to src/world/Territory/Cell.cpp
diff --git a/src/servers/sapphire_zone/Territory/Cell.h b/src/world/Territory/Cell.h
similarity index 100%
rename from src/servers/sapphire_zone/Territory/Cell.h
rename to src/world/Territory/Cell.h
diff --git a/src/servers/sapphire_zone/Territory/CellHandler.h b/src/world/Territory/CellHandler.h
similarity index 100%
rename from src/servers/sapphire_zone/Territory/CellHandler.h
rename to src/world/Territory/CellHandler.h
diff --git a/src/servers/sapphire_zone/Territory/House.cpp b/src/world/Territory/House.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Territory/House.cpp
rename to src/world/Territory/House.cpp
diff --git a/src/servers/sapphire_zone/Territory/House.h b/src/world/Territory/House.h
similarity index 100%
rename from src/servers/sapphire_zone/Territory/House.h
rename to src/world/Territory/House.h
diff --git a/src/servers/sapphire_zone/Territory/Housing/HousingInteriorTerritory.cpp b/src/world/Territory/Housing/HousingInteriorTerritory.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Territory/Housing/HousingInteriorTerritory.cpp
rename to src/world/Territory/Housing/HousingInteriorTerritory.cpp
diff --git a/src/servers/sapphire_zone/Territory/Housing/HousingInteriorTerritory.h b/src/world/Territory/Housing/HousingInteriorTerritory.h
similarity index 100%
rename from src/servers/sapphire_zone/Territory/Housing/HousingInteriorTerritory.h
rename to src/world/Territory/Housing/HousingInteriorTerritory.h
diff --git a/src/servers/sapphire_zone/Territory/HousingZone.cpp b/src/world/Territory/HousingZone.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Territory/HousingZone.cpp
rename to src/world/Territory/HousingZone.cpp
diff --git a/src/servers/sapphire_zone/Territory/HousingZone.h b/src/world/Territory/HousingZone.h
similarity index 100%
rename from src/servers/sapphire_zone/Territory/HousingZone.h
rename to src/world/Territory/HousingZone.h
diff --git a/src/servers/sapphire_zone/Territory/InstanceContent.cpp b/src/world/Territory/InstanceContent.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Territory/InstanceContent.cpp
rename to src/world/Territory/InstanceContent.cpp
diff --git a/src/servers/sapphire_zone/Territory/InstanceContent.h b/src/world/Territory/InstanceContent.h
similarity index 100%
rename from src/servers/sapphire_zone/Territory/InstanceContent.h
rename to src/world/Territory/InstanceContent.h
diff --git a/src/servers/sapphire_zone/Territory/Land.cpp b/src/world/Territory/Land.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Territory/Land.cpp
rename to src/world/Territory/Land.cpp
diff --git a/src/servers/sapphire_zone/Territory/Land.h b/src/world/Territory/Land.h
similarity index 100%
rename from src/servers/sapphire_zone/Territory/Land.h
rename to src/world/Territory/Land.h
diff --git a/src/servers/sapphire_zone/Territory/Zone.cpp b/src/world/Territory/Zone.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Territory/Zone.cpp
rename to src/world/Territory/Zone.cpp
diff --git a/src/servers/sapphire_zone/Territory/Zone.h b/src/world/Territory/Zone.h
similarity index 100%
rename from src/servers/sapphire_zone/Territory/Zone.h
rename to src/world/Territory/Zone.h
diff --git a/src/servers/sapphire_zone/Territory/ZonePosition.cpp b/src/world/Territory/ZonePosition.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Territory/ZonePosition.cpp
rename to src/world/Territory/ZonePosition.cpp
diff --git a/src/servers/sapphire_zone/Territory/ZonePosition.h b/src/world/Territory/ZonePosition.h
similarity index 100%
rename from src/servers/sapphire_zone/Territory/ZonePosition.h
rename to src/world/Territory/ZonePosition.h
diff --git a/src/servers/sapphire_zone/mainGameServer.cpp b/src/world/mainGameServer.cpp
similarity index 100%
rename from src/servers/sapphire_zone/mainGameServer.cpp
rename to src/world/mainGameServer.cpp