diff --git a/CMakeLists.txt b/CMakeLists.txt
index b147b200..34a6cd27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.18)
 project(Darkflame)
 include(CTest)
 
@@ -58,7 +58,7 @@ if(UNIX)
 	if(APPLE)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17 -O2 -Wuninitialized -D_GLIBCXX_USE_CXX11_ABI=0 -D_GLIBCXX_USE_CXX17_ABI=0 -fPIC")
 	else()
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17 -O2 -Wuninitialized -D_GLIBCXX_USE_CXX11_ABI=0 -D_GLIBCXX_USE_CXX17_ABI=0 -static-libgcc -fPIC")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17 -O2 -Wuninitialized -D_GLIBCXX_USE_CXX11_ABI=0 -D_GLIBCXX_USE_CXX17_ABI=0 -static-libgcc -fPIC -lstdc++fs")
 	endif()
 	if (__dynamic AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -rdynamic")
@@ -101,6 +101,17 @@ foreach(resource_file ${RESOURCE_FILES})
 	endif()
 endforeach()
 
+# Copy navmesh data on first build and extract it
+if (NOT EXISTS ${PROJECT_BINARY_DIR}/navmeshes/)
+	configure_file(
+		${CMAKE_SOURCE_DIR}/resources/navmeshes.zip ${PROJECT_BINARY_DIR}/navmeshes.zip
+		COPYONLY
+	)
+
+	file(ARCHIVE_EXTRACT INPUT ${PROJECT_BINARY_DIR}/navmeshes.zip)
+	file(REMOVE ${PROJECT_BINARY_DIR}/navmeshes.zip)
+endif()
+
 # Copy vanity files on first build
 set(VANITY_FILES "CREDITS.md" "INFO.md" "TESTAMENT.md" "NPC.xml")
 foreach(file ${VANITY_FILES})
@@ -143,7 +154,9 @@ set(INCLUDED_DIRECTORIES
 	"dGame/dInventory"
 	"dGame/dMission"
 	"dGame/dEntity"
+	"dGame/dPropertyBehaviors"
 	"dGame/dUtilities"
+	"dCommon/dClient"
 	"dPhysics"
 	"dNavigation"
 	"dNavigation/dTerrain"
@@ -152,6 +165,74 @@ set(INCLUDED_DIRECTORIES
 	"dDatabase/Tables"
 	"dNet"
 	"dScripts"
+	"dScripts/02_server"
+	"dScripts/ai"
+	"dScripts/client"
+	"dScripts/EquipmentScripts"
+	"dScripts/zone"
+	"dScripts/02_server/DLU"
+	"dScripts/02_server/Enemy"
+	"dScripts/02_server/Equipment"
+	"dScripts/02_server/Map"
+	"dScripts/02_server/Minigame"
+	"dScripts/02_server/Objects"
+	"dScripts/02_server/Pets"
+	"dScripts/02_server/Enemy/AG"
+	"dScripts/02_server/Enemy/AM"
+	"dScripts/02_server/Enemy/FV"
+	"dScripts/02_server/Enemy/General"
+	"dScripts/02_server/Enemy/Survival"
+	"dScripts/02_server/Enemy/VE"
+	"dScripts/02_server/Enemy/Waves"
+	"dScripts/02_server/Map/AG"
+	"dScripts/02_server/Map/AG_Spider_Queen"
+	"dScripts/02_server/Map/AM"
+	"dScripts/02_server/Map/FV"
+	"dScripts/02_server/Map/General"
+	"dScripts/02_server/Map/GF"
+	"dScripts/02_server/Map/njhub"
+	"dScripts/02_server/Map/NS"
+	"dScripts/02_server/Map/NT"
+	"dScripts/02_server/Map/PR"
+	"dScripts/02_server/Map/Property"
+	"dScripts/02_server/Map/SS"
+	"dScripts/02_server/Map/VE"
+	"dScripts/02_server/Map/FV/Racing"
+	"dScripts/02_server/Map/General/Ninjago"
+	"dScripts/02_server/Map/njhub/boss_instance"
+	"dScripts/02_server/Map/NS/Waves"
+	"dScripts/02_server/Map/Property/AG_Med"
+	"dScripts/02_server/Map/Property/AG_Small"
+	"dScripts/02_server/Map/Property/NS_Med"
+	"dScripts/02_server/Minigame/General"
+	"dScripts/ai/ACT"
+	"dScripts/ai/AG"
+	"dScripts/ai/FV"
+	"dScripts/ai/GENERAL"
+	"dScripts/ai/GF"
+	"dScripts/ai/MINIGAME"
+	"dScripts/ai/NP"
+	"dScripts/ai/NS"
+	"dScripts/ai/PETS"
+	"dScripts/ai/PROPERTY"
+	"dScripts/ai/RACING"
+	"dScripts/ai/SPEC"
+	"dScripts/ai/WILD"
+	"dScripts/ai/ACT/FootRace"
+	"dScripts/ai/MINIGAME/SG_GF"
+	"dScripts/ai/MINIGAME/SG_GF/SERVER"
+	"dScripts/ai/NS/NS_PP_01"
+	"dScripts/ai/NS/WH"
+	"dScripts/ai/PROPERTY/AG"
+	"dScripts/ai/RACING/OBJECTS"
+	"dScripts/client/ai"
+	"dScripts/client/ai/PR"
+	"dScripts/zone/AG"
+	"dScripts/zone/LUPs"
+	"dScripts/zone/PROPERTY"
+	"dScripts/zone/PROPERTY/FV"
+	"dScripts/zone/PROPERTY/GF"
+	"dScripts/zone/PROPERTY/NS"
 
 	"thirdparty/raknet/Source"
 	"thirdparty/tinyxml2"
diff --git a/dChatServer/ChatServer.cpp b/dChatServer/ChatServer.cpp
index 273921eb..fc8bdd5b 100644
--- a/dChatServer/ChatServer.cpp
+++ b/dChatServer/ChatServer.cpp
@@ -12,6 +12,7 @@
 #include "dMessageIdentifiers.h"
 #include "dChatFilter.h"
 #include "Diagnostics.h"
+#include "AssetManager.h"
 
 #include "PlayerContainer.h"
 #include "ChatPacketHandler.h"
@@ -22,6 +23,7 @@ namespace Game {
 	dServer* server;
 	dConfig* config;
 	dChatFilter* chatFilter;
+	AssetManager* assetManager;
 }
 
 //RakNet includes:
@@ -50,6 +52,16 @@ int main(int argc, char** argv) {
 	Game::logger->SetLogToConsole(bool(std::stoi(config.GetValue("log_to_console"))));
 	Game::logger->SetLogDebugStatements(config.GetValue("log_debug_statements") == "1");
 
+	try {
+		std::string client_path = config.GetValue("client_location");
+		if (client_path.empty()) client_path = "./res";
+		Game::assetManager = new AssetManager(client_path);
+	} catch (std::runtime_error& ex) {
+		Game::logger->Log("ChatServer", "Got an error while setting up assets: %s", ex.what());
+
+		return EXIT_FAILURE;
+	}
+
 	//Connect to the MySQL Database
 	std::string mysql_host = config.GetValue("mysql_host");
 	std::string mysql_database = config.GetValue("mysql_database");
@@ -87,7 +99,7 @@ int main(int argc, char** argv) {
 
 	Game::server = new dServer(config.GetValue("external_ip"), ourPort, 0, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::Chat);
 
-	Game::chatFilter = new dChatFilter("./res/chatplus_en_us", bool(std::stoi(config.GetValue("dont_generate_dcf"))));
+	Game::chatFilter = new dChatFilter(Game::assetManager->GetResPath().string() + "/chatplus_en_us", bool(std::stoi(config.GetValue("dont_generate_dcf"))));
 
 	//Run it until server gets a kill message from Master:
 	auto t = std::chrono::high_resolution_clock::now();
diff --git a/dCommon/BinaryIO.cpp b/dCommon/BinaryIO.cpp
index 7cb18331..22e4de60 100644
--- a/dCommon/BinaryIO.cpp
+++ b/dCommon/BinaryIO.cpp
@@ -10,7 +10,7 @@ void BinaryIO::WriteString(const std::string& stringToWrite, std::ofstream& outs
 }
 
 //For reading null-terminated strings
-std::string BinaryIO::ReadString(std::ifstream& instream) {
+std::string BinaryIO::ReadString(std::istream& instream) {
 	std::string toReturn;
 	char buffer;
 
@@ -25,7 +25,7 @@ std::string BinaryIO::ReadString(std::ifstream& instream) {
 }
 
 //For reading strings of a specific size
-std::string BinaryIO::ReadString(std::ifstream& instream, size_t size) {
+std::string BinaryIO::ReadString(std::istream& instream, size_t size) {
 	std::string toReturn;
 	char buffer;
 
@@ -37,7 +37,7 @@ std::string BinaryIO::ReadString(std::ifstream& instream, size_t size) {
 	return toReturn;
 }
 
-std::string BinaryIO::ReadWString(std::ifstream& instream) {
+std::string BinaryIO::ReadWString(std::istream& instream) {
 	size_t size;
 	BinaryRead(instream, size);
 	//toReturn.resize(size);
diff --git a/dCommon/BinaryIO.h b/dCommon/BinaryIO.h
index 1f9aaefd..a117ad0d 100644
--- a/dCommon/BinaryIO.h
+++ b/dCommon/BinaryIO.h
@@ -10,16 +10,15 @@ namespace BinaryIO {
 
 	template<typename T>
 	std::istream& BinaryRead(std::istream& stream, T& value) {
-		if (!stream.good())
-			printf("bla");
+		if (!stream.good()) throw std::runtime_error("Failed to read from istream.");
 
 		return stream.read(reinterpret_cast<char*>(&value), sizeof(T));
 	}
 
 	void WriteString(const std::string& stringToWrite, std::ofstream& outstream);
-	std::string ReadString(std::ifstream& instream);
-	std::string ReadString(std::ifstream& instream, size_t size);
-	std::string ReadWString(std::ifstream& instream);
+	std::string ReadString(std::istream& instream);
+	std::string ReadString(std::istream& instream, size_t size);
+	std::string ReadWString(std::istream& instream);
 
 	inline bool DoesFileExist(const std::string& name) {
 		std::ifstream f(name.c_str());
diff --git a/dCommon/BrickByBrickFix.cpp b/dCommon/BrickByBrickFix.cpp
index f0c4e824..15194bf9 100644
--- a/dCommon/BrickByBrickFix.cpp
+++ b/dCommon/BrickByBrickFix.cpp
@@ -49,10 +49,10 @@ uint32_t BrickByBrickFix::TruncateBrokenBrickByBrickXml() {
 				}
 
 				// Ignore the valgrind warning about uninitialized values.  These are discarded later when we know the actual uncompressed size.
-				std::unique_ptr<uint8_t[]> uncompressedChunk(new uint8_t[MAX_SD0_CHUNK_SIZE]);
+				std::unique_ptr<uint8_t[]> uncompressedChunk(new uint8_t[ZCompression::MAX_SD0_CHUNK_SIZE]);
 				int32_t err{};
 				int32_t actualUncompressedSize = ZCompression::Decompress(
-					compressedChunk.get(), chunkSize, uncompressedChunk.get(), MAX_SD0_CHUNK_SIZE, err);
+					compressedChunk.get(), chunkSize, uncompressedChunk.get(), ZCompression::MAX_SD0_CHUNK_SIZE, err);
 
 				if (actualUncompressedSize != -1) {
 					uint32_t previousSize = completeUncompressedModel.size();
diff --git a/dCommon/BrickByBrickFix.h b/dCommon/BrickByBrickFix.h
index 0c7e314c..7450fb71 100644
--- a/dCommon/BrickByBrickFix.h
+++ b/dCommon/BrickByBrickFix.h
@@ -17,10 +17,4 @@ namespace BrickByBrickFix {
 	 * @return The number of BrickByBrick models that were updated
 	 */
 	uint32_t UpdateBrickByBrickModelsToSd0();
-
-	/**
-	 * @brief Max size of an inflated sd0 zlib chunk
-	 * 
-	 */
-	constexpr uint32_t MAX_SD0_CHUNK_SIZE = 1024 * 256;
 };
diff --git a/dCommon/CMakeLists.txt b/dCommon/CMakeLists.txt
index cb73bf6a..46102b74 100644
--- a/dCommon/CMakeLists.txt
+++ b/dCommon/CMakeLists.txt
@@ -17,6 +17,12 @@ set(DCOMMON_SOURCES "AMFFormat.cpp"
 		"BrickByBrickFix.cpp"
 )
 
+add_subdirectory(dClient)
+
+foreach(file ${DCOMMON_DCLIENT_SOURCES})
+	set(DCOMMON_SOURCES ${DCOMMON_SOURCES} "dClient/${file}")
+endforeach()
+
 include_directories(${PROJECT_SOURCE_DIR}/dCommon/)
 
 add_library(dCommon STATIC ${DCOMMON_SOURCES})
diff --git a/dCommon/Game.h b/dCommon/Game.h
index f4862602..616c7fbf 100644
--- a/dCommon/Game.h
+++ b/dCommon/Game.h
@@ -10,6 +10,7 @@ class dChatFilter;
 class dConfig;
 class dLocale;
 class RakPeerInterface;
+class AssetManager;
 struct SystemAddress;
 
 namespace Game {
@@ -22,5 +23,6 @@ namespace Game {
 	extern dLocale* locale;
 	extern std::mt19937 randomEngine;
 	extern RakPeerInterface* chatServer;
+	extern AssetManager* assetManager;
 	extern SystemAddress chatSysAddr;
 }
diff --git a/dCommon/GeneralUtils.cpp b/dCommon/GeneralUtils.cpp
index 4a6c4739..24ea72a0 100644
--- a/dCommon/GeneralUtils.cpp
+++ b/dCommon/GeneralUtils.cpp
@@ -50,6 +50,7 @@ bool _IsSuffixChar(uint8_t c) {
 
 bool GeneralUtils::_NextUTF8Char(std::string_view& slice, uint32_t& out) {
 	size_t rem = slice.length();
+	if (slice.empty()) return false;
 	const uint8_t* bytes = (const uint8_t*)&slice.front();
 	if (rem > 0) {
 		uint8_t first = bytes[0];
diff --git a/dCommon/ZCompression.h b/dCommon/ZCompression.h
index 22a5ff86..84e8a9b4 100644
--- a/dCommon/ZCompression.h
+++ b/dCommon/ZCompression.h
@@ -8,5 +8,11 @@ namespace ZCompression {
 	int32_t Compress(const uint8_t* abSrc, int32_t nLenSrc, uint8_t* abDst, int32_t nLenDst);
 
 	int32_t Decompress(const uint8_t* abSrc, int32_t nLenSrc, uint8_t* abDst, int32_t nLenDst, int32_t& nErr);
+
+	/**
+	 * @brief Max size of an inflated sd0 zlib chunk
+	 *
+	 */
+	constexpr uint32_t MAX_SD0_CHUNK_SIZE = 1024 * 256;
 }
 
diff --git a/dCommon/dClient/AssetManager.cpp b/dCommon/dClient/AssetManager.cpp
new file mode 100644
index 00000000..ba928340
--- /dev/null
+++ b/dCommon/dClient/AssetManager.cpp
@@ -0,0 +1,203 @@
+#include "AssetManager.h"
+#include "Game.h"
+#include "dLogger.h"
+
+#include <zlib.h>
+
+AssetManager::AssetManager(const std::string& path) {
+	if (!std::filesystem::is_directory(path)) {
+		throw std::runtime_error("Attempted to load asset bundle (" + path + ") however it is not a valid directory.");
+	}
+
+	m_Path = std::filesystem::path(path);
+
+	if (std::filesystem::exists(m_Path / "client") && std::filesystem::exists(m_Path / "versions")) {
+		m_AssetBundleType = eAssetBundleType::Packed;
+
+		m_RootPath = m_Path;
+		m_ResPath = (m_Path / "client" / "res");
+	} else if (std::filesystem::exists(m_Path / ".." / "versions") && std::filesystem::exists(m_Path / "res")) {
+		m_AssetBundleType = eAssetBundleType::Packed;
+
+		m_RootPath = (m_Path / "..");
+		m_ResPath = (m_Path / "res");
+	} else if (std::filesystem::exists(m_Path / "pack") && std::filesystem::exists(m_Path / ".." / ".." / "versions")) {
+		m_AssetBundleType = eAssetBundleType::Packed;
+
+		m_RootPath = (m_Path / ".." / "..");
+		m_ResPath = m_Path;
+	} else if (std::filesystem::exists(m_Path / "res" / "cdclient.fdb") && !std::filesystem::exists(m_Path / "res" / "pack")) {
+		m_AssetBundleType = eAssetBundleType::Unpacked;
+
+		m_ResPath = (m_Path / "res");
+	} else if (std::filesystem::exists(m_Path / "cdclient.fdb") && !std::filesystem::exists(m_Path / "pack")) {
+		m_AssetBundleType = eAssetBundleType::Unpacked;
+
+		m_ResPath = m_Path;
+	}
+
+	if (m_AssetBundleType == eAssetBundleType::None) {
+		throw std::runtime_error("Failed to identify client type, cannot read client data.");
+	}
+
+	switch (m_AssetBundleType) {
+		case eAssetBundleType::Packed: {
+			this->LoadPackIndex();
+
+			this->UnpackRequiredAssets();
+
+			break;
+		}
+	}
+}
+
+void AssetManager::LoadPackIndex() {
+	m_PackIndex = new PackIndex(m_RootPath);
+}
+
+std::filesystem::path AssetManager::GetResPath() {
+	return m_ResPath;
+}
+
+eAssetBundleType AssetManager::GetAssetBundleType() {
+	return m_AssetBundleType;
+}
+
+bool AssetManager::HasFile(const char* name) {
+	auto fixedName = std::string(name);
+	std::transform(fixedName.begin(), fixedName.end(), fixedName.begin(), [](uint8_t c) { return std::tolower(c); });
+	std::replace(fixedName.begin(), fixedName.end(), '/', '\\');
+
+	auto realPathName = fixedName;
+
+	if (fixedName.rfind("client\\res\\", 0) != 0) {
+		fixedName = "client\\res\\" + fixedName;
+	}
+
+	if (std::filesystem::exists(m_ResPath / realPathName)) {
+		return true;
+	}
+
+	uint32_t crc = crc32b(0xFFFFFFFF, (uint8_t*)fixedName.c_str(), fixedName.size());
+	crc = crc32b(crc, (Bytef*)"\0\0\0\0", 4);
+
+	for (const auto& item : this->m_PackIndex->GetPackFileIndices()) {
+		if (item.m_Crc == crc) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool AssetManager::GetFile(const char* name, char** data, uint32_t* len) {
+	auto fixedName = std::string(name);
+	std::transform(fixedName.begin(), fixedName.end(), fixedName.begin(), [](uint8_t c) { return std::tolower(c); });
+	std::replace(fixedName.begin(), fixedName.end(), '\\', '/'); // On the off chance someone has the wrong slashes, force forward slashes
+	auto realPathName = fixedName;
+
+	if (std::filesystem::exists(m_ResPath / realPathName)) {
+		FILE* file;
+#ifdef _WIN32
+		fopen_s(&file, (m_ResPath / realPathName).string().c_str(), "rb");
+#elif __APPLE__
+		// macOS has 64bit file IO by default
+		file = fopen((m_ResPath / realPathName).string().c_str(), "rb");
+#else
+		file = fopen64((m_ResPath / realPathName).string().c_str(), "rb");
+#endif
+		fseek(file, 0, SEEK_END);
+		*len = ftell(file);
+		*data = (char*)malloc(*len);
+		fseek(file, 0, SEEK_SET);
+		fread(*data, sizeof(uint8_t), *len, file);
+		fclose(file);
+
+		return true;
+	}
+
+	if (this->m_AssetBundleType == eAssetBundleType::Unpacked) return false;
+
+	// The crc in side of the pack always uses backslashes, so we need to convert them again...
+	std::replace(fixedName.begin(), fixedName.end(), '/', '\\');
+	if (fixedName.rfind("client\\res\\", 0) != 0) {
+		fixedName = "client\\res\\" + fixedName;
+	}
+	int32_t packIndex = -1;
+	uint32_t crc = crc32b(0xFFFFFFFF, (uint8_t*)fixedName.c_str(), fixedName.size());
+	crc = crc32b(crc, (Bytef*)"\0\0\0\0", 4);
+
+	for (const auto& item : this->m_PackIndex->GetPackFileIndices()) {
+		if (item.m_Crc == crc) {
+			packIndex = item.m_PackFileIndex;
+			crc = item.m_Crc;
+			break;
+		}
+	}
+
+	if (packIndex == -1 || !crc) {
+		return false;
+	}
+
+	auto packs = this->m_PackIndex->GetPacks();
+	auto* pack = packs.at(packIndex);
+
+	bool success = pack->ReadFileFromPack(crc, data, len);
+
+	return success;
+}
+
+AssetMemoryBuffer AssetManager::GetFileAsBuffer(const char* name) {
+	char* buf;
+	uint32_t len;
+
+	bool success = this->GetFile(name, &buf, &len);
+
+	return AssetMemoryBuffer(buf, len, success);
+}
+
+void AssetManager::UnpackRequiredAssets() {
+	if (std::filesystem::exists(m_ResPath / "cdclient.fdb")) return;
+
+	char* data;
+	uint32_t size;
+
+	bool success = this->GetFile("cdclient.fdb", &data, &size);
+
+	if (!success) {
+		Game::logger->Log("AssetManager", "Failed to extract required files from the packs.");
+
+		delete data;
+
+		return;
+	}
+
+	std::ofstream cdclientOutput(m_ResPath / "cdclient.fdb", std::ios::out | std::ios::binary);
+	cdclientOutput.write(data, size);
+	cdclientOutput.close();
+
+	delete data;
+
+	return;
+}
+
+uint32_t AssetManager::crc32b(uint32_t base, uint8_t* message, size_t l) {
+	size_t i, j;
+	uint32_t crc, msb;
+
+	crc = base;
+	for (i = 0; i < l; i++) {
+		// xor next byte to upper bits of crc
+		crc ^= (((unsigned int)message[i]) << 24);
+		for (j = 0; j < 8; j++) { // Do eight times.
+			msb = crc >> 31;
+			crc <<= 1;
+			crc ^= (0 - msb) & 0x04C11DB7;
+		}
+	}
+	return crc; // don't complement crc on output
+}
+
+AssetManager::~AssetManager() {
+	delete m_PackIndex;
+}
diff --git a/dCommon/dClient/AssetManager.h b/dCommon/dClient/AssetManager.h
new file mode 100644
index 00000000..87653845
--- /dev/null
+++ b/dCommon/dClient/AssetManager.h
@@ -0,0 +1,78 @@
+#pragma once
+
+#include <string>
+#include <vector>
+#include <unordered_map>
+#include <filesystem>
+
+#include "Pack.h"
+#include "PackIndex.h"
+
+enum class eAssetBundleType {
+	None,
+	Unpacked,
+	Packed
+};
+
+struct AssetMemoryBuffer : std::streambuf {
+	char* m_Base;
+	bool m_Success;
+
+	AssetMemoryBuffer(char* base, std::ptrdiff_t n, bool success) {
+		m_Base = base;
+		m_Success = success;
+		if (!m_Success) return;
+		this->setg(base, base, base + n);
+	}
+
+	pos_type seekpos(pos_type sp, std::ios_base::openmode which) override {
+		return seekoff(sp - pos_type(off_type(0)), std::ios_base::beg, which);
+	}
+
+	pos_type seekoff(off_type off,
+		std::ios_base::seekdir dir,
+		std::ios_base::openmode which = std::ios_base::in) override {
+		if (dir == std::ios_base::cur)
+			gbump(off);
+		else if (dir == std::ios_base::end)
+			setg(eback(), egptr() + off, egptr());
+		else if (dir == std::ios_base::beg)
+			setg(eback(), eback() + off, egptr());
+		return gptr() - eback();
+	}
+
+	void close() {
+		delete m_Base;
+	}
+};
+
+class AssetManager {
+public:
+	AssetManager(const std::string& path);
+	~AssetManager();
+
+	std::filesystem::path GetResPath();
+	eAssetBundleType GetAssetBundleType();
+
+	bool HasFile(const char* name);
+	bool GetFile(const char* name, char** data, uint32_t* len);
+	AssetMemoryBuffer GetFileAsBuffer(const char* name);
+
+private:
+	void LoadPackIndex();
+	void UnpackRequiredAssets();
+
+	// Modified crc algorithm (mpeg2)
+	// Reference: https://stackoverflow.com/questions/54339800/how-to-modify-crc-32-to-crc-32-mpeg-2
+	inline uint32_t crc32b(uint32_t base, uint8_t* message, size_t l);
+
+	bool m_SuccessfullyLoaded;
+
+	std::filesystem::path m_Path;
+	std::filesystem::path m_RootPath;
+	std::filesystem::path m_ResPath;
+
+	eAssetBundleType m_AssetBundleType = eAssetBundleType::None;
+
+	PackIndex* m_PackIndex;
+};
diff --git a/dCommon/dClient/CMakeLists.txt b/dCommon/dClient/CMakeLists.txt
new file mode 100644
index 00000000..69bb1712
--- /dev/null
+++ b/dCommon/dClient/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(DCOMMON_DCLIENT_SOURCES
+	"PackIndex.cpp"
+	"Pack.cpp"
+	"AssetManager.cpp"
+	PARENT_SCOPE
+)
diff --git a/dCommon/dClient/Pack.cpp b/dCommon/dClient/Pack.cpp
new file mode 100644
index 00000000..1c1a643a
--- /dev/null
+++ b/dCommon/dClient/Pack.cpp
@@ -0,0 +1,119 @@
+#include "Pack.h"
+
+#include "BinaryIO.h"
+#include "ZCompression.h"
+
+Pack::Pack(const std::filesystem::path& filePath) {
+	m_FilePath = filePath;
+
+	if (!std::filesystem::exists(filePath)) {
+		return;
+	}
+
+	m_FileStream = std::ifstream(filePath, std::ios::in | std::ios::binary);
+
+	m_FileStream.read(m_Version, 7);
+
+	m_FileStream.seekg(-8, std::ios::end); // move file pointer to 8 bytes before the end (location of the address of the record count)
+
+	uint32_t recordCountPos = 0;
+	BinaryIO::BinaryRead<uint32_t>(m_FileStream, recordCountPos);
+
+	m_FileStream.seekg(recordCountPos, std::ios::beg);
+
+	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_RecordCount);
+
+	for (int i = 0; i < m_RecordCount; i++) {
+		PackRecord record;
+		BinaryIO::BinaryRead<PackRecord>(m_FileStream, record);
+
+		m_Records.push_back(record);
+	}
+
+	m_FileStream.close();
+}
+
+bool Pack::HasFile(uint32_t crc) {
+	for (const auto& record : m_Records) {
+		if (record.m_Crc == crc) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool Pack::ReadFileFromPack(uint32_t crc, char** data, uint32_t* len) {
+	// Time for some wacky C file reading for speed reasons
+
+	PackRecord pkRecord{};
+
+	for (const auto& record : m_Records) {
+		if (record.m_Crc == crc) {
+			pkRecord = record;
+			break;
+		}
+	}
+
+	if (pkRecord.m_Crc == 0) return false;
+
+	size_t pos = 0;
+	pos += pkRecord.m_FilePointer;
+
+	bool isCompressed = (pkRecord.m_IsCompressed & 0xff) > 0;
+	auto inPackSize = isCompressed ? pkRecord.m_CompressedSize : pkRecord.m_UncompressedSize;
+
+	FILE* file;
+#ifdef _WIN32
+	fopen_s(&file, m_FilePath.string().c_str(), "rb");
+#elif __APPLE__
+	// macOS has 64bit file IO by default
+	file = fopen(m_FilePath.string().c_str(), "rb");
+#else
+	file = fopen64(m_FilePath.string().c_str(), "rb");
+#endif
+
+	fseek(file, pos, SEEK_SET);
+
+	if (!isCompressed) {
+		char* tempData = (char*)malloc(pkRecord.m_UncompressedSize);
+		fread(tempData, sizeof(uint8_t), pkRecord.m_UncompressedSize, file);
+
+		*data = tempData;
+		*len = pkRecord.m_UncompressedSize;
+		fclose(file);
+
+		return true;
+	}
+
+	pos += 5; // skip header
+
+	fseek(file, pos, SEEK_SET);
+
+	char* decompressedData = (char*)malloc(pkRecord.m_UncompressedSize);
+	uint32_t currentReadPos = 0;
+
+	while (true) {
+		if (currentReadPos >= pkRecord.m_UncompressedSize) break;
+
+		uint32_t size;
+		fread(&size, sizeof(uint32_t), 1, file);
+		pos += 4; // Move pointer position 4 to the right
+
+		char* chunk = (char*)malloc(size);
+		fread(chunk, sizeof(int8_t), size, file);
+		pos += size; // Move pointer position the amount of bytes read to the right
+
+		int32_t err;
+		currentReadPos += ZCompression::Decompress((uint8_t*)chunk, size, reinterpret_cast<uint8_t*>(decompressedData + currentReadPos), ZCompression::MAX_SD0_CHUNK_SIZE, err);
+
+		free(chunk);
+	}
+
+	*data = decompressedData;
+	*len = pkRecord.m_UncompressedSize;
+
+	fclose(file);
+
+	return true;
+}
diff --git a/dCommon/dClient/Pack.h b/dCommon/dClient/Pack.h
new file mode 100644
index 00000000..3e95b00a
--- /dev/null
+++ b/dCommon/dClient/Pack.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <vector>
+#include <string>
+#include <filesystem>
+
+#pragma pack(push, 1)
+struct PackRecord {
+	uint32_t m_Crc;
+	int32_t m_LowerCrc;
+	int32_t m_UpperCrc;
+	uint32_t m_UncompressedSize;
+	char m_UncompressedHash[32];
+	uint32_t m_Padding1;
+	uint32_t m_CompressedSize;
+	char m_CompressedHash[32];
+	uint32_t m_Padding2;
+	uint32_t m_FilePointer;
+	uint32_t m_IsCompressed; // u32 bool
+};
+#pragma pack(pop)
+
+class Pack {
+public:
+	Pack(const std::filesystem::path& filePath);
+	~Pack() = default;
+
+	bool HasFile(uint32_t crc);
+	bool ReadFileFromPack(uint32_t crc, char** data, uint32_t* len);
+private:
+	std::ifstream m_FileStream;
+	std::filesystem::path m_FilePath;
+
+	char m_Version[7];
+
+	uint32_t m_RecordCount;
+	std::vector<PackRecord> m_Records;
+};
diff --git a/dCommon/dClient/PackIndex.cpp b/dCommon/dClient/PackIndex.cpp
new file mode 100644
index 00000000..5d96abeb
--- /dev/null
+++ b/dCommon/dClient/PackIndex.cpp
@@ -0,0 +1,54 @@
+#include "PackIndex.h"
+#include "BinaryIO.h"
+#include "Game.h"
+#include "dLogger.h"
+
+PackIndex::PackIndex(const std::filesystem::path& filePath) {
+	m_FileStream = std::ifstream(filePath / "versions" / "primary.pki", std::ios::in | std::ios::binary);
+
+	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_Version);
+	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_PackPathCount);
+
+	for (int i = 0; i < m_PackPathCount; i++) {
+		uint32_t stringLen = 0;
+		BinaryIO::BinaryRead<uint32_t>(m_FileStream, stringLen);
+
+		std::string path;
+
+		for (int j = 0; j < stringLen; j++) {
+			char inChar;
+			BinaryIO::BinaryRead<char>(m_FileStream, inChar);
+
+			path += inChar;
+		}
+
+		m_PackPaths.push_back(path);
+	}
+
+	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_PackFileIndexCount);
+
+	for (int i = 0; i < m_PackFileIndexCount; i++) {
+		PackFileIndex packFileIndex;
+		BinaryIO::BinaryRead<PackFileIndex>(m_FileStream, packFileIndex);
+
+		m_PackFileIndices.push_back(packFileIndex);
+	}
+
+	Game::logger->Log("PackIndex", "Loaded pack catalog with %i pack files and %i files", m_PackPaths.size(), m_PackFileIndices.size());
+
+	for (auto& item : m_PackPaths) {
+		std::replace(item.begin(), item.end(), '\\', '/');
+
+		auto* pack = new Pack(filePath / item);
+
+		m_Packs.push_back(pack);
+	}
+
+	m_FileStream.close();
+}
+
+PackIndex::~PackIndex() {
+	for (const auto* item : m_Packs) {
+		delete item;
+	}
+}
diff --git a/dCommon/dClient/PackIndex.h b/dCommon/dClient/PackIndex.h
new file mode 100644
index 00000000..bf10b809
--- /dev/null
+++ b/dCommon/dClient/PackIndex.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include <cstdint>
+
+#include <string>
+#include <vector>
+#include <filesystem>
+
+#include "Pack.h"
+
+#pragma pack(push, 1)
+struct PackFileIndex {
+	uint32_t m_Crc;
+	int32_t m_LowerCrc;
+	int32_t m_UpperCrc;
+	uint32_t m_PackFileIndex;
+	uint32_t m_IsCompressed; // u32 bool?
+};
+#pragma pack(pop)
+
+class PackIndex {
+public:
+	PackIndex(const std::filesystem::path& filePath);
+	~PackIndex();
+
+	const std::vector<std::string>& GetPackPaths() { return m_PackPaths; }
+	const std::vector<PackFileIndex>& GetPackFileIndices() { return m_PackFileIndices; }
+	const std::vector<Pack*>& GetPacks() { return m_Packs; }
+private:
+	std::ifstream m_FileStream;
+
+	uint32_t m_Version;
+
+	uint32_t m_PackPathCount;
+	std::vector<std::string> m_PackPaths;
+	uint32_t m_PackFileIndexCount;
+	std::vector<PackFileIndex> m_PackFileIndices;
+
+	std::vector<Pack*> m_Packs;
+};
diff --git a/dDatabase/Database.cpp b/dDatabase/Database.cpp
index c301cbd9..91589377 100644
--- a/dDatabase/Database.cpp
+++ b/dDatabase/Database.cpp
@@ -35,8 +35,8 @@ void Database::Connect(const string& host, const string& database, const string&
 }
 
 void Database::Connect() {
-	con = driver->connect(Database::props);
-	con->setSchema(Database::database);
+	con = driver->connect(Database::props["hostName"].c_str(), Database::props["user"].c_str(), Database::props["password"].c_str());
+	con->setSchema(Database::database.c_str());
 }
 
 void Database::Destroy(std::string source, bool log) {
diff --git a/dDatabase/MigrationRunner.cpp b/dDatabase/MigrationRunner.cpp
index 017ebe32..25312608 100644
--- a/dDatabase/MigrationRunner.cpp
+++ b/dDatabase/MigrationRunner.cpp
@@ -45,7 +45,7 @@ void MigrationRunner::RunMigrations() {
 		}
 
 		stmt = Database::CreatePreppedStmt("SELECT name FROM migration_history WHERE name = ?;");
-		stmt->setString(1, migration.name);
+		stmt->setString(1, migration.name.c_str());
 		auto* res = stmt->executeQuery();
 		bool doExit = res->next();
 		delete res;
@@ -56,11 +56,11 @@ void MigrationRunner::RunMigrations() {
 		if (migration.name == "5_brick_model_sd0.sql") {
 			runSd0Migrations = true;
 		} else {
-			finalSQL.append(migration.data);
+			finalSQL.append(migration.data.c_str());
 		}
 
 		stmt = Database::CreatePreppedStmt("INSERT INTO migration_history (name) VALUES (?);");
-		stmt->setString(1, migration.name);
+		stmt->setString(1, migration.name.c_str());
 		stmt->execute();
 		delete stmt;
 	}
@@ -76,7 +76,7 @@ void MigrationRunner::RunMigrations() {
 		for (auto& query : migration) {
 			try {
 				if (query.empty()) continue;
-				simpleStatement->execute(query);
+				simpleStatement->execute(query.c_str());
 			} catch (sql::SQLException& e) {
 				Game::logger->Log("MigrationRunner", "Encountered error running migration: %s", e.what());
 			}
@@ -103,7 +103,7 @@ void MigrationRunner::RunSQLiteMigrations() {
 		if (migration.data.empty()) continue;
 
 		stmt = Database::CreatePreppedStmt("SELECT name FROM migration_history WHERE name = ?;");
-		stmt->setString(1, migration.name);
+		stmt->setString(1, migration.name.c_str());
 		auto* res = stmt->executeQuery();
 		bool doExit = res->next();
 		delete res;
diff --git a/dGame/CMakeLists.txt b/dGame/CMakeLists.txt
index 6b31802e..80f16042 100644
--- a/dGame/CMakeLists.txt
+++ b/dGame/CMakeLists.txt
@@ -44,13 +44,19 @@ foreach(file ${DGAME_DMISSION_SOURCES})
 	set(DGAME_SOURCES ${DGAME_SOURCES} "dMission/${file}")
 endforeach()
 
+add_subdirectory(dPropertyBehaviors)
+
+foreach(file ${DGAME_DPROPERTYBEHAVIORS_SOURCES})
+	set(DGAME_SOURCES ${DGAME_SOURCES} "dPropertyBehaviors/${file}")
+endforeach()
+
 add_subdirectory(dUtilities)
 
 foreach(file ${DGAME_DUTILITIES_SOURCES})
 	set(DGAME_SOURCES ${DGAME_SOURCES} "dUtilities/${file}")
 endforeach()
 
-foreach(file ${DSCRIPT_SOURCES})
+foreach(file ${DSCRIPTS_SOURCES})
 	set(DGAME_SOURCES ${DGAME_SOURCES} "${PROJECT_SOURCE_DIR}/dScripts/${file}")
 endforeach()
 
diff --git a/dGame/dComponents/PropertyManagementComponent.cpp b/dGame/dComponents/PropertyManagementComponent.cpp
index f6954e4d..1e90e8db 100644
--- a/dGame/dComponents/PropertyManagementComponent.cpp
+++ b/dGame/dComponents/PropertyManagementComponent.cpp
@@ -656,7 +656,7 @@ void PropertyManagementComponent::Save() {
 		return;
 	}
 
-	auto* insertion = Database::CreatePreppedStmt("INSERT INTO properties_contents VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);");
+	auto* insertion = Database::CreatePreppedStmt("INSERT INTO properties_contents VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);");
 	auto* update = Database::CreatePreppedStmt("UPDATE properties_contents SET x = ?, y = ?, z = ?, rx = ?, ry = ?, rz = ?, rw = ? WHERE id = ?;");
 	auto* lookup = Database::CreatePreppedStmt("SELECT id FROM properties_contents WHERE property_id = ?;");
 	auto* remove = Database::CreatePreppedStmt("DELETE FROM properties_contents WHERE id = ?;");
@@ -706,6 +706,13 @@ void PropertyManagementComponent::Save() {
 			insertion->setDouble(9, rotation.y);
 			insertion->setDouble(10, rotation.z);
 			insertion->setDouble(11, rotation.w);
+			insertion->setString(12, "Objects_" + std::to_string(entity->GetLOT()) + "_name"); // Model name.  TODO make this customizable
+			insertion->setString(13, ""); // Model description.  TODO implement this.
+			insertion->setDouble(14, 0); // behavior 1.  TODO implement this.
+			insertion->setDouble(15, 0); // behavior 2.  TODO implement this.
+			insertion->setDouble(16, 0); // behavior 3.  TODO implement this.
+			insertion->setDouble(17, 0); // behavior 4.  TODO implement this.
+			insertion->setDouble(18, 0); // behavior 5.  TODO implement this.
 			try {
 				insertion->execute();
 			} catch (sql::SQLException& ex) {
diff --git a/dGame/dGameMessages/GameMessages.cpp b/dGame/dGameMessages/GameMessages.cpp
index 4efbd286..18d7e0f6 100644
--- a/dGame/dGameMessages/GameMessages.cpp
+++ b/dGame/dGameMessages/GameMessages.cpp
@@ -68,6 +68,8 @@
 #include "PropertyVendorComponent.h"
 #include "PropertySelectQueryProperty.h"
 #include "TradingManager.h"
+#include "ControlBehaviors.h"
+#include "AMFDeserialize.h"
 
 void GameMessages::SendFireEventClientSide(const LWOOBJID& objectID, const SystemAddress& sysAddr, std::u16string args, const LWOOBJID& object, int64_t param1, int param2, const LWOOBJID& sender) {
 	CBITSTREAM;
@@ -2396,8 +2398,24 @@ void GameMessages::SendUnSmash(Entity* entity, LWOOBJID builderID, float duratio
 }
 
 void GameMessages::HandleControlBehaviors(RakNet::BitStream* inStream, Entity* entity, const SystemAddress& sysAddr) {
-	// TODO
-	Game::logger->Log("GameMessages", "Recieved Control Behavior GameMessage, but property behaviors are unimplemented.");
+	AMFDeserialize reader;
+	std::unique_ptr<AMFValue> amfArguments(reader.Read(inStream));
+	if (amfArguments->GetValueType() != AMFValueType::AMFArray) return;
+
+	uint32_t commandLength{};
+	inStream->Read(commandLength);
+
+	std::string command;
+	for (uint32_t i = 0; i < commandLength; i++) {
+		unsigned char character;
+		inStream->Read(character);
+		command.push_back(character);
+	}
+
+	auto owner = PropertyManagementComponent::Instance()->GetOwner();
+    if (!owner) return;
+
+	ControlBehaviors::ProcessCommand(entity, sysAddr, static_cast<AMFArrayValue*>(amfArguments.get()), command, owner);
 }
 
 void GameMessages::HandleBBBSaveRequest(RakNet::BitStream* inStream, Entity* entity, const SystemAddress& sysAddr) {
@@ -2545,7 +2563,7 @@ void GameMessages::HandleBBBSaveRequest(RakNet::BitStream* inStream, Entity* ent
 				delete ugcs;
 
 				//Insert into the db as a BBB model:
-				auto* stmt = Database::CreatePreppedStmt("INSERT INTO `properties_contents`(`id`, `property_id`, `ugc_id`, `lot`, `x`, `y`, `z`, `rx`, `ry`, `rz`, `rw`) VALUES (?,?,?,?,?,?,?,?,?,?,?)");
+				auto* stmt = Database::CreatePreppedStmt("INSERT INTO `properties_contents` VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
 				stmt->setUInt64(1, newIDL);
 				stmt->setUInt64(2, propertyId);
 				stmt->setUInt(3, blueprintIDSmall);
@@ -2557,6 +2575,13 @@ void GameMessages::HandleBBBSaveRequest(RakNet::BitStream* inStream, Entity* ent
 				stmt->setDouble(9, 0.0f); // ry
 				stmt->setDouble(10, 0.0f); // rz
 				stmt->setDouble(11, 0.0f); // rw
+				stmt->setString(12, "Objects_14_name"); // Model name.  TODO make this customizable
+				stmt->setString(13, ""); // Model description.  TODO implement this.
+				stmt->setDouble(14, 0); // behavior 1.  TODO implement this.
+				stmt->setDouble(15, 0); // behavior 2.  TODO implement this.
+				stmt->setDouble(16, 0); // behavior 3.  TODO implement this.
+				stmt->setDouble(17, 0); // behavior 4.  TODO implement this.
+				stmt->setDouble(18, 0); // behavior 5.  TODO implement this.
 				stmt->execute();
 				delete stmt;
 
diff --git a/dGame/dInventory/Item.cpp b/dGame/dInventory/Item.cpp
index 4d4f2686..655af84e 100644
--- a/dGame/dInventory/Item.cpp
+++ b/dGame/dInventory/Item.cpp
@@ -13,6 +13,7 @@
 #include "PossessableComponent.h"
 #include "CharacterComponent.h"
 #include "eItemType.h"
+#include "AssetManager.h"
 
 class Inventory;
 
@@ -340,18 +341,23 @@ void Item::DisassembleModel() {
 	std::string renderAsset = result.fieldIsNull(0) ? "" : std::string(result.getStringField(0));
 	std::vector<std::string> renderAssetSplit = GeneralUtils::SplitString(renderAsset, '\\');
 
-	std::string lxfmlPath = "res/BrickModels/" + GeneralUtils::SplitString(renderAssetSplit.back(), '.')[0] + ".lxfml";
-	std::ifstream file(lxfmlPath);
+	std::string lxfmlPath = "BrickModels/" + GeneralUtils::SplitString(renderAssetSplit.back(), '.').at(0) + ".lxfml";
+	auto buffer = Game::assetManager->GetFileAsBuffer(lxfmlPath.c_str());
+
+	std::istream file(&buffer);
 
 	result.finalize();
 
 	if (!file.good()) {
+		buffer.close();
 		return;
 	}
 
 	std::stringstream data;
 	data << file.rdbuf();
 
+	buffer.close();
+
 	if (data.str().empty()) {
 		return;
 	}
diff --git a/dGame/dPropertyBehaviors/CMakeLists.txt b/dGame/dPropertyBehaviors/CMakeLists.txt
new file mode 100644
index 00000000..4f5d60aa
--- /dev/null
+++ b/dGame/dPropertyBehaviors/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(DGAME_DPROPERTYBEHAVIORS_SOURCES
+	"ControlBehaviors.cpp"
+	PARENT_SCOPE
+)
diff --git a/dGame/dPropertyBehaviors/ControlBehaviors.cpp b/dGame/dPropertyBehaviors/ControlBehaviors.cpp
new file mode 100644
index 00000000..4e922ee0
--- /dev/null
+++ b/dGame/dPropertyBehaviors/ControlBehaviors.cpp
@@ -0,0 +1,81 @@
+#include "ControlBehaviors.h"
+
+#include "AMFFormat.h"
+#include "Entity.h"
+#include "Game.h"
+#include "GameMessages.h"
+#include "ModelComponent.h"
+#include "dLogger.h"
+
+void ControlBehaviors::ProcessCommand(Entity* modelEntity, const SystemAddress& sysAddr, AMFArrayValue* arguments, std::string command, Entity* modelOwner) {
+	if (!modelEntity || !modelOwner || !arguments) return;
+
+    if (command == "sendBehaviorListToClient")
+        SendBehaviorListToClient(modelEntity, sysAddr, modelOwner);
+    else if (command == "modelTypeChanged")
+        Game::logger->Log("ControlBehaviors", "Got command %s but is not implemented!", command.c_str());
+    else if (command == "toggleExecutionUpdates")
+        Game::logger->Log("ControlBehaviors", "Got command %s but is not implemented!", command.c_str());
+    else if (command == "addStrip")
+        Game::logger->Log("ControlBehaviors", "Got command %s but is not implemented!", command.c_str());
+    else if (command == "removeStrip")
+        Game::logger->Log("ControlBehaviors", "Got command %s but is not implemented!", command.c_str());
+    else if (command == "mergeStrips")
+        Game::logger->Log("ControlBehaviors", "Got command %s but is not implemented!", command.c_str());
+    else if (command == "splitStrip")
+        Game::logger->Log("ControlBehaviors", "Got command %s but is not implemented!", command.c_str());
+    else if (command == "updateStripUI")
+        Game::logger->Log("ControlBehaviors", "Got command %s but is not implemented!", command.c_str());
+    else if (command == "addAction")
+        Game::logger->Log("ControlBehaviors", "Got command %s but is not implemented!", command.c_str());
+    else if (command == "migrateActions")
+        Game::logger->Log("ControlBehaviors", "Got command %s but is not implemented!", command.c_str());
+    else if (command == "rearrangeStrip")
+        Game::logger->Log("ControlBehaviors", "Got command %s but is not implemented!", command.c_str());
+    else if (command == "add")
+        Game::logger->Log("ControlBehaviors", "Got command %s but is not implemented!", command.c_str());
+    else if (command == "removeActions")
+        Game::logger->Log("ControlBehaviors", "Got command %s but is not implemented!", command.c_str());
+    else if (command == "rename")
+        Game::logger->Log("ControlBehaviors", "Got command %s but is not implemented!", command.c_str());
+    else if (command == "sendBehaviorBlocksToClient")
+        Game::logger->Log("ControlBehaviors", "Got command %s but is not implemented!", command.c_str());
+    else if (command == "moveToInventory")
+        Game::logger->Log("ControlBehaviors", "Got command %s but is not implemented!", command.c_str());
+    else if (command == "updateAction")
+        Game::logger->Log("ControlBehaviors", "Got command %s but is not implemented!", command.c_str());
+    else
+        Game::logger->Log("ControlBehaviors", "Unknown behavior command (%s)\n", command.c_str());
+}
+
+void ControlBehaviors::SendBehaviorListToClient(
+	Entity* modelEntity,
+	const SystemAddress& sysAddr,
+	Entity* modelOwner
+	) {
+	auto* modelComponent = modelEntity->GetComponent<ModelComponent>();
+
+	if (!modelComponent) return;
+
+    AMFArrayValue behaviorsToSerialize;
+
+	AMFArrayValue* behaviors = new AMFArrayValue(); // Empty for now
+
+	/**
+	 * The behaviors AMFArray will have up to 5 elements in the dense portion.
+	 * Each element in the dense portion will be made up of another AMFArray
+	 * with the following information mapped in the associative portion
+	 * "id": Behavior ID cast to an AMFString
+	 * "isLocked": AMFTrue or AMFFalse of whether or not the behavior is locked
+	 * "isLoot": AMFTrue or AMFFalse of whether or not the behavior is a custom behavior (true if custom)
+	 * "name": The name of the behavior formatted as an AMFString
+	 */
+
+	behaviorsToSerialize.InsertValue("behaviors", behaviors);
+
+	AMFStringValue* amfStringValueForObjectID = new AMFStringValue();
+	amfStringValueForObjectID->SetStringValue(std::to_string(modelComponent->GetParent()->GetObjectID()));
+
+	behaviorsToSerialize.InsertValue("objectID", amfStringValueForObjectID);
+	GameMessages::SendUIMessageServerToSingleClient(modelOwner, sysAddr, "UpdateBehaviorList", &behaviorsToSerialize);
+}
diff --git a/dGame/dPropertyBehaviors/ControlBehaviors.h b/dGame/dPropertyBehaviors/ControlBehaviors.h
new file mode 100644
index 00000000..7c24da68
--- /dev/null
+++ b/dGame/dPropertyBehaviors/ControlBehaviors.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#ifndef __CONTROLBEHAVIORS__H__
+#define __CONTROLBEHAVIORS__H__
+
+#include <string>
+
+#include "RakNetTypes.h"
+
+class Entity;
+class AMFArrayValue;
+
+namespace ControlBehaviors {
+	/**
+	 * @brief Main driver for processing Property Behavior commands
+	 *
+	 * @param modelEntity The model that sent this command
+	 * @param sysAddr The SystemAddress to respond to
+	 * @param arguments The arguments formatted as an AMFArrayValue
+	 * @param command The command to perform
+	 * @param modelOwner The owner of the model which sent this command
+	 */
+	void ProcessCommand(Entity* modelEntity, const SystemAddress& sysAddr, AMFArrayValue* arguments, std::string command, Entity* modelOwner);
+
+	/**
+	 * @brief Helper function to send the behavior list to the client
+	 *
+	 * @param modelEntity The model that sent this command
+	 * @param sysAddr The SystemAddress to respond to
+	 * @param modelOwner The owner of the model which sent this command
+	 */
+	void SendBehaviorListToClient(Entity* modelEntity, const SystemAddress& sysAddr, Entity* modelOwner);
+};
+
+#endif  //!__CONTROLBEHAVIORS__H__
diff --git a/dGame/dUtilities/BrickDatabase.cpp b/dGame/dUtilities/BrickDatabase.cpp
index 7ff0febb..4e873278 100644
--- a/dGame/dUtilities/BrickDatabase.cpp
+++ b/dGame/dUtilities/BrickDatabase.cpp
@@ -3,6 +3,7 @@
 
 #include "BrickDatabase.h"
 #include "Game.h"
+#include "AssetManager.h"
 
 std::vector<Brick> BrickDatabase::emptyCache{};
 BrickDatabase* BrickDatabase::m_Address = nullptr;
@@ -17,7 +18,8 @@ std::vector<Brick>& BrickDatabase::GetBricks(const std::string& lxfmlPath) {
 		return cached->second;
 	}
 
-	std::ifstream file(lxfmlPath);
+	AssetMemoryBuffer buffer = Game::assetManager->GetFileAsBuffer(("client/" + lxfmlPath).c_str());
+	std::istream file(&buffer);
 	if (!file.good()) {
 		return emptyCache;
 	}
@@ -25,9 +27,12 @@ std::vector<Brick>& BrickDatabase::GetBricks(const std::string& lxfmlPath) {
 	std::stringstream data;
 	data << file.rdbuf();
 	if (data.str().empty()) {
+		buffer.close();
 		return emptyCache;
 	}
 
+	buffer.close();
+
 	auto* doc = new tinyxml2::XMLDocument();
 	if (doc->Parse(data.str().c_str(), data.str().size()) != 0) {
 		delete doc;
diff --git a/dGame/dUtilities/SlashCommandHandler.cpp b/dGame/dUtilities/SlashCommandHandler.cpp
index c6f1da9f..e8f1659e 100644
--- a/dGame/dUtilities/SlashCommandHandler.cpp
+++ b/dGame/dUtilities/SlashCommandHandler.cpp
@@ -63,6 +63,7 @@
 #include "GameConfig.h"
 #include "ScriptedActivityComponent.h"
 #include "LevelProgressionComponent.h"
+#include "AssetManager.h"
 
 void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entity* entity, const SystemAddress& sysAddr) {
 	std::string chatCommand;
@@ -582,7 +583,8 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 		if (args[0].find("/") != std::string::npos) return;
 		if (args[0].find("\\") != std::string::npos) return;
 
-		std::ifstream infile("./res/macros/" + args[0] + ".scm");
+		auto buf = Game::assetManager->GetFileAsBuffer(("macros/" + args[0] + ".scm").c_str());
+		std::istream infile(&buf);
 
 		if (infile.good()) {
 			std::string line;
@@ -593,6 +595,8 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 			ChatPackets::SendSystemMessage(sysAddr, u"Unknown macro! Is the filename right?");
 		}
 
+		buf.close();
+
 		return;
 	}
 
@@ -1904,10 +1908,7 @@ bool SlashCommandHandler::CheckIfAccessibleZone(const unsigned int zoneID) {
 	CDZoneTableTable* zoneTable = CDClientManager::Instance()->GetTable<CDZoneTableTable>("ZoneTable");
 	const CDZoneTable* zone = zoneTable->Query(zoneID);
 	if (zone != nullptr) {
-		std::string zonePath = "./res/maps/" + zone->zoneName;
-		std::transform(zonePath.begin(), zonePath.end(), zonePath.begin(), ::tolower);
-		std::ifstream f(zonePath.c_str());
-		return f.good();
+		return Game::assetManager->HasFile(("maps/" + zone->zoneName).c_str());
 	} else {
 		return false;
 	}
diff --git a/dMasterServer/MasterServer.cpp b/dMasterServer/MasterServer.cpp
index cd54913a..061a91c7 100644
--- a/dMasterServer/MasterServer.cpp
+++ b/dMasterServer/MasterServer.cpp
@@ -25,6 +25,7 @@
 #include "dConfig.h"
 #include "dLogger.h"
 #include "dServer.h"
+#include "AssetManager.h"
 
 //RakNet includes:
 #include "RakNetDefines.h"
@@ -44,6 +45,7 @@ namespace Game {
 	dServer* server;
 	InstanceManager* im;
 	dConfig* config;
+	AssetManager* assetManager;
 } //namespace Game
 
 bool shutdownSequenceStarted = false;
@@ -99,44 +101,49 @@ int main(int argc, char** argv) {
 		return EXIT_FAILURE;
 	}
 
+	try {
+		std::string client_path = config.GetValue("client_location");
+		if (client_path.empty()) client_path = "./res";
+		Game::assetManager = new AssetManager(client_path);
+	} catch (std::runtime_error& ex) {
+		Game::logger->Log("MasterServer", "Got an error while setting up assets: %s", ex.what());
+
+		return EXIT_FAILURE;
+	}
+
 	MigrationRunner::RunMigrations();
 
-	//Check CDClient exists
-	const std::string cdclient_path = "./res/CDServer.sqlite";
-	std::ifstream cdclient_fd(cdclient_path);
-	if (!cdclient_fd.good()) {
-		Game::logger->Log("WorldServer", "%s could not be opened.  Looking for cdclient.fdb to convert to sqlite.", cdclient_path.c_str());
-		cdclient_fd.close();
+	// Check CDClient exists
+	if (!std::filesystem::exists(Game::assetManager->GetResPath() / "CDServer.sqlite")) {
+		Game::logger->Log("WorldServer", "CDServer.sqlite could not be opened. Looking for cdclient.fdb to convert to sqlite.");
 
-		const std::string cdclientFdbPath = "./res/cdclient.fdb";
-		cdclient_fd.open(cdclientFdbPath);
-		if (!cdclient_fd.good()) {
-			Game::logger->Log(
-				"WorldServer", "%s could not be opened."
-				"Please move a cdclient.fdb or an already converted database to build/res.", cdclientFdbPath.c_str());
+		if (!std::filesystem::exists(Game::assetManager->GetResPath() / "cdclient.fdb")) {
+			Game::logger->Log("WorldServer", "cdclient.fdb could not be opened. Please move a cdclient.fdb or an already converted database to build/res.");
 			return EXIT_FAILURE;
 		}
-		Game::logger->Log("WorldServer", "Found %s.  Clearing cdserver migration_history then copying and converting to sqlite.", cdclientFdbPath.c_str());
+
+		Game::logger->Log("WorldServer", "Found cdclient.fdb.  Clearing cdserver migration_history then copying and converting to sqlite.");
 		auto stmt = Database::CreatePreppedStmt(R"#(DELETE FROM migration_history WHERE name LIKE "%cdserver%";)#");
 		stmt->executeUpdate();
 		delete stmt;
-		cdclient_fd.close();
 
-		std::string res = "python3 ../thirdparty/docker-utils/utils/fdb_to_sqlite.py " + cdclientFdbPath;
-		int r = system(res.c_str());
-		if (r != 0) {
+		std::string res = "python3 ../thirdparty/docker-utils/utils/fdb_to_sqlite.py " + (Game::assetManager->GetResPath() / "cdclient.fdb").string();
+
+		int result = system(res.c_str());
+		if (result != 0) {
 			Game::logger->Log("MasterServer", "Failed to convert fdb to sqlite");
 			return EXIT_FAILURE;
 		}
-		if (std::rename("./cdclient.sqlite", "./res/CDServer.sqlite") != 0) {
-			Game::logger->Log("MasterServer", "failed to move cdclient file.");
+
+		if (std::rename("./cdclient.sqlite", (Game::assetManager->GetResPath() / "CDServer.sqlite").string().c_str()) != 0) {
+			Game::logger->Log("MasterServer", "Failed to move cdclient file.");
 			return EXIT_FAILURE;
 		}
 	}
 
 	//Connect to CDClient
 	try {
-		CDClientDatabase::Connect(cdclient_path);
+		CDClientDatabase::Connect((Game::assetManager->GetResPath() / "CDServer.sqlite").string());
 	} catch (CppSQLite3Exception& e) {
 		Game::logger->Log("WorldServer", "Unable to connect to CDServer SQLite Database");
 		Game::logger->Log("WorldServer", "Error: %s", e.errorMessage());
@@ -152,7 +159,7 @@ int main(int argc, char** argv) {
 		CDClientManager::Instance()->Initialize();
 	} catch (CppSQLite3Exception& e) {
 		Game::logger->Log("WorldServer", "Failed to initialize CDServer SQLite Database");
-		Game::logger->Log("WorldServer", "May be caused by corrupted file: %s", cdclient_path.c_str());
+		Game::logger->Log("WorldServer", "May be caused by corrupted file: %s", (Game::assetManager->GetResPath() / "CDServer.sqlite").string().c_str());
 		Game::logger->Log("WorldServer", "Error: %s", e.errorMessage());
 		Game::logger->Log("WorldServer", "Error Code: %i", e.errorCode());
 		return EXIT_FAILURE;
@@ -230,7 +237,7 @@ int main(int argc, char** argv) {
 	//If we found a server, update it's IP and port to the current one.
 	if (result->next()) {
 		auto* updateStatement = Database::CreatePreppedStmt("UPDATE `servers` SET `ip` = ?, `port` = ? WHERE `id` = ?");
-		updateStatement->setString(1, master_server_ip);
+		updateStatement->setString(1, master_server_ip.c_str());
 		updateStatement->setInt(2, Game::server->GetPort());
 		updateStatement->setInt(3, result->getInt("id"));
 		updateStatement->execute();
@@ -238,7 +245,7 @@ int main(int argc, char** argv) {
 	} else {
 		//If we didn't find a server, create one.
 		auto* insertStatement = Database::CreatePreppedStmt("INSERT INTO `servers` (`name`, `ip`, `port`, `state`, `version`) VALUES ('master', ?, ?, 0, 171023)");
-		insertStatement->setString(1, master_server_ip);
+		insertStatement->setString(1, master_server_ip.c_str());
 		insertStatement->setInt(2, Game::server->GetPort());
 		insertStatement->execute();
 		delete insertStatement;
diff --git a/dNavigation/dNavMesh.cpp b/dNavigation/dNavMesh.cpp
index b3c8a229..e5ba0129 100644
--- a/dNavigation/dNavMesh.cpp
+++ b/dNavigation/dNavMesh.cpp
@@ -43,7 +43,7 @@ dNavMesh::~dNavMesh() {
 
 void dNavMesh::LoadNavmesh() {
 
-	std::string path = "./res/maps/navmeshes/" + std::to_string(m_ZoneId) + ".bin";
+	std::string path = "./navmeshes/" + std::to_string(m_ZoneId) + ".bin";
 
 	if (!BinaryIO::DoesFileExist(path)) {
 		return;
diff --git a/dPhysics/dpEntity.cpp b/dPhysics/dpEntity.cpp
index 42c195f2..c7ed56f8 100644
--- a/dPhysics/dpEntity.cpp
+++ b/dPhysics/dpEntity.cpp
@@ -34,7 +34,6 @@ dpEntity::dpEntity(const LWOOBJID& objectID, NiPoint3 boxDimensions, bool isStat
 	m_CollisionGroup = COLLISION_GROUP_ALL;
 
 	m_CollisionShape = new dpShapeBox(this, boxDimensions.x, boxDimensions.y, boxDimensions.z);
-	if (boxDimensions.x > 100.0f) m_IsGargantuan = true;
 }
 
 dpEntity::dpEntity(const LWOOBJID& objectID, float width, float height, float depth, bool isStatic) {
@@ -45,7 +44,6 @@ dpEntity::dpEntity(const LWOOBJID& objectID, float width, float height, float de
 	m_CollisionGroup = COLLISION_GROUP_ALL;
 
 	m_CollisionShape = new dpShapeBox(this, width, height, depth);
-	if (width > 100.0f) m_IsGargantuan = true;
 }
 
 dpEntity::dpEntity(const LWOOBJID& objectID, float radius, bool isStatic) {
@@ -56,7 +54,6 @@ dpEntity::dpEntity(const LWOOBJID& objectID, float radius, bool isStatic) {
 	m_CollisionGroup = COLLISION_GROUP_ALL;
 
 	m_CollisionShape = new dpShapeSphere(this, radius);
-	if (radius > 200.0f) m_IsGargantuan = true;
 }
 
 dpEntity::~dpEntity() {
@@ -146,5 +143,12 @@ void dpEntity::SetAngularVelocity(const NiPoint3& newAngularVelocity) {
 
 void dpEntity::SetGrid(dpGrid* grid) {
 	m_Grid = grid;
+
+	if (m_CollisionShape->GetShapeType() == dpShapeType::Sphere && static_cast<dpShapeSphere*>(m_CollisionShape)->GetRadius() * 2.0f > static_cast<float>(m_Grid->CELL_SIZE)) {
+		m_IsGargantuan = true;
+	} else if (m_CollisionShape->GetShapeType() == dpShapeType::Box && static_cast<dpShapeBox*>(m_CollisionShape)->GetWidth() > static_cast<float>(m_Grid->CELL_SIZE)) {
+		m_IsGargantuan = true;
+	}
+
 	m_Grid->Add(this);
 }
diff --git a/dScripts/02_server/CMakeLists.txt b/dScripts/02_server/CMakeLists.txt
new file mode 100644
index 00000000..1e38386f
--- /dev/null
+++ b/dScripts/02_server/CMakeLists.txt
@@ -0,0 +1,45 @@
+set(DSCRIPTS_SOURCES_02_SERVER)
+
+add_subdirectory(DLU)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_DLU})
+	set(DSCRIPTS_SOURCES_02_SERVER ${DSCRIPTS_SOURCES_02_SERVER} "DLU/${file}")
+endforeach()
+
+add_subdirectory(Enemy)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_ENEMY})
+	set(DSCRIPTS_SOURCES_02_SERVER ${DSCRIPTS_SOURCES_02_SERVER} "Enemy/${file}")
+endforeach()
+
+add_subdirectory(Equipment)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_EQUIPMENT})
+	set(DSCRIPTS_SOURCES_02_SERVER ${DSCRIPTS_SOURCES_02_SERVER} "Equipment/${file}")
+endforeach()
+
+add_subdirectory(Map)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP})
+	set(DSCRIPTS_SOURCES_02_SERVER ${DSCRIPTS_SOURCES_02_SERVER} "Map/${file}")
+endforeach()
+
+add_subdirectory(Minigame)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MINIGAME})
+	set(DSCRIPTS_SOURCES_02_SERVER ${DSCRIPTS_SOURCES_02_SERVER} "Minigame/${file}")
+endforeach()
+
+add_subdirectory(Objects)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_OBJECTS})
+	set(DSCRIPTS_SOURCES_02_SERVER ${DSCRIPTS_SOURCES_02_SERVER} "Objects/${file}")
+endforeach()
+
+add_subdirectory(Pets)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_PETS})
+	set(DSCRIPTS_SOURCES_02_SERVER ${DSCRIPTS_SOURCES_02_SERVER} "Pets/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_02_SERVER ${DSCRIPTS_SOURCES_02_SERVER} PARENT_SCOPE)
diff --git a/dScripts/02_server/DLU/CMakeLists.txt b/dScripts/02_server/DLU/CMakeLists.txt
new file mode 100644
index 00000000..64d4cbbd
--- /dev/null
+++ b/dScripts/02_server/DLU/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_02_SERVER_DLU 
+	"DLUVanityNPC.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/DLUVanityNPC.cpp b/dScripts/02_server/DLU/DLUVanityNPC.cpp
similarity index 100%
rename from dScripts/DLUVanityNPC.cpp
rename to dScripts/02_server/DLU/DLUVanityNPC.cpp
diff --git a/dScripts/DLUVanityNPC.h b/dScripts/02_server/DLU/DLUVanityNPC.h
similarity index 100%
rename from dScripts/DLUVanityNPC.h
rename to dScripts/02_server/DLU/DLUVanityNPC.h
diff --git a/dScripts/BossSpiderQueenEnemyServer.cpp b/dScripts/02_server/Enemy/AG/BossSpiderQueenEnemyServer.cpp
similarity index 100%
rename from dScripts/BossSpiderQueenEnemyServer.cpp
rename to dScripts/02_server/Enemy/AG/BossSpiderQueenEnemyServer.cpp
diff --git a/dScripts/BossSpiderQueenEnemyServer.h b/dScripts/02_server/Enemy/AG/BossSpiderQueenEnemyServer.h
similarity index 100%
rename from dScripts/BossSpiderQueenEnemyServer.h
rename to dScripts/02_server/Enemy/AG/BossSpiderQueenEnemyServer.h
diff --git a/dScripts/02_server/Enemy/AG/CMakeLists.txt b/dScripts/02_server/Enemy/AG/CMakeLists.txt
new file mode 100644
index 00000000..865d4c3c
--- /dev/null
+++ b/dScripts/02_server/Enemy/AG/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_02_SERVER_ENEMY_AG 
+	"BossSpiderQueenEnemyServer.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/AmDarklingDragon.cpp b/dScripts/02_server/Enemy/AM/AmDarklingDragon.cpp
similarity index 100%
rename from dScripts/AmDarklingDragon.cpp
rename to dScripts/02_server/Enemy/AM/AmDarklingDragon.cpp
diff --git a/dScripts/AmDarklingDragon.h b/dScripts/02_server/Enemy/AM/AmDarklingDragon.h
similarity index 100%
rename from dScripts/AmDarklingDragon.h
rename to dScripts/02_server/Enemy/AM/AmDarklingDragon.h
diff --git a/dScripts/AmDarklingMech.cpp b/dScripts/02_server/Enemy/AM/AmDarklingMech.cpp
similarity index 100%
rename from dScripts/AmDarklingMech.cpp
rename to dScripts/02_server/Enemy/AM/AmDarklingMech.cpp
diff --git a/dScripts/AmDarklingMech.h b/dScripts/02_server/Enemy/AM/AmDarklingMech.h
similarity index 100%
rename from dScripts/AmDarklingMech.h
rename to dScripts/02_server/Enemy/AM/AmDarklingMech.h
diff --git a/dScripts/AmSkeletonEngineer.cpp b/dScripts/02_server/Enemy/AM/AmSkeletonEngineer.cpp
similarity index 100%
rename from dScripts/AmSkeletonEngineer.cpp
rename to dScripts/02_server/Enemy/AM/AmSkeletonEngineer.cpp
diff --git a/dScripts/AmSkeletonEngineer.h b/dScripts/02_server/Enemy/AM/AmSkeletonEngineer.h
similarity index 100%
rename from dScripts/AmSkeletonEngineer.h
rename to dScripts/02_server/Enemy/AM/AmSkeletonEngineer.h
diff --git a/dScripts/02_server/Enemy/AM/CMakeLists.txt b/dScripts/02_server/Enemy/AM/CMakeLists.txt
new file mode 100644
index 00000000..dd20edb0
--- /dev/null
+++ b/dScripts/02_server/Enemy/AM/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(DSCRIPTS_SOURCES_02_SERVER_ENEMY_AM 
+	"AmDarklingMech.cpp"
+	"AmSkeletonEngineer.cpp"
+	"AmDarklingDragon.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/02_server/Enemy/CMakeLists.txt b/dScripts/02_server/Enemy/CMakeLists.txt
new file mode 100644
index 00000000..408ff733
--- /dev/null
+++ b/dScripts/02_server/Enemy/CMakeLists.txt
@@ -0,0 +1,45 @@
+set(DSCRIPTS_SOURCES_02_SERVER_ENEMY)
+
+add_subdirectory(AG)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_ENEMY_AG})
+	set(DSCRIPTS_SOURCES_02_SERVER_ENEMY ${DSCRIPTS_SOURCES_02_SERVER_ENEMY} "AG/${file}")
+endforeach()
+
+add_subdirectory(AM)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_ENEMY_AM})
+	set(DSCRIPTS_SOURCES_02_SERVER_ENEMY ${DSCRIPTS_SOURCES_02_SERVER_ENEMY} "AM/${file}")
+endforeach()
+
+add_subdirectory(FV)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_ENEMY_FV})
+	set(DSCRIPTS_SOURCES_02_SERVER_ENEMY ${DSCRIPTS_SOURCES_02_SERVER_ENEMY} "FV/${file}")
+endforeach()
+
+add_subdirectory(General)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_ENEMY_GENERAL})
+	set(DSCRIPTS_SOURCES_02_SERVER_ENEMY ${DSCRIPTS_SOURCES_02_SERVER_ENEMY} "General/${file}")
+endforeach()
+
+add_subdirectory(Survival)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_ENEMY_SURVIVAL})
+	set(DSCRIPTS_SOURCES_02_SERVER_ENEMY ${DSCRIPTS_SOURCES_02_SERVER_ENEMY} "Survival/${file}")
+endforeach()
+
+add_subdirectory(VE)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_ENEMY_VE})
+	set(DSCRIPTS_SOURCES_02_SERVER_ENEMY ${DSCRIPTS_SOURCES_02_SERVER_ENEMY} "VE/${file}")
+endforeach()
+
+add_subdirectory(Waves)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_ENEMY_WAVES})
+	set(DSCRIPTS_SOURCES_02_SERVER_ENEMY ${DSCRIPTS_SOURCES_02_SERVER_ENEMY} "Waves/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_02_SERVER_ENEMY ${DSCRIPTS_SOURCES_02_SERVER_ENEMY} PARENT_SCOPE)
diff --git a/dScripts/02_server/Enemy/FV/CMakeLists.txt b/dScripts/02_server/Enemy/FV/CMakeLists.txt
new file mode 100644
index 00000000..5146d8d8
--- /dev/null
+++ b/dScripts/02_server/Enemy/FV/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(DSCRIPTS_SOURCES_02_SERVER_ENEMY_FV 
+	"FvMaelstromCavalry.cpp"
+	"FvMaelstromDragon.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/FvMaelstromCavalry.cpp b/dScripts/02_server/Enemy/FV/FvMaelstromCavalry.cpp
similarity index 100%
rename from dScripts/FvMaelstromCavalry.cpp
rename to dScripts/02_server/Enemy/FV/FvMaelstromCavalry.cpp
diff --git a/dScripts/FvMaelstromCavalry.h b/dScripts/02_server/Enemy/FV/FvMaelstromCavalry.h
similarity index 100%
rename from dScripts/FvMaelstromCavalry.h
rename to dScripts/02_server/Enemy/FV/FvMaelstromCavalry.h
diff --git a/dScripts/FvMaelstromDragon.cpp b/dScripts/02_server/Enemy/FV/FvMaelstromDragon.cpp
similarity index 100%
rename from dScripts/FvMaelstromDragon.cpp
rename to dScripts/02_server/Enemy/FV/FvMaelstromDragon.cpp
diff --git a/dScripts/FvMaelstromDragon.h b/dScripts/02_server/Enemy/FV/FvMaelstromDragon.h
similarity index 100%
rename from dScripts/FvMaelstromDragon.h
rename to dScripts/02_server/Enemy/FV/FvMaelstromDragon.h
diff --git a/dScripts/BaseEnemyApe.cpp b/dScripts/02_server/Enemy/General/BaseEnemyApe.cpp
similarity index 100%
rename from dScripts/BaseEnemyApe.cpp
rename to dScripts/02_server/Enemy/General/BaseEnemyApe.cpp
diff --git a/dScripts/BaseEnemyApe.h b/dScripts/02_server/Enemy/General/BaseEnemyApe.h
similarity index 100%
rename from dScripts/BaseEnemyApe.h
rename to dScripts/02_server/Enemy/General/BaseEnemyApe.h
diff --git a/dScripts/BaseEnemyMech.cpp b/dScripts/02_server/Enemy/General/BaseEnemyMech.cpp
similarity index 100%
rename from dScripts/BaseEnemyMech.cpp
rename to dScripts/02_server/Enemy/General/BaseEnemyMech.cpp
diff --git a/dScripts/BaseEnemyMech.h b/dScripts/02_server/Enemy/General/BaseEnemyMech.h
similarity index 100%
rename from dScripts/BaseEnemyMech.h
rename to dScripts/02_server/Enemy/General/BaseEnemyMech.h
diff --git a/dScripts/02_server/Enemy/General/CMakeLists.txt b/dScripts/02_server/Enemy/General/CMakeLists.txt
new file mode 100644
index 00000000..5486d2b0
--- /dev/null
+++ b/dScripts/02_server/Enemy/General/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(DSCRIPTS_SOURCES_02_SERVER_ENEMY_GENERAL 
+	"BaseEnemyMech.cpp"
+	"BaseEnemyApe.cpp"
+	"GfApeSmashingQB.cpp"
+	"TreasureChestDragonServer.cpp"
+	"EnemyNjBuff.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/EnemyNjBuff.cpp b/dScripts/02_server/Enemy/General/EnemyNjBuff.cpp
similarity index 100%
rename from dScripts/EnemyNjBuff.cpp
rename to dScripts/02_server/Enemy/General/EnemyNjBuff.cpp
diff --git a/dScripts/EnemyNjBuff.h b/dScripts/02_server/Enemy/General/EnemyNjBuff.h
similarity index 100%
rename from dScripts/EnemyNjBuff.h
rename to dScripts/02_server/Enemy/General/EnemyNjBuff.h
diff --git a/dScripts/GfApeSmashingQB.cpp b/dScripts/02_server/Enemy/General/GfApeSmashingQB.cpp
similarity index 100%
rename from dScripts/GfApeSmashingQB.cpp
rename to dScripts/02_server/Enemy/General/GfApeSmashingQB.cpp
diff --git a/dScripts/GfApeSmashingQB.h b/dScripts/02_server/Enemy/General/GfApeSmashingQB.h
similarity index 100%
rename from dScripts/GfApeSmashingQB.h
rename to dScripts/02_server/Enemy/General/GfApeSmashingQB.h
diff --git a/dScripts/TreasureChestDragonServer.cpp b/dScripts/02_server/Enemy/General/TreasureChestDragonServer.cpp
similarity index 100%
rename from dScripts/TreasureChestDragonServer.cpp
rename to dScripts/02_server/Enemy/General/TreasureChestDragonServer.cpp
diff --git a/dScripts/TreasureChestDragonServer.h b/dScripts/02_server/Enemy/General/TreasureChestDragonServer.h
similarity index 100%
rename from dScripts/TreasureChestDragonServer.h
rename to dScripts/02_server/Enemy/General/TreasureChestDragonServer.h
diff --git a/dScripts/AgSurvivalMech.cpp b/dScripts/02_server/Enemy/Survival/AgSurvivalMech.cpp
similarity index 100%
rename from dScripts/AgSurvivalMech.cpp
rename to dScripts/02_server/Enemy/Survival/AgSurvivalMech.cpp
diff --git a/dScripts/AgSurvivalMech.h b/dScripts/02_server/Enemy/Survival/AgSurvivalMech.h
similarity index 100%
rename from dScripts/AgSurvivalMech.h
rename to dScripts/02_server/Enemy/Survival/AgSurvivalMech.h
diff --git a/dScripts/AgSurvivalSpiderling.cpp b/dScripts/02_server/Enemy/Survival/AgSurvivalSpiderling.cpp
similarity index 100%
rename from dScripts/AgSurvivalSpiderling.cpp
rename to dScripts/02_server/Enemy/Survival/AgSurvivalSpiderling.cpp
diff --git a/dScripts/AgSurvivalSpiderling.h b/dScripts/02_server/Enemy/Survival/AgSurvivalSpiderling.h
similarity index 100%
rename from dScripts/AgSurvivalSpiderling.h
rename to dScripts/02_server/Enemy/Survival/AgSurvivalSpiderling.h
diff --git a/dScripts/AgSurvivalStromling.cpp b/dScripts/02_server/Enemy/Survival/AgSurvivalStromling.cpp
similarity index 100%
rename from dScripts/AgSurvivalStromling.cpp
rename to dScripts/02_server/Enemy/Survival/AgSurvivalStromling.cpp
diff --git a/dScripts/AgSurvivalStromling.h b/dScripts/02_server/Enemy/Survival/AgSurvivalStromling.h
similarity index 100%
rename from dScripts/AgSurvivalStromling.h
rename to dScripts/02_server/Enemy/Survival/AgSurvivalStromling.h
diff --git a/dScripts/02_server/Enemy/Survival/CMakeLists.txt b/dScripts/02_server/Enemy/Survival/CMakeLists.txt
new file mode 100644
index 00000000..55236240
--- /dev/null
+++ b/dScripts/02_server/Enemy/Survival/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(DSCRIPTS_SOURCES_02_SERVER_ENEMY_SURVIVAL 
+	"AgSurvivalStromling.cpp"
+	"AgSurvivalMech.cpp"
+	"AgSurvivalSpiderling.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/02_server/Enemy/VE/CMakeLists.txt b/dScripts/02_server/Enemy/VE/CMakeLists.txt
new file mode 100644
index 00000000..a1cc39ad
--- /dev/null
+++ b/dScripts/02_server/Enemy/VE/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_02_SERVER_ENEMY_VE 
+	"VeMech.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/VeMech.cpp b/dScripts/02_server/Enemy/VE/VeMech.cpp
similarity index 100%
rename from dScripts/VeMech.cpp
rename to dScripts/02_server/Enemy/VE/VeMech.cpp
diff --git a/dScripts/VeMech.h b/dScripts/02_server/Enemy/VE/VeMech.h
similarity index 100%
rename from dScripts/VeMech.h
rename to dScripts/02_server/Enemy/VE/VeMech.h
diff --git a/dScripts/02_server/Enemy/Waves/CMakeLists.txt b/dScripts/02_server/Enemy/Waves/CMakeLists.txt
new file mode 100644
index 00000000..a25aca38
--- /dev/null
+++ b/dScripts/02_server/Enemy/Waves/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(DSCRIPTS_SOURCES_02_SERVER_ENEMY_WAVES 
+	"WaveBossHammerling.cpp"
+	"WaveBossApe.cpp"
+	"WaveBossSpiderling.cpp"
+	"WaveBossHorsemen.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/WaveBossApe.cpp b/dScripts/02_server/Enemy/Waves/WaveBossApe.cpp
similarity index 100%
rename from dScripts/WaveBossApe.cpp
rename to dScripts/02_server/Enemy/Waves/WaveBossApe.cpp
diff --git a/dScripts/WaveBossApe.h b/dScripts/02_server/Enemy/Waves/WaveBossApe.h
similarity index 100%
rename from dScripts/WaveBossApe.h
rename to dScripts/02_server/Enemy/Waves/WaveBossApe.h
diff --git a/dScripts/WaveBossHammerling.cpp b/dScripts/02_server/Enemy/Waves/WaveBossHammerling.cpp
similarity index 100%
rename from dScripts/WaveBossHammerling.cpp
rename to dScripts/02_server/Enemy/Waves/WaveBossHammerling.cpp
diff --git a/dScripts/WaveBossHammerling.h b/dScripts/02_server/Enemy/Waves/WaveBossHammerling.h
similarity index 100%
rename from dScripts/WaveBossHammerling.h
rename to dScripts/02_server/Enemy/Waves/WaveBossHammerling.h
diff --git a/dScripts/WaveBossHorsemen.cpp b/dScripts/02_server/Enemy/Waves/WaveBossHorsemen.cpp
similarity index 100%
rename from dScripts/WaveBossHorsemen.cpp
rename to dScripts/02_server/Enemy/Waves/WaveBossHorsemen.cpp
diff --git a/dScripts/WaveBossHorsemen.h b/dScripts/02_server/Enemy/Waves/WaveBossHorsemen.h
similarity index 100%
rename from dScripts/WaveBossHorsemen.h
rename to dScripts/02_server/Enemy/Waves/WaveBossHorsemen.h
diff --git a/dScripts/WaveBossSpiderling.cpp b/dScripts/02_server/Enemy/Waves/WaveBossSpiderling.cpp
similarity index 100%
rename from dScripts/WaveBossSpiderling.cpp
rename to dScripts/02_server/Enemy/Waves/WaveBossSpiderling.cpp
diff --git a/dScripts/WaveBossSpiderling.h b/dScripts/02_server/Enemy/Waves/WaveBossSpiderling.h
similarity index 100%
rename from dScripts/WaveBossSpiderling.h
rename to dScripts/02_server/Enemy/Waves/WaveBossSpiderling.h
diff --git a/dScripts/BootyDigServer.cpp b/dScripts/02_server/Equipment/BootyDigServer.cpp
similarity index 100%
rename from dScripts/BootyDigServer.cpp
rename to dScripts/02_server/Equipment/BootyDigServer.cpp
diff --git a/dScripts/BootyDigServer.h b/dScripts/02_server/Equipment/BootyDigServer.h
similarity index 100%
rename from dScripts/BootyDigServer.h
rename to dScripts/02_server/Equipment/BootyDigServer.h
diff --git a/dScripts/02_server/Equipment/CMakeLists.txt b/dScripts/02_server/Equipment/CMakeLists.txt
new file mode 100644
index 00000000..d29e7ca7
--- /dev/null
+++ b/dScripts/02_server/Equipment/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(DSCRIPTS_SOURCES_02_SERVER_EQUIPMENT 
+	"MaestromExtracticatorServer.cpp"
+	"BootyDigServer.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/MaestromExtracticatorServer.cpp b/dScripts/02_server/Equipment/MaestromExtracticatorServer.cpp
similarity index 100%
rename from dScripts/MaestromExtracticatorServer.cpp
rename to dScripts/02_server/Equipment/MaestromExtracticatorServer.cpp
diff --git a/dScripts/MaestromExtracticatorServer.h b/dScripts/02_server/Equipment/MaestromExtracticatorServer.h
similarity index 100%
rename from dScripts/MaestromExtracticatorServer.h
rename to dScripts/02_server/Equipment/MaestromExtracticatorServer.h
diff --git a/dScripts/AgBugsprayer.cpp b/dScripts/02_server/Map/AG/AgBugsprayer.cpp
similarity index 100%
rename from dScripts/AgBugsprayer.cpp
rename to dScripts/02_server/Map/AG/AgBugsprayer.cpp
diff --git a/dScripts/AgBugsprayer.h b/dScripts/02_server/Map/AG/AgBugsprayer.h
similarity index 100%
rename from dScripts/AgBugsprayer.h
rename to dScripts/02_server/Map/AG/AgBugsprayer.h
diff --git a/dScripts/AgCagedBricksServer.cpp b/dScripts/02_server/Map/AG/AgCagedBricksServer.cpp
similarity index 100%
rename from dScripts/AgCagedBricksServer.cpp
rename to dScripts/02_server/Map/AG/AgCagedBricksServer.cpp
diff --git a/dScripts/AgCagedBricksServer.h b/dScripts/02_server/Map/AG/AgCagedBricksServer.h
similarity index 100%
rename from dScripts/AgCagedBricksServer.h
rename to dScripts/02_server/Map/AG/AgCagedBricksServer.h
diff --git a/dScripts/AgLaserSensorServer.cpp b/dScripts/02_server/Map/AG/AgLaserSensorServer.cpp
similarity index 100%
rename from dScripts/AgLaserSensorServer.cpp
rename to dScripts/02_server/Map/AG/AgLaserSensorServer.cpp
diff --git a/dScripts/AgLaserSensorServer.h b/dScripts/02_server/Map/AG/AgLaserSensorServer.h
similarity index 100%
rename from dScripts/AgLaserSensorServer.h
rename to dScripts/02_server/Map/AG/AgLaserSensorServer.h
diff --git a/dScripts/AgMonumentBirds.cpp b/dScripts/02_server/Map/AG/AgMonumentBirds.cpp
similarity index 100%
rename from dScripts/AgMonumentBirds.cpp
rename to dScripts/02_server/Map/AG/AgMonumentBirds.cpp
diff --git a/dScripts/AgMonumentBirds.h b/dScripts/02_server/Map/AG/AgMonumentBirds.h
similarity index 100%
rename from dScripts/AgMonumentBirds.h
rename to dScripts/02_server/Map/AG/AgMonumentBirds.h
diff --git a/dScripts/AgMonumentLaserServer.cpp b/dScripts/02_server/Map/AG/AgMonumentLaserServer.cpp
similarity index 100%
rename from dScripts/AgMonumentLaserServer.cpp
rename to dScripts/02_server/Map/AG/AgMonumentLaserServer.cpp
diff --git a/dScripts/AgMonumentLaserServer.h b/dScripts/02_server/Map/AG/AgMonumentLaserServer.h
similarity index 100%
rename from dScripts/AgMonumentLaserServer.h
rename to dScripts/02_server/Map/AG/AgMonumentLaserServer.h
diff --git a/dScripts/AgMonumentRaceCancel.cpp b/dScripts/02_server/Map/AG/AgMonumentRaceCancel.cpp
similarity index 100%
rename from dScripts/AgMonumentRaceCancel.cpp
rename to dScripts/02_server/Map/AG/AgMonumentRaceCancel.cpp
diff --git a/dScripts/AgMonumentRaceCancel.h b/dScripts/02_server/Map/AG/AgMonumentRaceCancel.h
similarity index 100%
rename from dScripts/AgMonumentRaceCancel.h
rename to dScripts/02_server/Map/AG/AgMonumentRaceCancel.h
diff --git a/dScripts/AgMonumentRaceGoal.cpp b/dScripts/02_server/Map/AG/AgMonumentRaceGoal.cpp
similarity index 100%
rename from dScripts/AgMonumentRaceGoal.cpp
rename to dScripts/02_server/Map/AG/AgMonumentRaceGoal.cpp
diff --git a/dScripts/AgMonumentRaceGoal.h b/dScripts/02_server/Map/AG/AgMonumentRaceGoal.h
similarity index 100%
rename from dScripts/AgMonumentRaceGoal.h
rename to dScripts/02_server/Map/AG/AgMonumentRaceGoal.h
diff --git a/dScripts/02_server/Map/AG/CMakeLists.txt b/dScripts/02_server/Map/AG/CMakeLists.txt
new file mode 100644
index 00000000..df26dee4
--- /dev/null
+++ b/dScripts/02_server/Map/AG/CMakeLists.txt
@@ -0,0 +1,16 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_AG 
+	"AgCagedBricksServer.cpp"
+	"NpcWispServer.cpp"
+	"NpcEpsilonServer.cpp"
+	"AgLaserSensorServer.cpp"
+	"AgMonumentLaserServer.cpp"
+	"AgMonumentBirds.cpp"
+	"RemoveRentalGear.cpp"
+	"NpcNjAssistantServer.cpp"
+	"AgBugsprayer.cpp"
+	"NpcAgCourseStarter.cpp"
+	"AgMonumentRaceGoal.cpp"
+	"AgMonumentRaceCancel.cpp"
+	"NpcCowboyServer.cpp"
+	"NpcPirateServer.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/NpcAgCourseStarter.cpp b/dScripts/02_server/Map/AG/NpcAgCourseStarter.cpp
similarity index 100%
rename from dScripts/NpcAgCourseStarter.cpp
rename to dScripts/02_server/Map/AG/NpcAgCourseStarter.cpp
diff --git a/dScripts/NpcAgCourseStarter.h b/dScripts/02_server/Map/AG/NpcAgCourseStarter.h
similarity index 100%
rename from dScripts/NpcAgCourseStarter.h
rename to dScripts/02_server/Map/AG/NpcAgCourseStarter.h
diff --git a/dScripts/NpcCowboyServer.cpp b/dScripts/02_server/Map/AG/NpcCowboyServer.cpp
similarity index 100%
rename from dScripts/NpcCowboyServer.cpp
rename to dScripts/02_server/Map/AG/NpcCowboyServer.cpp
diff --git a/dScripts/NpcCowboyServer.h b/dScripts/02_server/Map/AG/NpcCowboyServer.h
similarity index 100%
rename from dScripts/NpcCowboyServer.h
rename to dScripts/02_server/Map/AG/NpcCowboyServer.h
diff --git a/dScripts/NpcEpsilonServer.cpp b/dScripts/02_server/Map/AG/NpcEpsilonServer.cpp
similarity index 100%
rename from dScripts/NpcEpsilonServer.cpp
rename to dScripts/02_server/Map/AG/NpcEpsilonServer.cpp
diff --git a/dScripts/NpcEpsilonServer.h b/dScripts/02_server/Map/AG/NpcEpsilonServer.h
similarity index 100%
rename from dScripts/NpcEpsilonServer.h
rename to dScripts/02_server/Map/AG/NpcEpsilonServer.h
diff --git a/dScripts/NpcNjAssistantServer.cpp b/dScripts/02_server/Map/AG/NpcNjAssistantServer.cpp
similarity index 100%
rename from dScripts/NpcNjAssistantServer.cpp
rename to dScripts/02_server/Map/AG/NpcNjAssistantServer.cpp
diff --git a/dScripts/NpcNjAssistantServer.h b/dScripts/02_server/Map/AG/NpcNjAssistantServer.h
similarity index 100%
rename from dScripts/NpcNjAssistantServer.h
rename to dScripts/02_server/Map/AG/NpcNjAssistantServer.h
diff --git a/dScripts/NpcPirateServer.cpp b/dScripts/02_server/Map/AG/NpcPirateServer.cpp
similarity index 100%
rename from dScripts/NpcPirateServer.cpp
rename to dScripts/02_server/Map/AG/NpcPirateServer.cpp
diff --git a/dScripts/NpcPirateServer.h b/dScripts/02_server/Map/AG/NpcPirateServer.h
similarity index 100%
rename from dScripts/NpcPirateServer.h
rename to dScripts/02_server/Map/AG/NpcPirateServer.h
diff --git a/dScripts/NpcWispServer.cpp b/dScripts/02_server/Map/AG/NpcWispServer.cpp
similarity index 100%
rename from dScripts/NpcWispServer.cpp
rename to dScripts/02_server/Map/AG/NpcWispServer.cpp
diff --git a/dScripts/NpcWispServer.h b/dScripts/02_server/Map/AG/NpcWispServer.h
similarity index 100%
rename from dScripts/NpcWispServer.h
rename to dScripts/02_server/Map/AG/NpcWispServer.h
diff --git a/dScripts/RemoveRentalGear.cpp b/dScripts/02_server/Map/AG/RemoveRentalGear.cpp
similarity index 100%
rename from dScripts/RemoveRentalGear.cpp
rename to dScripts/02_server/Map/AG/RemoveRentalGear.cpp
diff --git a/dScripts/RemoveRentalGear.h b/dScripts/02_server/Map/AG/RemoveRentalGear.h
similarity index 100%
rename from dScripts/RemoveRentalGear.h
rename to dScripts/02_server/Map/AG/RemoveRentalGear.h
diff --git a/dScripts/02_server/Map/AG_Spider_Queen/CMakeLists.txt b/dScripts/02_server/Map/AG_Spider_Queen/CMakeLists.txt
new file mode 100644
index 00000000..f4204c13
--- /dev/null
+++ b/dScripts/02_server/Map/AG_Spider_Queen/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_AG_SPIDER_QUEEN 
+	"ZoneAgSpiderQueen.cpp"
+	"SpiderBossTreasureChestServer.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/SpiderBossTreasureChestServer.cpp b/dScripts/02_server/Map/AG_Spider_Queen/SpiderBossTreasureChestServer.cpp
similarity index 100%
rename from dScripts/SpiderBossTreasureChestServer.cpp
rename to dScripts/02_server/Map/AG_Spider_Queen/SpiderBossTreasureChestServer.cpp
diff --git a/dScripts/SpiderBossTreasureChestServer.h b/dScripts/02_server/Map/AG_Spider_Queen/SpiderBossTreasureChestServer.h
similarity index 100%
rename from dScripts/SpiderBossTreasureChestServer.h
rename to dScripts/02_server/Map/AG_Spider_Queen/SpiderBossTreasureChestServer.h
diff --git a/dScripts/ZoneAgSpiderQueen.cpp b/dScripts/02_server/Map/AG_Spider_Queen/ZoneAgSpiderQueen.cpp
similarity index 100%
rename from dScripts/ZoneAgSpiderQueen.cpp
rename to dScripts/02_server/Map/AG_Spider_Queen/ZoneAgSpiderQueen.cpp
diff --git a/dScripts/ZoneAgSpiderQueen.h b/dScripts/02_server/Map/AG_Spider_Queen/ZoneAgSpiderQueen.h
similarity index 100%
rename from dScripts/ZoneAgSpiderQueen.h
rename to dScripts/02_server/Map/AG_Spider_Queen/ZoneAgSpiderQueen.h
diff --git a/dScripts/AmBlueX.cpp b/dScripts/02_server/Map/AM/AmBlueX.cpp
similarity index 100%
rename from dScripts/AmBlueX.cpp
rename to dScripts/02_server/Map/AM/AmBlueX.cpp
diff --git a/dScripts/AmBlueX.h b/dScripts/02_server/Map/AM/AmBlueX.h
similarity index 100%
rename from dScripts/AmBlueX.h
rename to dScripts/02_server/Map/AM/AmBlueX.h
diff --git a/dScripts/AmBridge.cpp b/dScripts/02_server/Map/AM/AmBridge.cpp
similarity index 100%
rename from dScripts/AmBridge.cpp
rename to dScripts/02_server/Map/AM/AmBridge.cpp
diff --git a/dScripts/AmBridge.h b/dScripts/02_server/Map/AM/AmBridge.h
similarity index 100%
rename from dScripts/AmBridge.h
rename to dScripts/02_server/Map/AM/AmBridge.h
diff --git a/dScripts/AmConsoleTeleportServer.cpp b/dScripts/02_server/Map/AM/AmConsoleTeleportServer.cpp
similarity index 100%
rename from dScripts/AmConsoleTeleportServer.cpp
rename to dScripts/02_server/Map/AM/AmConsoleTeleportServer.cpp
diff --git a/dScripts/AmConsoleTeleportServer.h b/dScripts/02_server/Map/AM/AmConsoleTeleportServer.h
similarity index 100%
rename from dScripts/AmConsoleTeleportServer.h
rename to dScripts/02_server/Map/AM/AmConsoleTeleportServer.h
diff --git a/dScripts/AmDrawBridge.cpp b/dScripts/02_server/Map/AM/AmDrawBridge.cpp
similarity index 100%
rename from dScripts/AmDrawBridge.cpp
rename to dScripts/02_server/Map/AM/AmDrawBridge.cpp
diff --git a/dScripts/AmDrawBridge.h b/dScripts/02_server/Map/AM/AmDrawBridge.h
similarity index 100%
rename from dScripts/AmDrawBridge.h
rename to dScripts/02_server/Map/AM/AmDrawBridge.h
diff --git a/dScripts/AmDropshipComputer.cpp b/dScripts/02_server/Map/AM/AmDropshipComputer.cpp
similarity index 100%
rename from dScripts/AmDropshipComputer.cpp
rename to dScripts/02_server/Map/AM/AmDropshipComputer.cpp
diff --git a/dScripts/AmDropshipComputer.h b/dScripts/02_server/Map/AM/AmDropshipComputer.h
similarity index 100%
rename from dScripts/AmDropshipComputer.h
rename to dScripts/02_server/Map/AM/AmDropshipComputer.h
diff --git a/dScripts/AmScrollReaderServer.cpp b/dScripts/02_server/Map/AM/AmScrollReaderServer.cpp
similarity index 100%
rename from dScripts/AmScrollReaderServer.cpp
rename to dScripts/02_server/Map/AM/AmScrollReaderServer.cpp
diff --git a/dScripts/AmScrollReaderServer.h b/dScripts/02_server/Map/AM/AmScrollReaderServer.h
similarity index 100%
rename from dScripts/AmScrollReaderServer.h
rename to dScripts/02_server/Map/AM/AmScrollReaderServer.h
diff --git a/dScripts/AmShieldGenerator.cpp b/dScripts/02_server/Map/AM/AmShieldGenerator.cpp
similarity index 100%
rename from dScripts/AmShieldGenerator.cpp
rename to dScripts/02_server/Map/AM/AmShieldGenerator.cpp
diff --git a/dScripts/AmShieldGenerator.h b/dScripts/02_server/Map/AM/AmShieldGenerator.h
similarity index 100%
rename from dScripts/AmShieldGenerator.h
rename to dScripts/02_server/Map/AM/AmShieldGenerator.h
diff --git a/dScripts/AmShieldGeneratorQuickbuild.cpp b/dScripts/02_server/Map/AM/AmShieldGeneratorQuickbuild.cpp
similarity index 100%
rename from dScripts/AmShieldGeneratorQuickbuild.cpp
rename to dScripts/02_server/Map/AM/AmShieldGeneratorQuickbuild.cpp
diff --git a/dScripts/AmShieldGeneratorQuickbuild.h b/dScripts/02_server/Map/AM/AmShieldGeneratorQuickbuild.h
similarity index 100%
rename from dScripts/AmShieldGeneratorQuickbuild.h
rename to dScripts/02_server/Map/AM/AmShieldGeneratorQuickbuild.h
diff --git a/dScripts/AmSkullkinDrill.cpp b/dScripts/02_server/Map/AM/AmSkullkinDrill.cpp
similarity index 100%
rename from dScripts/AmSkullkinDrill.cpp
rename to dScripts/02_server/Map/AM/AmSkullkinDrill.cpp
diff --git a/dScripts/AmSkullkinDrill.h b/dScripts/02_server/Map/AM/AmSkullkinDrill.h
similarity index 100%
rename from dScripts/AmSkullkinDrill.h
rename to dScripts/02_server/Map/AM/AmSkullkinDrill.h
diff --git a/dScripts/AmSkullkinDrillStand.cpp b/dScripts/02_server/Map/AM/AmSkullkinDrillStand.cpp
similarity index 100%
rename from dScripts/AmSkullkinDrillStand.cpp
rename to dScripts/02_server/Map/AM/AmSkullkinDrillStand.cpp
diff --git a/dScripts/AmSkullkinDrillStand.h b/dScripts/02_server/Map/AM/AmSkullkinDrillStand.h
similarity index 100%
rename from dScripts/AmSkullkinDrillStand.h
rename to dScripts/02_server/Map/AM/AmSkullkinDrillStand.h
diff --git a/dScripts/AmSkullkinTower.cpp b/dScripts/02_server/Map/AM/AmSkullkinTower.cpp
similarity index 100%
rename from dScripts/AmSkullkinTower.cpp
rename to dScripts/02_server/Map/AM/AmSkullkinTower.cpp
diff --git a/dScripts/AmSkullkinTower.h b/dScripts/02_server/Map/AM/AmSkullkinTower.h
similarity index 100%
rename from dScripts/AmSkullkinTower.h
rename to dScripts/02_server/Map/AM/AmSkullkinTower.h
diff --git a/dScripts/AmTeapotServer.cpp b/dScripts/02_server/Map/AM/AmTeapotServer.cpp
similarity index 100%
rename from dScripts/AmTeapotServer.cpp
rename to dScripts/02_server/Map/AM/AmTeapotServer.cpp
diff --git a/dScripts/AmTeapotServer.h b/dScripts/02_server/Map/AM/AmTeapotServer.h
similarity index 100%
rename from dScripts/AmTeapotServer.h
rename to dScripts/02_server/Map/AM/AmTeapotServer.h
diff --git a/dScripts/AmTemplateSkillVolume.cpp b/dScripts/02_server/Map/AM/AmTemplateSkillVolume.cpp
similarity index 100%
rename from dScripts/AmTemplateSkillVolume.cpp
rename to dScripts/02_server/Map/AM/AmTemplateSkillVolume.cpp
diff --git a/dScripts/AmTemplateSkillVolume.h b/dScripts/02_server/Map/AM/AmTemplateSkillVolume.h
similarity index 100%
rename from dScripts/AmTemplateSkillVolume.h
rename to dScripts/02_server/Map/AM/AmTemplateSkillVolume.h
diff --git a/dScripts/02_server/Map/AM/CMakeLists.txt b/dScripts/02_server/Map/AM/CMakeLists.txt
new file mode 100644
index 00000000..d3d13b73
--- /dev/null
+++ b/dScripts/02_server/Map/AM/CMakeLists.txt
@@ -0,0 +1,19 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_AM 
+	"AmConsoleTeleportServer.cpp"
+	"RandomSpawnerFin.cpp"
+	"RandomSpawnerPit.cpp"
+	"RandomSpawnerStr.cpp"
+	"RandomSpawnerZip.cpp"
+	"AmBridge.cpp"
+	"AmDrawBridge.cpp"
+	"AmShieldGenerator.cpp"
+	"AmShieldGeneratorQuickbuild.cpp"
+	"AmDropshipComputer.cpp"
+	"AmScrollReaderServer.cpp"
+	"AmTemplateSkillVolume.cpp"
+	"AmSkullkinDrill.cpp"
+	"AmSkullkinDrillStand.cpp"
+	"AmSkullkinTower.cpp"
+	"AmBlueX.cpp"
+	"AmTeapotServer.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/RandomSpawnerFin.cpp b/dScripts/02_server/Map/AM/RandomSpawnerFin.cpp
similarity index 100%
rename from dScripts/RandomSpawnerFin.cpp
rename to dScripts/02_server/Map/AM/RandomSpawnerFin.cpp
diff --git a/dScripts/RandomSpawnerFin.h b/dScripts/02_server/Map/AM/RandomSpawnerFin.h
similarity index 100%
rename from dScripts/RandomSpawnerFin.h
rename to dScripts/02_server/Map/AM/RandomSpawnerFin.h
diff --git a/dScripts/RandomSpawnerPit.cpp b/dScripts/02_server/Map/AM/RandomSpawnerPit.cpp
similarity index 100%
rename from dScripts/RandomSpawnerPit.cpp
rename to dScripts/02_server/Map/AM/RandomSpawnerPit.cpp
diff --git a/dScripts/RandomSpawnerPit.h b/dScripts/02_server/Map/AM/RandomSpawnerPit.h
similarity index 100%
rename from dScripts/RandomSpawnerPit.h
rename to dScripts/02_server/Map/AM/RandomSpawnerPit.h
diff --git a/dScripts/RandomSpawnerStr.cpp b/dScripts/02_server/Map/AM/RandomSpawnerStr.cpp
similarity index 100%
rename from dScripts/RandomSpawnerStr.cpp
rename to dScripts/02_server/Map/AM/RandomSpawnerStr.cpp
diff --git a/dScripts/RandomSpawnerStr.h b/dScripts/02_server/Map/AM/RandomSpawnerStr.h
similarity index 100%
rename from dScripts/RandomSpawnerStr.h
rename to dScripts/02_server/Map/AM/RandomSpawnerStr.h
diff --git a/dScripts/RandomSpawnerZip.cpp b/dScripts/02_server/Map/AM/RandomSpawnerZip.cpp
similarity index 100%
rename from dScripts/RandomSpawnerZip.cpp
rename to dScripts/02_server/Map/AM/RandomSpawnerZip.cpp
diff --git a/dScripts/RandomSpawnerZip.h b/dScripts/02_server/Map/AM/RandomSpawnerZip.h
similarity index 100%
rename from dScripts/RandomSpawnerZip.h
rename to dScripts/02_server/Map/AM/RandomSpawnerZip.h
diff --git a/dScripts/02_server/Map/CMakeLists.txt b/dScripts/02_server/Map/CMakeLists.txt
new file mode 100644
index 00000000..feed8a97
--- /dev/null
+++ b/dScripts/02_server/Map/CMakeLists.txt
@@ -0,0 +1,81 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP)
+
+add_subdirectory(AG)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_AG})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "AG/${file}")
+endforeach()
+
+add_subdirectory(AG_Spider_Queen)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_AG_SPIDER_QUEEN})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "AG_Spider_Queen/${file}")
+endforeach()
+
+add_subdirectory(AM)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_AM})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "AM/${file}")
+endforeach()
+
+add_subdirectory(FV)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_FV})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "FV/${file}")
+endforeach()
+
+add_subdirectory(General)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "General/${file}")
+endforeach()
+
+add_subdirectory(GF)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_GF})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "GF/${file}")
+endforeach()
+
+add_subdirectory(njhub)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_NJHUB})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "njhub/${file}")
+endforeach()
+
+add_subdirectory(NS)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_NS})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "NS/${file}")
+endforeach()
+
+add_subdirectory(NT)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_NT})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "NT/${file}")
+endforeach()
+
+add_subdirectory(PR)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_PR})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "PR/${file}")
+endforeach()
+
+add_subdirectory(Property)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "Property/${file}")
+endforeach()
+
+add_subdirectory(SS)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_SS})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "SS/${file}")
+endforeach()
+
+add_subdirectory(VE)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_VE})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} "VE/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_02_SERVER_MAP ${DSCRIPTS_SOURCES_02_SERVER_MAP} PARENT_SCOPE)
diff --git a/dScripts/02_server/Map/FV/CMakeLists.txt b/dScripts/02_server/Map/FV/CMakeLists.txt
new file mode 100644
index 00000000..505d97c4
--- /dev/null
+++ b/dScripts/02_server/Map/FV/CMakeLists.txt
@@ -0,0 +1,14 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_FV
+	"EnemyRoninSpawner.cpp"
+	"FvCandle.cpp"
+	"FvFong.cpp"
+	"FvHorsemenTrigger.cpp"
+	"ImgBrickConsoleQB.cpp")
+
+add_subdirectory(Racing)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_FV_RACING})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP_FV ${DSCRIPTS_SOURCES_02_SERVER_MAP_FV} "Racing/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_FV ${DSCRIPTS_SOURCES_02_SERVER_MAP_FV} PARENT_SCOPE)
diff --git a/dScripts/EnemyRoninSpawner.cpp b/dScripts/02_server/Map/FV/EnemyRoninSpawner.cpp
similarity index 100%
rename from dScripts/EnemyRoninSpawner.cpp
rename to dScripts/02_server/Map/FV/EnemyRoninSpawner.cpp
diff --git a/dScripts/EnemyRoninSpawner.h b/dScripts/02_server/Map/FV/EnemyRoninSpawner.h
similarity index 100%
rename from dScripts/EnemyRoninSpawner.h
rename to dScripts/02_server/Map/FV/EnemyRoninSpawner.h
diff --git a/dScripts/FvCandle.cpp b/dScripts/02_server/Map/FV/FvCandle.cpp
similarity index 100%
rename from dScripts/FvCandle.cpp
rename to dScripts/02_server/Map/FV/FvCandle.cpp
diff --git a/dScripts/FvCandle.h b/dScripts/02_server/Map/FV/FvCandle.h
similarity index 100%
rename from dScripts/FvCandle.h
rename to dScripts/02_server/Map/FV/FvCandle.h
diff --git a/dScripts/FvFong.cpp b/dScripts/02_server/Map/FV/FvFong.cpp
similarity index 100%
rename from dScripts/FvFong.cpp
rename to dScripts/02_server/Map/FV/FvFong.cpp
diff --git a/dScripts/FvFong.h b/dScripts/02_server/Map/FV/FvFong.h
similarity index 100%
rename from dScripts/FvFong.h
rename to dScripts/02_server/Map/FV/FvFong.h
diff --git a/dScripts/FvHorsemenTrigger.cpp b/dScripts/02_server/Map/FV/FvHorsemenTrigger.cpp
similarity index 100%
rename from dScripts/FvHorsemenTrigger.cpp
rename to dScripts/02_server/Map/FV/FvHorsemenTrigger.cpp
diff --git a/dScripts/FvHorsemenTrigger.h b/dScripts/02_server/Map/FV/FvHorsemenTrigger.h
similarity index 100%
rename from dScripts/FvHorsemenTrigger.h
rename to dScripts/02_server/Map/FV/FvHorsemenTrigger.h
diff --git a/dScripts/ImgBrickConsoleQB.cpp b/dScripts/02_server/Map/FV/ImgBrickConsoleQB.cpp
similarity index 100%
rename from dScripts/ImgBrickConsoleQB.cpp
rename to dScripts/02_server/Map/FV/ImgBrickConsoleQB.cpp
diff --git a/dScripts/ImgBrickConsoleQB.h b/dScripts/02_server/Map/FV/ImgBrickConsoleQB.h
similarity index 100%
rename from dScripts/ImgBrickConsoleQB.h
rename to dScripts/02_server/Map/FV/ImgBrickConsoleQB.h
diff --git a/dScripts/02_server/Map/FV/Racing/CMakeLists.txt b/dScripts/02_server/Map/FV/Racing/CMakeLists.txt
new file mode 100644
index 00000000..89536b67
--- /dev/null
+++ b/dScripts/02_server/Map/FV/Racing/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_FV_RACING 
+	"RaceMaelstromGeiser.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/RaceMaelstromGeiser.cpp b/dScripts/02_server/Map/FV/Racing/RaceMaelstromGeiser.cpp
similarity index 100%
rename from dScripts/RaceMaelstromGeiser.cpp
rename to dScripts/02_server/Map/FV/Racing/RaceMaelstromGeiser.cpp
diff --git a/dScripts/RaceMaelstromGeiser.h b/dScripts/02_server/Map/FV/Racing/RaceMaelstromGeiser.h
similarity index 100%
rename from dScripts/RaceMaelstromGeiser.h
rename to dScripts/02_server/Map/FV/Racing/RaceMaelstromGeiser.h
diff --git a/dScripts/02_server/Map/GF/CMakeLists.txt b/dScripts/02_server/Map/GF/CMakeLists.txt
new file mode 100644
index 00000000..90cc38a5
--- /dev/null
+++ b/dScripts/02_server/Map/GF/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_GF 
+	"GfTikiTorch.cpp"
+	"GfCaptainsCannon.cpp"
+	"MastTeleport.cpp"
+	"SpawnLionServer.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/GfCaptainsCannon.cpp b/dScripts/02_server/Map/GF/GfCaptainsCannon.cpp
similarity index 100%
rename from dScripts/GfCaptainsCannon.cpp
rename to dScripts/02_server/Map/GF/GfCaptainsCannon.cpp
diff --git a/dScripts/GfCaptainsCannon.h b/dScripts/02_server/Map/GF/GfCaptainsCannon.h
similarity index 100%
rename from dScripts/GfCaptainsCannon.h
rename to dScripts/02_server/Map/GF/GfCaptainsCannon.h
diff --git a/dScripts/GfTikiTorch.cpp b/dScripts/02_server/Map/GF/GfTikiTorch.cpp
similarity index 100%
rename from dScripts/GfTikiTorch.cpp
rename to dScripts/02_server/Map/GF/GfTikiTorch.cpp
diff --git a/dScripts/GfTikiTorch.h b/dScripts/02_server/Map/GF/GfTikiTorch.h
similarity index 100%
rename from dScripts/GfTikiTorch.h
rename to dScripts/02_server/Map/GF/GfTikiTorch.h
diff --git a/dScripts/MastTeleport.cpp b/dScripts/02_server/Map/GF/MastTeleport.cpp
similarity index 100%
rename from dScripts/MastTeleport.cpp
rename to dScripts/02_server/Map/GF/MastTeleport.cpp
diff --git a/dScripts/MastTeleport.h b/dScripts/02_server/Map/GF/MastTeleport.h
similarity index 100%
rename from dScripts/MastTeleport.h
rename to dScripts/02_server/Map/GF/MastTeleport.h
diff --git a/dScripts/SpawnLionServer.cpp b/dScripts/02_server/Map/GF/SpawnLionServer.cpp
similarity index 100%
rename from dScripts/SpawnLionServer.cpp
rename to dScripts/02_server/Map/GF/SpawnLionServer.cpp
diff --git a/dScripts/SpawnLionServer.h b/dScripts/02_server/Map/GF/SpawnLionServer.h
similarity index 100%
rename from dScripts/SpawnLionServer.h
rename to dScripts/02_server/Map/GF/SpawnLionServer.h
diff --git a/dScripts/BankInteractServer.cpp b/dScripts/02_server/Map/General/BankInteractServer.cpp
similarity index 100%
rename from dScripts/BankInteractServer.cpp
rename to dScripts/02_server/Map/General/BankInteractServer.cpp
diff --git a/dScripts/BankInteractServer.h b/dScripts/02_server/Map/General/BankInteractServer.h
similarity index 100%
rename from dScripts/BankInteractServer.h
rename to dScripts/02_server/Map/General/BankInteractServer.h
diff --git a/dScripts/BaseInteractDropLootServer.cpp b/dScripts/02_server/Map/General/BaseInteractDropLootServer.cpp
similarity index 100%
rename from dScripts/BaseInteractDropLootServer.cpp
rename to dScripts/02_server/Map/General/BaseInteractDropLootServer.cpp
diff --git a/dScripts/BaseInteractDropLootServer.h b/dScripts/02_server/Map/General/BaseInteractDropLootServer.h
similarity index 100%
rename from dScripts/BaseInteractDropLootServer.h
rename to dScripts/02_server/Map/General/BaseInteractDropLootServer.h
diff --git a/dScripts/Binoculars.cpp b/dScripts/02_server/Map/General/Binoculars.cpp
similarity index 100%
rename from dScripts/Binoculars.cpp
rename to dScripts/02_server/Map/General/Binoculars.cpp
diff --git a/dScripts/Binoculars.h b/dScripts/02_server/Map/General/Binoculars.h
similarity index 100%
rename from dScripts/Binoculars.h
rename to dScripts/02_server/Map/General/Binoculars.h
diff --git a/dScripts/02_server/Map/General/CMakeLists.txt b/dScripts/02_server/Map/General/CMakeLists.txt
new file mode 100644
index 00000000..1fe3d785
--- /dev/null
+++ b/dScripts/02_server/Map/General/CMakeLists.txt
@@ -0,0 +1,28 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL
+	"BankInteractServer.cpp"
+	"BaseInteractDropLootServer.cpp"
+	"Binoculars.cpp"
+	"ExplodingAsset.cpp"
+	"ForceVolumeServer.cpp"
+	"GrowingFlower.cpp"
+	"ImaginationBackpackHealServer.cpp"
+	"InvalidScript.cpp"
+	"MailBoxServer.cpp"
+	"NjRailSwitch.cpp"
+	"PetDigServer.cpp"
+	"PropertyDevice.cpp"
+	"PropertyPlatform.cpp"
+	"QbEnemyStunner.cpp"
+	"QbSpawner.cpp"
+	"StoryBoxInteractServer.cpp"
+	"TokenConsoleServer.cpp"
+	"TouchMissionUpdateServer.cpp"
+	"WishingWellServer.cpp")
+
+add_subdirectory(Ninjago)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL_NINJAGO})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL ${DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL} "Ninjago/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL ${DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL} PARENT_SCOPE)
diff --git a/dScripts/ExplodingAsset.cpp b/dScripts/02_server/Map/General/ExplodingAsset.cpp
similarity index 100%
rename from dScripts/ExplodingAsset.cpp
rename to dScripts/02_server/Map/General/ExplodingAsset.cpp
diff --git a/dScripts/ExplodingAsset.h b/dScripts/02_server/Map/General/ExplodingAsset.h
similarity index 100%
rename from dScripts/ExplodingAsset.h
rename to dScripts/02_server/Map/General/ExplodingAsset.h
diff --git a/dScripts/ForceVolumeServer.cpp b/dScripts/02_server/Map/General/ForceVolumeServer.cpp
similarity index 100%
rename from dScripts/ForceVolumeServer.cpp
rename to dScripts/02_server/Map/General/ForceVolumeServer.cpp
diff --git a/dScripts/ForceVolumeServer.h b/dScripts/02_server/Map/General/ForceVolumeServer.h
similarity index 100%
rename from dScripts/ForceVolumeServer.h
rename to dScripts/02_server/Map/General/ForceVolumeServer.h
diff --git a/dScripts/GrowingFlower.cpp b/dScripts/02_server/Map/General/GrowingFlower.cpp
similarity index 100%
rename from dScripts/GrowingFlower.cpp
rename to dScripts/02_server/Map/General/GrowingFlower.cpp
diff --git a/dScripts/GrowingFlower.h b/dScripts/02_server/Map/General/GrowingFlower.h
similarity index 100%
rename from dScripts/GrowingFlower.h
rename to dScripts/02_server/Map/General/GrowingFlower.h
diff --git a/dScripts/ImaginationBackpackHealServer.cpp b/dScripts/02_server/Map/General/ImaginationBackpackHealServer.cpp
similarity index 100%
rename from dScripts/ImaginationBackpackHealServer.cpp
rename to dScripts/02_server/Map/General/ImaginationBackpackHealServer.cpp
diff --git a/dScripts/ImaginationBackpackHealServer.h b/dScripts/02_server/Map/General/ImaginationBackpackHealServer.h
similarity index 100%
rename from dScripts/ImaginationBackpackHealServer.h
rename to dScripts/02_server/Map/General/ImaginationBackpackHealServer.h
diff --git a/dScripts/InvalidScript.cpp b/dScripts/02_server/Map/General/InvalidScript.cpp
similarity index 100%
rename from dScripts/InvalidScript.cpp
rename to dScripts/02_server/Map/General/InvalidScript.cpp
diff --git a/dScripts/InvalidScript.h b/dScripts/02_server/Map/General/InvalidScript.h
similarity index 100%
rename from dScripts/InvalidScript.h
rename to dScripts/02_server/Map/General/InvalidScript.h
diff --git a/dScripts/MailBoxServer.cpp b/dScripts/02_server/Map/General/MailBoxServer.cpp
similarity index 100%
rename from dScripts/MailBoxServer.cpp
rename to dScripts/02_server/Map/General/MailBoxServer.cpp
diff --git a/dScripts/MailBoxServer.h b/dScripts/02_server/Map/General/MailBoxServer.h
similarity index 100%
rename from dScripts/MailBoxServer.h
rename to dScripts/02_server/Map/General/MailBoxServer.h
diff --git a/dScripts/02_server/Map/General/Ninjago/CMakeLists.txt b/dScripts/02_server/Map/General/Ninjago/CMakeLists.txt
new file mode 100644
index 00000000..2b74e921
--- /dev/null
+++ b/dScripts/02_server/Map/General/Ninjago/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL_NINJAGO 
+	"NjRailActivatorsServer.cpp"
+	"NjRailPostServer.cpp"
+	"NjIceRailActivator.cpp"
+	"NjhubLavaPlayerDeathTrigger.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/NjIceRailActivator.cpp b/dScripts/02_server/Map/General/Ninjago/NjIceRailActivator.cpp
similarity index 100%
rename from dScripts/NjIceRailActivator.cpp
rename to dScripts/02_server/Map/General/Ninjago/NjIceRailActivator.cpp
diff --git a/dScripts/NjIceRailActivator.h b/dScripts/02_server/Map/General/Ninjago/NjIceRailActivator.h
similarity index 100%
rename from dScripts/NjIceRailActivator.h
rename to dScripts/02_server/Map/General/Ninjago/NjIceRailActivator.h
diff --git a/dScripts/NjRailActivatorsServer.cpp b/dScripts/02_server/Map/General/Ninjago/NjRailActivatorsServer.cpp
similarity index 100%
rename from dScripts/NjRailActivatorsServer.cpp
rename to dScripts/02_server/Map/General/Ninjago/NjRailActivatorsServer.cpp
diff --git a/dScripts/NjRailActivatorsServer.h b/dScripts/02_server/Map/General/Ninjago/NjRailActivatorsServer.h
similarity index 100%
rename from dScripts/NjRailActivatorsServer.h
rename to dScripts/02_server/Map/General/Ninjago/NjRailActivatorsServer.h
diff --git a/dScripts/NjRailPostServer.cpp b/dScripts/02_server/Map/General/Ninjago/NjRailPostServer.cpp
similarity index 100%
rename from dScripts/NjRailPostServer.cpp
rename to dScripts/02_server/Map/General/Ninjago/NjRailPostServer.cpp
diff --git a/dScripts/NjRailPostServer.h b/dScripts/02_server/Map/General/Ninjago/NjRailPostServer.h
similarity index 100%
rename from dScripts/NjRailPostServer.h
rename to dScripts/02_server/Map/General/Ninjago/NjRailPostServer.h
diff --git a/dScripts/NjhubLavaPlayerDeathTrigger.cpp b/dScripts/02_server/Map/General/Ninjago/NjhubLavaPlayerDeathTrigger.cpp
similarity index 100%
rename from dScripts/NjhubLavaPlayerDeathTrigger.cpp
rename to dScripts/02_server/Map/General/Ninjago/NjhubLavaPlayerDeathTrigger.cpp
diff --git a/dScripts/NjhubLavaPlayerDeathTrigger.h b/dScripts/02_server/Map/General/Ninjago/NjhubLavaPlayerDeathTrigger.h
similarity index 100%
rename from dScripts/NjhubLavaPlayerDeathTrigger.h
rename to dScripts/02_server/Map/General/Ninjago/NjhubLavaPlayerDeathTrigger.h
diff --git a/dScripts/NjRailSwitch.cpp b/dScripts/02_server/Map/General/NjRailSwitch.cpp
similarity index 100%
rename from dScripts/NjRailSwitch.cpp
rename to dScripts/02_server/Map/General/NjRailSwitch.cpp
diff --git a/dScripts/NjRailSwitch.h b/dScripts/02_server/Map/General/NjRailSwitch.h
similarity index 100%
rename from dScripts/NjRailSwitch.h
rename to dScripts/02_server/Map/General/NjRailSwitch.h
diff --git a/dScripts/PetDigServer.cpp b/dScripts/02_server/Map/General/PetDigServer.cpp
similarity index 100%
rename from dScripts/PetDigServer.cpp
rename to dScripts/02_server/Map/General/PetDigServer.cpp
diff --git a/dScripts/PetDigServer.h b/dScripts/02_server/Map/General/PetDigServer.h
similarity index 100%
rename from dScripts/PetDigServer.h
rename to dScripts/02_server/Map/General/PetDigServer.h
diff --git a/dScripts/PropertyDevice.cpp b/dScripts/02_server/Map/General/PropertyDevice.cpp
similarity index 100%
rename from dScripts/PropertyDevice.cpp
rename to dScripts/02_server/Map/General/PropertyDevice.cpp
diff --git a/dScripts/PropertyDevice.h b/dScripts/02_server/Map/General/PropertyDevice.h
similarity index 100%
rename from dScripts/PropertyDevice.h
rename to dScripts/02_server/Map/General/PropertyDevice.h
diff --git a/dScripts/PropertyPlatform.cpp b/dScripts/02_server/Map/General/PropertyPlatform.cpp
similarity index 100%
rename from dScripts/PropertyPlatform.cpp
rename to dScripts/02_server/Map/General/PropertyPlatform.cpp
diff --git a/dScripts/PropertyPlatform.h b/dScripts/02_server/Map/General/PropertyPlatform.h
similarity index 100%
rename from dScripts/PropertyPlatform.h
rename to dScripts/02_server/Map/General/PropertyPlatform.h
diff --git a/dScripts/QbEnemyStunner.cpp b/dScripts/02_server/Map/General/QbEnemyStunner.cpp
similarity index 100%
rename from dScripts/QbEnemyStunner.cpp
rename to dScripts/02_server/Map/General/QbEnemyStunner.cpp
diff --git a/dScripts/QbEnemyStunner.h b/dScripts/02_server/Map/General/QbEnemyStunner.h
similarity index 100%
rename from dScripts/QbEnemyStunner.h
rename to dScripts/02_server/Map/General/QbEnemyStunner.h
diff --git a/dScripts/QbSpawner.cpp b/dScripts/02_server/Map/General/QbSpawner.cpp
similarity index 100%
rename from dScripts/QbSpawner.cpp
rename to dScripts/02_server/Map/General/QbSpawner.cpp
diff --git a/dScripts/QbSpawner.h b/dScripts/02_server/Map/General/QbSpawner.h
similarity index 100%
rename from dScripts/QbSpawner.h
rename to dScripts/02_server/Map/General/QbSpawner.h
diff --git a/dScripts/StoryBoxInteractServer.cpp b/dScripts/02_server/Map/General/StoryBoxInteractServer.cpp
similarity index 100%
rename from dScripts/StoryBoxInteractServer.cpp
rename to dScripts/02_server/Map/General/StoryBoxInteractServer.cpp
diff --git a/dScripts/StoryBoxInteractServer.h b/dScripts/02_server/Map/General/StoryBoxInteractServer.h
similarity index 100%
rename from dScripts/StoryBoxInteractServer.h
rename to dScripts/02_server/Map/General/StoryBoxInteractServer.h
diff --git a/dScripts/TokenConsoleServer.cpp b/dScripts/02_server/Map/General/TokenConsoleServer.cpp
similarity index 100%
rename from dScripts/TokenConsoleServer.cpp
rename to dScripts/02_server/Map/General/TokenConsoleServer.cpp
diff --git a/dScripts/TokenConsoleServer.h b/dScripts/02_server/Map/General/TokenConsoleServer.h
similarity index 100%
rename from dScripts/TokenConsoleServer.h
rename to dScripts/02_server/Map/General/TokenConsoleServer.h
diff --git a/dScripts/TouchMissionUpdateServer.cpp b/dScripts/02_server/Map/General/TouchMissionUpdateServer.cpp
similarity index 100%
rename from dScripts/TouchMissionUpdateServer.cpp
rename to dScripts/02_server/Map/General/TouchMissionUpdateServer.cpp
diff --git a/dScripts/TouchMissionUpdateServer.h b/dScripts/02_server/Map/General/TouchMissionUpdateServer.h
similarity index 100%
rename from dScripts/TouchMissionUpdateServer.h
rename to dScripts/02_server/Map/General/TouchMissionUpdateServer.h
diff --git a/dScripts/WishingWellServer.cpp b/dScripts/02_server/Map/General/WishingWellServer.cpp
similarity index 100%
rename from dScripts/WishingWellServer.cpp
rename to dScripts/02_server/Map/General/WishingWellServer.cpp
diff --git a/dScripts/WishingWellServer.h b/dScripts/02_server/Map/General/WishingWellServer.h
similarity index 100%
rename from dScripts/WishingWellServer.h
rename to dScripts/02_server/Map/General/WishingWellServer.h
diff --git a/dScripts/02_server/Map/NS/CMakeLists.txt b/dScripts/02_server/Map/NS/CMakeLists.txt
new file mode 100644
index 00000000..c815a8c5
--- /dev/null
+++ b/dScripts/02_server/Map/NS/CMakeLists.txt
@@ -0,0 +1,13 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_NS
+	"NsConcertChoiceBuildManager.cpp"
+	"NsLegoClubDoor.cpp"
+	"NsLupTeleport.cpp"
+	"NsTokenConsoleServer.cpp")
+
+add_subdirectory(Waves)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_NS_WAVES})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP_NS ${DSCRIPTS_SOURCES_02_SERVER_MAP_NS} "Waves/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_NS ${DSCRIPTS_SOURCES_02_SERVER_MAP_NS} PARENT_SCOPE)
diff --git a/dScripts/NsConcertChoiceBuildManager.cpp b/dScripts/02_server/Map/NS/NsConcertChoiceBuildManager.cpp
similarity index 100%
rename from dScripts/NsConcertChoiceBuildManager.cpp
rename to dScripts/02_server/Map/NS/NsConcertChoiceBuildManager.cpp
diff --git a/dScripts/NsConcertChoiceBuildManager.h b/dScripts/02_server/Map/NS/NsConcertChoiceBuildManager.h
similarity index 100%
rename from dScripts/NsConcertChoiceBuildManager.h
rename to dScripts/02_server/Map/NS/NsConcertChoiceBuildManager.h
diff --git a/dScripts/NsLegoClubDoor.cpp b/dScripts/02_server/Map/NS/NsLegoClubDoor.cpp
similarity index 100%
rename from dScripts/NsLegoClubDoor.cpp
rename to dScripts/02_server/Map/NS/NsLegoClubDoor.cpp
diff --git a/dScripts/NsLegoClubDoor.h b/dScripts/02_server/Map/NS/NsLegoClubDoor.h
similarity index 100%
rename from dScripts/NsLegoClubDoor.h
rename to dScripts/02_server/Map/NS/NsLegoClubDoor.h
diff --git a/dScripts/NsLupTeleport.cpp b/dScripts/02_server/Map/NS/NsLupTeleport.cpp
similarity index 100%
rename from dScripts/NsLupTeleport.cpp
rename to dScripts/02_server/Map/NS/NsLupTeleport.cpp
diff --git a/dScripts/NsLupTeleport.h b/dScripts/02_server/Map/NS/NsLupTeleport.h
similarity index 100%
rename from dScripts/NsLupTeleport.h
rename to dScripts/02_server/Map/NS/NsLupTeleport.h
diff --git a/dScripts/NsTokenConsoleServer.cpp b/dScripts/02_server/Map/NS/NsTokenConsoleServer.cpp
similarity index 100%
rename from dScripts/NsTokenConsoleServer.cpp
rename to dScripts/02_server/Map/NS/NsTokenConsoleServer.cpp
diff --git a/dScripts/NsTokenConsoleServer.h b/dScripts/02_server/Map/NS/NsTokenConsoleServer.h
similarity index 100%
rename from dScripts/NsTokenConsoleServer.h
rename to dScripts/02_server/Map/NS/NsTokenConsoleServer.h
diff --git a/dScripts/02_server/Map/NS/Waves/CMakeLists.txt b/dScripts/02_server/Map/NS/Waves/CMakeLists.txt
new file mode 100644
index 00000000..bb216ee9
--- /dev/null
+++ b/dScripts/02_server/Map/NS/Waves/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_NS_WAVES 
+	"ZoneNsWaves.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/ZoneNsWaves.cpp b/dScripts/02_server/Map/NS/Waves/ZoneNsWaves.cpp
similarity index 100%
rename from dScripts/ZoneNsWaves.cpp
rename to dScripts/02_server/Map/NS/Waves/ZoneNsWaves.cpp
diff --git a/dScripts/ZoneNsWaves.h b/dScripts/02_server/Map/NS/Waves/ZoneNsWaves.h
similarity index 100%
rename from dScripts/ZoneNsWaves.h
rename to dScripts/02_server/Map/NS/Waves/ZoneNsWaves.h
diff --git a/dScripts/02_server/Map/NT/CMakeLists.txt b/dScripts/02_server/Map/NT/CMakeLists.txt
new file mode 100644
index 00000000..ede9b003
--- /dev/null
+++ b/dScripts/02_server/Map/NT/CMakeLists.txt
@@ -0,0 +1,26 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_NT
+	"NtCombatChallengeDummy.cpp"
+	"NtCombatChallengeExplodingDummy.cpp"
+	"NtCombatChallengeServer.cpp"
+	"NtAssemblyTubeServer.cpp"
+	"NtParadoxPanelServer.cpp"
+	"NtImagBeamBuffer.cpp"
+	"NtBeamImaginationCollectors.cpp"
+	"NtDirtCloudServer.cpp"
+	"NtConsoleTeleportServer.cpp"
+	"SpawnStegoServer.cpp"
+	"SpawnSaberCatServer.cpp"
+	"SpawnShrakeServer.cpp"
+	"NtDukeServer.cpp"
+	"NtHaelServer.cpp"
+	"NtOverbuildServer.cpp"
+	"NtVandaServer.cpp"
+	"NtXRayServer.cpp"
+	"NtSleepingGuard.cpp"
+	"NtImagimeterVisibility.cpp"
+	"NtSentinelWalkwayServer.cpp"
+	"NtDarkitectRevealServer.cpp"
+	"NtParadoxTeleServer.cpp"
+	"NtVentureSpeedPadServer.cpp"
+	"NtVentureCannonServer.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/NtAssemblyTubeServer.cpp b/dScripts/02_server/Map/NT/NtAssemblyTubeServer.cpp
similarity index 100%
rename from dScripts/NtAssemblyTubeServer.cpp
rename to dScripts/02_server/Map/NT/NtAssemblyTubeServer.cpp
diff --git a/dScripts/NtAssemblyTubeServer.h b/dScripts/02_server/Map/NT/NtAssemblyTubeServer.h
similarity index 100%
rename from dScripts/NtAssemblyTubeServer.h
rename to dScripts/02_server/Map/NT/NtAssemblyTubeServer.h
diff --git a/dScripts/NtBeamImaginationCollectors.cpp b/dScripts/02_server/Map/NT/NtBeamImaginationCollectors.cpp
similarity index 100%
rename from dScripts/NtBeamImaginationCollectors.cpp
rename to dScripts/02_server/Map/NT/NtBeamImaginationCollectors.cpp
diff --git a/dScripts/NtBeamImaginationCollectors.h b/dScripts/02_server/Map/NT/NtBeamImaginationCollectors.h
similarity index 100%
rename from dScripts/NtBeamImaginationCollectors.h
rename to dScripts/02_server/Map/NT/NtBeamImaginationCollectors.h
diff --git a/dScripts/NtCombatChallengeDummy.cpp b/dScripts/02_server/Map/NT/NtCombatChallengeDummy.cpp
similarity index 100%
rename from dScripts/NtCombatChallengeDummy.cpp
rename to dScripts/02_server/Map/NT/NtCombatChallengeDummy.cpp
diff --git a/dScripts/NtCombatChallengeDummy.h b/dScripts/02_server/Map/NT/NtCombatChallengeDummy.h
similarity index 100%
rename from dScripts/NtCombatChallengeDummy.h
rename to dScripts/02_server/Map/NT/NtCombatChallengeDummy.h
diff --git a/dScripts/NtCombatChallengeExplodingDummy.cpp b/dScripts/02_server/Map/NT/NtCombatChallengeExplodingDummy.cpp
similarity index 100%
rename from dScripts/NtCombatChallengeExplodingDummy.cpp
rename to dScripts/02_server/Map/NT/NtCombatChallengeExplodingDummy.cpp
diff --git a/dScripts/NtCombatChallengeExplodingDummy.h b/dScripts/02_server/Map/NT/NtCombatChallengeExplodingDummy.h
similarity index 100%
rename from dScripts/NtCombatChallengeExplodingDummy.h
rename to dScripts/02_server/Map/NT/NtCombatChallengeExplodingDummy.h
diff --git a/dScripts/NtCombatChallengeServer.cpp b/dScripts/02_server/Map/NT/NtCombatChallengeServer.cpp
similarity index 100%
rename from dScripts/NtCombatChallengeServer.cpp
rename to dScripts/02_server/Map/NT/NtCombatChallengeServer.cpp
diff --git a/dScripts/NtCombatChallengeServer.h b/dScripts/02_server/Map/NT/NtCombatChallengeServer.h
similarity index 100%
rename from dScripts/NtCombatChallengeServer.h
rename to dScripts/02_server/Map/NT/NtCombatChallengeServer.h
diff --git a/dScripts/NtConsoleTeleportServer.cpp b/dScripts/02_server/Map/NT/NtConsoleTeleportServer.cpp
similarity index 100%
rename from dScripts/NtConsoleTeleportServer.cpp
rename to dScripts/02_server/Map/NT/NtConsoleTeleportServer.cpp
diff --git a/dScripts/NtConsoleTeleportServer.h b/dScripts/02_server/Map/NT/NtConsoleTeleportServer.h
similarity index 100%
rename from dScripts/NtConsoleTeleportServer.h
rename to dScripts/02_server/Map/NT/NtConsoleTeleportServer.h
diff --git a/dScripts/NtDarkitectRevealServer.cpp b/dScripts/02_server/Map/NT/NtDarkitectRevealServer.cpp
similarity index 100%
rename from dScripts/NtDarkitectRevealServer.cpp
rename to dScripts/02_server/Map/NT/NtDarkitectRevealServer.cpp
diff --git a/dScripts/NtDarkitectRevealServer.h b/dScripts/02_server/Map/NT/NtDarkitectRevealServer.h
similarity index 100%
rename from dScripts/NtDarkitectRevealServer.h
rename to dScripts/02_server/Map/NT/NtDarkitectRevealServer.h
diff --git a/dScripts/NtDirtCloudServer.cpp b/dScripts/02_server/Map/NT/NtDirtCloudServer.cpp
similarity index 100%
rename from dScripts/NtDirtCloudServer.cpp
rename to dScripts/02_server/Map/NT/NtDirtCloudServer.cpp
diff --git a/dScripts/NtDirtCloudServer.h b/dScripts/02_server/Map/NT/NtDirtCloudServer.h
similarity index 100%
rename from dScripts/NtDirtCloudServer.h
rename to dScripts/02_server/Map/NT/NtDirtCloudServer.h
diff --git a/dScripts/NtDukeServer.cpp b/dScripts/02_server/Map/NT/NtDukeServer.cpp
similarity index 100%
rename from dScripts/NtDukeServer.cpp
rename to dScripts/02_server/Map/NT/NtDukeServer.cpp
diff --git a/dScripts/NtDukeServer.h b/dScripts/02_server/Map/NT/NtDukeServer.h
similarity index 100%
rename from dScripts/NtDukeServer.h
rename to dScripts/02_server/Map/NT/NtDukeServer.h
diff --git a/dScripts/NtHaelServer.cpp b/dScripts/02_server/Map/NT/NtHaelServer.cpp
similarity index 100%
rename from dScripts/NtHaelServer.cpp
rename to dScripts/02_server/Map/NT/NtHaelServer.cpp
diff --git a/dScripts/NtHaelServer.h b/dScripts/02_server/Map/NT/NtHaelServer.h
similarity index 100%
rename from dScripts/NtHaelServer.h
rename to dScripts/02_server/Map/NT/NtHaelServer.h
diff --git a/dScripts/NtImagBeamBuffer.cpp b/dScripts/02_server/Map/NT/NtImagBeamBuffer.cpp
similarity index 100%
rename from dScripts/NtImagBeamBuffer.cpp
rename to dScripts/02_server/Map/NT/NtImagBeamBuffer.cpp
diff --git a/dScripts/NtImagBeamBuffer.h b/dScripts/02_server/Map/NT/NtImagBeamBuffer.h
similarity index 100%
rename from dScripts/NtImagBeamBuffer.h
rename to dScripts/02_server/Map/NT/NtImagBeamBuffer.h
diff --git a/dScripts/NtImagimeterVisibility.cpp b/dScripts/02_server/Map/NT/NtImagimeterVisibility.cpp
similarity index 100%
rename from dScripts/NtImagimeterVisibility.cpp
rename to dScripts/02_server/Map/NT/NtImagimeterVisibility.cpp
diff --git a/dScripts/NtImagimeterVisibility.h b/dScripts/02_server/Map/NT/NtImagimeterVisibility.h
similarity index 100%
rename from dScripts/NtImagimeterVisibility.h
rename to dScripts/02_server/Map/NT/NtImagimeterVisibility.h
diff --git a/dScripts/NtOverbuildServer.cpp b/dScripts/02_server/Map/NT/NtOverbuildServer.cpp
similarity index 100%
rename from dScripts/NtOverbuildServer.cpp
rename to dScripts/02_server/Map/NT/NtOverbuildServer.cpp
diff --git a/dScripts/NtOverbuildServer.h b/dScripts/02_server/Map/NT/NtOverbuildServer.h
similarity index 100%
rename from dScripts/NtOverbuildServer.h
rename to dScripts/02_server/Map/NT/NtOverbuildServer.h
diff --git a/dScripts/NtParadoxPanelServer.cpp b/dScripts/02_server/Map/NT/NtParadoxPanelServer.cpp
similarity index 100%
rename from dScripts/NtParadoxPanelServer.cpp
rename to dScripts/02_server/Map/NT/NtParadoxPanelServer.cpp
diff --git a/dScripts/NtParadoxPanelServer.h b/dScripts/02_server/Map/NT/NtParadoxPanelServer.h
similarity index 100%
rename from dScripts/NtParadoxPanelServer.h
rename to dScripts/02_server/Map/NT/NtParadoxPanelServer.h
diff --git a/dScripts/NtParadoxTeleServer.cpp b/dScripts/02_server/Map/NT/NtParadoxTeleServer.cpp
similarity index 100%
rename from dScripts/NtParadoxTeleServer.cpp
rename to dScripts/02_server/Map/NT/NtParadoxTeleServer.cpp
diff --git a/dScripts/NtParadoxTeleServer.h b/dScripts/02_server/Map/NT/NtParadoxTeleServer.h
similarity index 100%
rename from dScripts/NtParadoxTeleServer.h
rename to dScripts/02_server/Map/NT/NtParadoxTeleServer.h
diff --git a/dScripts/NtSentinelWalkwayServer.cpp b/dScripts/02_server/Map/NT/NtSentinelWalkwayServer.cpp
similarity index 100%
rename from dScripts/NtSentinelWalkwayServer.cpp
rename to dScripts/02_server/Map/NT/NtSentinelWalkwayServer.cpp
diff --git a/dScripts/NtSentinelWalkwayServer.h b/dScripts/02_server/Map/NT/NtSentinelWalkwayServer.h
similarity index 100%
rename from dScripts/NtSentinelWalkwayServer.h
rename to dScripts/02_server/Map/NT/NtSentinelWalkwayServer.h
diff --git a/dScripts/NtSleepingGuard.cpp b/dScripts/02_server/Map/NT/NtSleepingGuard.cpp
similarity index 100%
rename from dScripts/NtSleepingGuard.cpp
rename to dScripts/02_server/Map/NT/NtSleepingGuard.cpp
diff --git a/dScripts/NtSleepingGuard.h b/dScripts/02_server/Map/NT/NtSleepingGuard.h
similarity index 100%
rename from dScripts/NtSleepingGuard.h
rename to dScripts/02_server/Map/NT/NtSleepingGuard.h
diff --git a/dScripts/NtVandaServer.cpp b/dScripts/02_server/Map/NT/NtVandaServer.cpp
similarity index 100%
rename from dScripts/NtVandaServer.cpp
rename to dScripts/02_server/Map/NT/NtVandaServer.cpp
diff --git a/dScripts/NtVandaServer.h b/dScripts/02_server/Map/NT/NtVandaServer.h
similarity index 100%
rename from dScripts/NtVandaServer.h
rename to dScripts/02_server/Map/NT/NtVandaServer.h
diff --git a/dScripts/NtVentureCannonServer.cpp b/dScripts/02_server/Map/NT/NtVentureCannonServer.cpp
similarity index 100%
rename from dScripts/NtVentureCannonServer.cpp
rename to dScripts/02_server/Map/NT/NtVentureCannonServer.cpp
diff --git a/dScripts/NtVentureCannonServer.h b/dScripts/02_server/Map/NT/NtVentureCannonServer.h
similarity index 100%
rename from dScripts/NtVentureCannonServer.h
rename to dScripts/02_server/Map/NT/NtVentureCannonServer.h
diff --git a/dScripts/NtVentureSpeedPadServer.cpp b/dScripts/02_server/Map/NT/NtVentureSpeedPadServer.cpp
similarity index 100%
rename from dScripts/NtVentureSpeedPadServer.cpp
rename to dScripts/02_server/Map/NT/NtVentureSpeedPadServer.cpp
diff --git a/dScripts/NtVentureSpeedPadServer.h b/dScripts/02_server/Map/NT/NtVentureSpeedPadServer.h
similarity index 100%
rename from dScripts/NtVentureSpeedPadServer.h
rename to dScripts/02_server/Map/NT/NtVentureSpeedPadServer.h
diff --git a/dScripts/NtXRayServer.cpp b/dScripts/02_server/Map/NT/NtXRayServer.cpp
similarity index 100%
rename from dScripts/NtXRayServer.cpp
rename to dScripts/02_server/Map/NT/NtXRayServer.cpp
diff --git a/dScripts/NtXRayServer.h b/dScripts/02_server/Map/NT/NtXRayServer.h
similarity index 100%
rename from dScripts/NtXRayServer.h
rename to dScripts/02_server/Map/NT/NtXRayServer.h
diff --git a/dScripts/SpawnSaberCatServer.cpp b/dScripts/02_server/Map/NT/SpawnSaberCatServer.cpp
similarity index 100%
rename from dScripts/SpawnSaberCatServer.cpp
rename to dScripts/02_server/Map/NT/SpawnSaberCatServer.cpp
diff --git a/dScripts/SpawnSaberCatServer.h b/dScripts/02_server/Map/NT/SpawnSaberCatServer.h
similarity index 100%
rename from dScripts/SpawnSaberCatServer.h
rename to dScripts/02_server/Map/NT/SpawnSaberCatServer.h
diff --git a/dScripts/SpawnShrakeServer.cpp b/dScripts/02_server/Map/NT/SpawnShrakeServer.cpp
similarity index 100%
rename from dScripts/SpawnShrakeServer.cpp
rename to dScripts/02_server/Map/NT/SpawnShrakeServer.cpp
diff --git a/dScripts/SpawnShrakeServer.h b/dScripts/02_server/Map/NT/SpawnShrakeServer.h
similarity index 100%
rename from dScripts/SpawnShrakeServer.h
rename to dScripts/02_server/Map/NT/SpawnShrakeServer.h
diff --git a/dScripts/SpawnStegoServer.cpp b/dScripts/02_server/Map/NT/SpawnStegoServer.cpp
similarity index 100%
rename from dScripts/SpawnStegoServer.cpp
rename to dScripts/02_server/Map/NT/SpawnStegoServer.cpp
diff --git a/dScripts/SpawnStegoServer.h b/dScripts/02_server/Map/NT/SpawnStegoServer.h
similarity index 100%
rename from dScripts/SpawnStegoServer.h
rename to dScripts/02_server/Map/NT/SpawnStegoServer.h
diff --git a/dScripts/02_server/Map/PR/CMakeLists.txt b/dScripts/02_server/Map/PR/CMakeLists.txt
new file mode 100644
index 00000000..3a32e9f3
--- /dev/null
+++ b/dScripts/02_server/Map/PR/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_PR
+	"HydrantBroken.cpp"
+	"PrSeagullFly.cpp"
+	"SpawnGryphonServer.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/HydrantBroken.cpp b/dScripts/02_server/Map/PR/HydrantBroken.cpp
similarity index 100%
rename from dScripts/HydrantBroken.cpp
rename to dScripts/02_server/Map/PR/HydrantBroken.cpp
diff --git a/dScripts/HydrantBroken.h b/dScripts/02_server/Map/PR/HydrantBroken.h
similarity index 100%
rename from dScripts/HydrantBroken.h
rename to dScripts/02_server/Map/PR/HydrantBroken.h
diff --git a/dScripts/PrSeagullFly.cpp b/dScripts/02_server/Map/PR/PrSeagullFly.cpp
similarity index 100%
rename from dScripts/PrSeagullFly.cpp
rename to dScripts/02_server/Map/PR/PrSeagullFly.cpp
diff --git a/dScripts/PrSeagullFly.h b/dScripts/02_server/Map/PR/PrSeagullFly.h
similarity index 100%
rename from dScripts/PrSeagullFly.h
rename to dScripts/02_server/Map/PR/PrSeagullFly.h
diff --git a/dScripts/SpawnGryphonServer.cpp b/dScripts/02_server/Map/PR/SpawnGryphonServer.cpp
similarity index 100%
rename from dScripts/SpawnGryphonServer.cpp
rename to dScripts/02_server/Map/PR/SpawnGryphonServer.cpp
diff --git a/dScripts/SpawnGryphonServer.h b/dScripts/02_server/Map/PR/SpawnGryphonServer.h
similarity index 100%
rename from dScripts/SpawnGryphonServer.h
rename to dScripts/02_server/Map/PR/SpawnGryphonServer.h
diff --git a/dScripts/02_server/Map/Property/AG_Med/CMakeLists.txt b/dScripts/02_server/Map/Property/AG_Med/CMakeLists.txt
new file mode 100644
index 00000000..90985f9f
--- /dev/null
+++ b/dScripts/02_server/Map/Property/AG_Med/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY_AG_MED 
+	"ZoneAgMedProperty.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/ZoneAgMedProperty.cpp b/dScripts/02_server/Map/Property/AG_Med/ZoneAgMedProperty.cpp
similarity index 100%
rename from dScripts/ZoneAgMedProperty.cpp
rename to dScripts/02_server/Map/Property/AG_Med/ZoneAgMedProperty.cpp
diff --git a/dScripts/ZoneAgMedProperty.h b/dScripts/02_server/Map/Property/AG_Med/ZoneAgMedProperty.h
similarity index 100%
rename from dScripts/ZoneAgMedProperty.h
rename to dScripts/02_server/Map/Property/AG_Med/ZoneAgMedProperty.h
diff --git a/dScripts/02_server/Map/Property/AG_Small/CMakeLists.txt b/dScripts/02_server/Map/Property/AG_Small/CMakeLists.txt
new file mode 100644
index 00000000..3d71dc1a
--- /dev/null
+++ b/dScripts/02_server/Map/Property/AG_Small/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY_AG_SMALL 
+	"ZoneAgProperty.cpp"
+	"EnemySpiderSpawner.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/EnemySpiderSpawner.cpp b/dScripts/02_server/Map/Property/AG_Small/EnemySpiderSpawner.cpp
similarity index 100%
rename from dScripts/EnemySpiderSpawner.cpp
rename to dScripts/02_server/Map/Property/AG_Small/EnemySpiderSpawner.cpp
diff --git a/dScripts/EnemySpiderSpawner.h b/dScripts/02_server/Map/Property/AG_Small/EnemySpiderSpawner.h
similarity index 100%
rename from dScripts/EnemySpiderSpawner.h
rename to dScripts/02_server/Map/Property/AG_Small/EnemySpiderSpawner.h
diff --git a/dScripts/ZoneAgProperty.cpp b/dScripts/02_server/Map/Property/AG_Small/ZoneAgProperty.cpp
similarity index 100%
rename from dScripts/ZoneAgProperty.cpp
rename to dScripts/02_server/Map/Property/AG_Small/ZoneAgProperty.cpp
diff --git a/dScripts/ZoneAgProperty.h b/dScripts/02_server/Map/Property/AG_Small/ZoneAgProperty.h
similarity index 100%
rename from dScripts/ZoneAgProperty.h
rename to dScripts/02_server/Map/Property/AG_Small/ZoneAgProperty.h
diff --git a/dScripts/02_server/Map/Property/CMakeLists.txt b/dScripts/02_server/Map/Property/CMakeLists.txt
new file mode 100644
index 00000000..74badb32
--- /dev/null
+++ b/dScripts/02_server/Map/Property/CMakeLists.txt
@@ -0,0 +1,22 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY
+	"PropertyBankInteract.cpp")
+
+add_subdirectory(AG_Med)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY_AG_MED})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY ${DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY} "AG_Med/${file}")
+endforeach()
+
+add_subdirectory(AG_Small)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY_AG_SMALL})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY ${DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY} "AG_Small/${file}")
+endforeach()
+
+add_subdirectory(NS_Med)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY_NS_MED})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY ${DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY} "NS_Med/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY ${DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY} PARENT_SCOPE)
diff --git a/dScripts/02_server/Map/Property/NS_Med/CMakeLists.txt b/dScripts/02_server/Map/Property/NS_Med/CMakeLists.txt
new file mode 100644
index 00000000..230bc2cf
--- /dev/null
+++ b/dScripts/02_server/Map/Property/NS_Med/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY_NS_MED 
+	"ZoneNsMedProperty.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/ZoneNsMedProperty.cpp b/dScripts/02_server/Map/Property/NS_Med/ZoneNsMedProperty.cpp
similarity index 100%
rename from dScripts/ZoneNsMedProperty.cpp
rename to dScripts/02_server/Map/Property/NS_Med/ZoneNsMedProperty.cpp
diff --git a/dScripts/ZoneNsMedProperty.h b/dScripts/02_server/Map/Property/NS_Med/ZoneNsMedProperty.h
similarity index 100%
rename from dScripts/ZoneNsMedProperty.h
rename to dScripts/02_server/Map/Property/NS_Med/ZoneNsMedProperty.h
diff --git a/dScripts/PropertyBankInteract.cpp b/dScripts/02_server/Map/Property/PropertyBankInteract.cpp
similarity index 100%
rename from dScripts/PropertyBankInteract.cpp
rename to dScripts/02_server/Map/Property/PropertyBankInteract.cpp
diff --git a/dScripts/PropertyBankInteract.h b/dScripts/02_server/Map/Property/PropertyBankInteract.h
similarity index 100%
rename from dScripts/PropertyBankInteract.h
rename to dScripts/02_server/Map/Property/PropertyBankInteract.h
diff --git a/dScripts/02_server/Map/SS/CMakeLists.txt b/dScripts/02_server/Map/SS/CMakeLists.txt
new file mode 100644
index 00000000..49db031f
--- /dev/null
+++ b/dScripts/02_server/Map/SS/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_SS 
+	"SsModularBuildServer.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/SsModularBuildServer.cpp b/dScripts/02_server/Map/SS/SsModularBuildServer.cpp
similarity index 100%
rename from dScripts/SsModularBuildServer.cpp
rename to dScripts/02_server/Map/SS/SsModularBuildServer.cpp
diff --git a/dScripts/SsModularBuildServer.h b/dScripts/02_server/Map/SS/SsModularBuildServer.h
similarity index 100%
rename from dScripts/SsModularBuildServer.h
rename to dScripts/02_server/Map/SS/SsModularBuildServer.h
diff --git a/dScripts/02_server/Map/VE/CMakeLists.txt b/dScripts/02_server/Map/VE/CMakeLists.txt
new file mode 100644
index 00000000..ac3a6461
--- /dev/null
+++ b/dScripts/02_server/Map/VE/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_VE 
+	"VeMissionConsole.cpp"
+	"VeEpsilonServer.cpp"
+	"VeBricksampleServer.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/VeBricksampleServer.cpp b/dScripts/02_server/Map/VE/VeBricksampleServer.cpp
similarity index 100%
rename from dScripts/VeBricksampleServer.cpp
rename to dScripts/02_server/Map/VE/VeBricksampleServer.cpp
diff --git a/dScripts/VeBricksampleServer.h b/dScripts/02_server/Map/VE/VeBricksampleServer.h
similarity index 100%
rename from dScripts/VeBricksampleServer.h
rename to dScripts/02_server/Map/VE/VeBricksampleServer.h
diff --git a/dScripts/VeEpsilonServer.cpp b/dScripts/02_server/Map/VE/VeEpsilonServer.cpp
similarity index 100%
rename from dScripts/VeEpsilonServer.cpp
rename to dScripts/02_server/Map/VE/VeEpsilonServer.cpp
diff --git a/dScripts/VeEpsilonServer.h b/dScripts/02_server/Map/VE/VeEpsilonServer.h
similarity index 100%
rename from dScripts/VeEpsilonServer.h
rename to dScripts/02_server/Map/VE/VeEpsilonServer.h
diff --git a/dScripts/VeMissionConsole.cpp b/dScripts/02_server/Map/VE/VeMissionConsole.cpp
similarity index 100%
rename from dScripts/VeMissionConsole.cpp
rename to dScripts/02_server/Map/VE/VeMissionConsole.cpp
diff --git a/dScripts/VeMissionConsole.h b/dScripts/02_server/Map/VE/VeMissionConsole.h
similarity index 100%
rename from dScripts/VeMissionConsole.h
rename to dScripts/02_server/Map/VE/VeMissionConsole.h
diff --git a/dScripts/BurningTile.cpp b/dScripts/02_server/Map/njhub/BurningTile.cpp
similarity index 100%
rename from dScripts/BurningTile.cpp
rename to dScripts/02_server/Map/njhub/BurningTile.cpp
diff --git a/dScripts/BurningTile.h b/dScripts/02_server/Map/njhub/BurningTile.h
similarity index 100%
rename from dScripts/BurningTile.h
rename to dScripts/02_server/Map/njhub/BurningTile.h
diff --git a/dScripts/02_server/Map/njhub/CMakeLists.txt b/dScripts/02_server/Map/njhub/CMakeLists.txt
new file mode 100644
index 00000000..2527d1ad
--- /dev/null
+++ b/dScripts/02_server/Map/njhub/CMakeLists.txt
@@ -0,0 +1,31 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_NJHUB
+	"BurningTile.cpp"
+	"CatapultBaseServer.cpp"
+	"CatapultBouncerServer.cpp"
+	"CavePrisonCage.cpp"
+	"EnemySkeletonSpawner.cpp"
+	"FallingTile.cpp"
+	"FlameJetServer.cpp"
+	"ImaginationShrineServer.cpp"
+	"Lieutenant.cpp"
+	"MonCoreNookDoors.cpp"
+	"MonCoreSmashableDoors.cpp"
+	"NjColeNPC.cpp"
+	"NjDragonEmblemChestServer.cpp"
+	"NjEarthDragonPetServer.cpp"
+	"NjEarthPetServer.cpp"
+	"NjGarmadonCelebration.cpp"
+	"NjJayMissionItems.cpp"
+	"NjNPCMissionSpinjitzuServer.cpp"
+	"NjNyaMissionitems.cpp"
+	"NjScrollChestServer.cpp"
+	"NjWuNPC.cpp"
+	"RainOfArrows.cpp")
+
+add_subdirectory(boss_instance)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_NJHUB_BOSS_INSTANCE})
+	set(DSCRIPTS_SOURCES_02_SERVER_MAP_NJHUB ${DSCRIPTS_SOURCES_02_SERVER_MAP_NJHUB} "boss_instance/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_NJHUB ${DSCRIPTS_SOURCES_02_SERVER_MAP_NJHUB} PARENT_SCOPE)
diff --git a/dScripts/CatapultBaseServer.cpp b/dScripts/02_server/Map/njhub/CatapultBaseServer.cpp
similarity index 100%
rename from dScripts/CatapultBaseServer.cpp
rename to dScripts/02_server/Map/njhub/CatapultBaseServer.cpp
diff --git a/dScripts/CatapultBaseServer.h b/dScripts/02_server/Map/njhub/CatapultBaseServer.h
similarity index 100%
rename from dScripts/CatapultBaseServer.h
rename to dScripts/02_server/Map/njhub/CatapultBaseServer.h
diff --git a/dScripts/CatapultBouncerServer.cpp b/dScripts/02_server/Map/njhub/CatapultBouncerServer.cpp
similarity index 100%
rename from dScripts/CatapultBouncerServer.cpp
rename to dScripts/02_server/Map/njhub/CatapultBouncerServer.cpp
diff --git a/dScripts/CatapultBouncerServer.h b/dScripts/02_server/Map/njhub/CatapultBouncerServer.h
similarity index 100%
rename from dScripts/CatapultBouncerServer.h
rename to dScripts/02_server/Map/njhub/CatapultBouncerServer.h
diff --git a/dScripts/CavePrisonCage.cpp b/dScripts/02_server/Map/njhub/CavePrisonCage.cpp
similarity index 100%
rename from dScripts/CavePrisonCage.cpp
rename to dScripts/02_server/Map/njhub/CavePrisonCage.cpp
diff --git a/dScripts/CavePrisonCage.h b/dScripts/02_server/Map/njhub/CavePrisonCage.h
similarity index 100%
rename from dScripts/CavePrisonCage.h
rename to dScripts/02_server/Map/njhub/CavePrisonCage.h
diff --git a/dScripts/EnemySkeletonSpawner.cpp b/dScripts/02_server/Map/njhub/EnemySkeletonSpawner.cpp
similarity index 100%
rename from dScripts/EnemySkeletonSpawner.cpp
rename to dScripts/02_server/Map/njhub/EnemySkeletonSpawner.cpp
diff --git a/dScripts/EnemySkeletonSpawner.h b/dScripts/02_server/Map/njhub/EnemySkeletonSpawner.h
similarity index 100%
rename from dScripts/EnemySkeletonSpawner.h
rename to dScripts/02_server/Map/njhub/EnemySkeletonSpawner.h
diff --git a/dScripts/FallingTile.cpp b/dScripts/02_server/Map/njhub/FallingTile.cpp
similarity index 100%
rename from dScripts/FallingTile.cpp
rename to dScripts/02_server/Map/njhub/FallingTile.cpp
diff --git a/dScripts/FallingTile.h b/dScripts/02_server/Map/njhub/FallingTile.h
similarity index 100%
rename from dScripts/FallingTile.h
rename to dScripts/02_server/Map/njhub/FallingTile.h
diff --git a/dScripts/FlameJetServer.cpp b/dScripts/02_server/Map/njhub/FlameJetServer.cpp
similarity index 100%
rename from dScripts/FlameJetServer.cpp
rename to dScripts/02_server/Map/njhub/FlameJetServer.cpp
diff --git a/dScripts/FlameJetServer.h b/dScripts/02_server/Map/njhub/FlameJetServer.h
similarity index 100%
rename from dScripts/FlameJetServer.h
rename to dScripts/02_server/Map/njhub/FlameJetServer.h
diff --git a/dScripts/ImaginationShrineServer.cpp b/dScripts/02_server/Map/njhub/ImaginationShrineServer.cpp
similarity index 100%
rename from dScripts/ImaginationShrineServer.cpp
rename to dScripts/02_server/Map/njhub/ImaginationShrineServer.cpp
diff --git a/dScripts/ImaginationShrineServer.h b/dScripts/02_server/Map/njhub/ImaginationShrineServer.h
similarity index 100%
rename from dScripts/ImaginationShrineServer.h
rename to dScripts/02_server/Map/njhub/ImaginationShrineServer.h
diff --git a/dScripts/Lieutenant.cpp b/dScripts/02_server/Map/njhub/Lieutenant.cpp
similarity index 100%
rename from dScripts/Lieutenant.cpp
rename to dScripts/02_server/Map/njhub/Lieutenant.cpp
diff --git a/dScripts/Lieutenant.h b/dScripts/02_server/Map/njhub/Lieutenant.h
similarity index 100%
rename from dScripts/Lieutenant.h
rename to dScripts/02_server/Map/njhub/Lieutenant.h
diff --git a/dScripts/MonCoreNookDoors.cpp b/dScripts/02_server/Map/njhub/MonCoreNookDoors.cpp
similarity index 100%
rename from dScripts/MonCoreNookDoors.cpp
rename to dScripts/02_server/Map/njhub/MonCoreNookDoors.cpp
diff --git a/dScripts/MonCoreNookDoors.h b/dScripts/02_server/Map/njhub/MonCoreNookDoors.h
similarity index 100%
rename from dScripts/MonCoreNookDoors.h
rename to dScripts/02_server/Map/njhub/MonCoreNookDoors.h
diff --git a/dScripts/MonCoreSmashableDoors.cpp b/dScripts/02_server/Map/njhub/MonCoreSmashableDoors.cpp
similarity index 100%
rename from dScripts/MonCoreSmashableDoors.cpp
rename to dScripts/02_server/Map/njhub/MonCoreSmashableDoors.cpp
diff --git a/dScripts/MonCoreSmashableDoors.h b/dScripts/02_server/Map/njhub/MonCoreSmashableDoors.h
similarity index 100%
rename from dScripts/MonCoreSmashableDoors.h
rename to dScripts/02_server/Map/njhub/MonCoreSmashableDoors.h
diff --git a/dScripts/NjColeNPC.cpp b/dScripts/02_server/Map/njhub/NjColeNPC.cpp
similarity index 100%
rename from dScripts/NjColeNPC.cpp
rename to dScripts/02_server/Map/njhub/NjColeNPC.cpp
diff --git a/dScripts/NjColeNPC.h b/dScripts/02_server/Map/njhub/NjColeNPC.h
similarity index 100%
rename from dScripts/NjColeNPC.h
rename to dScripts/02_server/Map/njhub/NjColeNPC.h
diff --git a/dScripts/NjDragonEmblemChestServer.cpp b/dScripts/02_server/Map/njhub/NjDragonEmblemChestServer.cpp
similarity index 100%
rename from dScripts/NjDragonEmblemChestServer.cpp
rename to dScripts/02_server/Map/njhub/NjDragonEmblemChestServer.cpp
diff --git a/dScripts/NjDragonEmblemChestServer.h b/dScripts/02_server/Map/njhub/NjDragonEmblemChestServer.h
similarity index 100%
rename from dScripts/NjDragonEmblemChestServer.h
rename to dScripts/02_server/Map/njhub/NjDragonEmblemChestServer.h
diff --git a/dScripts/NjEarthDragonPetServer.cpp b/dScripts/02_server/Map/njhub/NjEarthDragonPetServer.cpp
similarity index 100%
rename from dScripts/NjEarthDragonPetServer.cpp
rename to dScripts/02_server/Map/njhub/NjEarthDragonPetServer.cpp
diff --git a/dScripts/NjEarthDragonPetServer.h b/dScripts/02_server/Map/njhub/NjEarthDragonPetServer.h
similarity index 100%
rename from dScripts/NjEarthDragonPetServer.h
rename to dScripts/02_server/Map/njhub/NjEarthDragonPetServer.h
diff --git a/dScripts/NjEarthPetServer.cpp b/dScripts/02_server/Map/njhub/NjEarthPetServer.cpp
similarity index 100%
rename from dScripts/NjEarthPetServer.cpp
rename to dScripts/02_server/Map/njhub/NjEarthPetServer.cpp
diff --git a/dScripts/NjEarthPetServer.h b/dScripts/02_server/Map/njhub/NjEarthPetServer.h
similarity index 100%
rename from dScripts/NjEarthPetServer.h
rename to dScripts/02_server/Map/njhub/NjEarthPetServer.h
diff --git a/dScripts/NjGarmadonCelebration.cpp b/dScripts/02_server/Map/njhub/NjGarmadonCelebration.cpp
similarity index 100%
rename from dScripts/NjGarmadonCelebration.cpp
rename to dScripts/02_server/Map/njhub/NjGarmadonCelebration.cpp
diff --git a/dScripts/NjGarmadonCelebration.h b/dScripts/02_server/Map/njhub/NjGarmadonCelebration.h
similarity index 100%
rename from dScripts/NjGarmadonCelebration.h
rename to dScripts/02_server/Map/njhub/NjGarmadonCelebration.h
diff --git a/dScripts/NjJayMissionItems.cpp b/dScripts/02_server/Map/njhub/NjJayMissionItems.cpp
similarity index 100%
rename from dScripts/NjJayMissionItems.cpp
rename to dScripts/02_server/Map/njhub/NjJayMissionItems.cpp
diff --git a/dScripts/NjJayMissionItems.h b/dScripts/02_server/Map/njhub/NjJayMissionItems.h
similarity index 100%
rename from dScripts/NjJayMissionItems.h
rename to dScripts/02_server/Map/njhub/NjJayMissionItems.h
diff --git a/dScripts/NjNPCMissionSpinjitzuServer.cpp b/dScripts/02_server/Map/njhub/NjNPCMissionSpinjitzuServer.cpp
similarity index 100%
rename from dScripts/NjNPCMissionSpinjitzuServer.cpp
rename to dScripts/02_server/Map/njhub/NjNPCMissionSpinjitzuServer.cpp
diff --git a/dScripts/NjNPCMissionSpinjitzuServer.h b/dScripts/02_server/Map/njhub/NjNPCMissionSpinjitzuServer.h
similarity index 100%
rename from dScripts/NjNPCMissionSpinjitzuServer.h
rename to dScripts/02_server/Map/njhub/NjNPCMissionSpinjitzuServer.h
diff --git a/dScripts/NjNyaMissionitems.cpp b/dScripts/02_server/Map/njhub/NjNyaMissionitems.cpp
similarity index 100%
rename from dScripts/NjNyaMissionitems.cpp
rename to dScripts/02_server/Map/njhub/NjNyaMissionitems.cpp
diff --git a/dScripts/NjNyaMissionitems.h b/dScripts/02_server/Map/njhub/NjNyaMissionitems.h
similarity index 100%
rename from dScripts/NjNyaMissionitems.h
rename to dScripts/02_server/Map/njhub/NjNyaMissionitems.h
diff --git a/dScripts/NjScrollChestServer.cpp b/dScripts/02_server/Map/njhub/NjScrollChestServer.cpp
similarity index 100%
rename from dScripts/NjScrollChestServer.cpp
rename to dScripts/02_server/Map/njhub/NjScrollChestServer.cpp
diff --git a/dScripts/NjScrollChestServer.h b/dScripts/02_server/Map/njhub/NjScrollChestServer.h
similarity index 100%
rename from dScripts/NjScrollChestServer.h
rename to dScripts/02_server/Map/njhub/NjScrollChestServer.h
diff --git a/dScripts/NjWuNPC.cpp b/dScripts/02_server/Map/njhub/NjWuNPC.cpp
similarity index 100%
rename from dScripts/NjWuNPC.cpp
rename to dScripts/02_server/Map/njhub/NjWuNPC.cpp
diff --git a/dScripts/NjWuNPC.h b/dScripts/02_server/Map/njhub/NjWuNPC.h
similarity index 100%
rename from dScripts/NjWuNPC.h
rename to dScripts/02_server/Map/njhub/NjWuNPC.h
diff --git a/dScripts/RainOfArrows.cpp b/dScripts/02_server/Map/njhub/RainOfArrows.cpp
similarity index 100%
rename from dScripts/RainOfArrows.cpp
rename to dScripts/02_server/Map/njhub/RainOfArrows.cpp
diff --git a/dScripts/RainOfArrows.h b/dScripts/02_server/Map/njhub/RainOfArrows.h
similarity index 100%
rename from dScripts/RainOfArrows.h
rename to dScripts/02_server/Map/njhub/RainOfArrows.h
diff --git a/dScripts/02_server/Map/njhub/boss_instance/CMakeLists.txt b/dScripts/02_server/Map/njhub/boss_instance/CMakeLists.txt
new file mode 100644
index 00000000..22bb541d
--- /dev/null
+++ b/dScripts/02_server/Map/njhub/boss_instance/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MAP_NJHUB_BOSS_INSTANCE 
+	"NjMonastryBossInstance.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/NjMonastryBossInstance.cpp b/dScripts/02_server/Map/njhub/boss_instance/NjMonastryBossInstance.cpp
similarity index 100%
rename from dScripts/NjMonastryBossInstance.cpp
rename to dScripts/02_server/Map/njhub/boss_instance/NjMonastryBossInstance.cpp
diff --git a/dScripts/NjMonastryBossInstance.h b/dScripts/02_server/Map/njhub/boss_instance/NjMonastryBossInstance.h
similarity index 100%
rename from dScripts/NjMonastryBossInstance.h
rename to dScripts/02_server/Map/njhub/boss_instance/NjMonastryBossInstance.h
diff --git a/dScripts/02_server/Minigame/CMakeLists.txt b/dScripts/02_server/Minigame/CMakeLists.txt
new file mode 100644
index 00000000..e8cb4402
--- /dev/null
+++ b/dScripts/02_server/Minigame/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MINIGAME)
+
+add_subdirectory(General)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MINIGAME_GENERAL})
+	set(DSCRIPTS_SOURCES_02_SERVER_MINIGAME ${DSCRIPTS_SOURCES_02_SERVER_MINIGAME} "General/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_02_SERVER_MINIGAME ${DSCRIPTS_SOURCES_02_SERVER_MINIGAME} PARENT_SCOPE)
diff --git a/dScripts/02_server/Minigame/General/CMakeLists.txt b/dScripts/02_server/Minigame/General/CMakeLists.txt
new file mode 100644
index 00000000..55d2e595
--- /dev/null
+++ b/dScripts/02_server/Minigame/General/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_02_SERVER_MINIGAME_GENERAL 
+	"MinigameTreasureChestServer.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/MinigameTreasureChestServer.cpp b/dScripts/02_server/Minigame/General/MinigameTreasureChestServer.cpp
similarity index 100%
rename from dScripts/MinigameTreasureChestServer.cpp
rename to dScripts/02_server/Minigame/General/MinigameTreasureChestServer.cpp
diff --git a/dScripts/MinigameTreasureChestServer.h b/dScripts/02_server/Minigame/General/MinigameTreasureChestServer.h
similarity index 100%
rename from dScripts/MinigameTreasureChestServer.h
rename to dScripts/02_server/Minigame/General/MinigameTreasureChestServer.h
diff --git a/dScripts/AgSurvivalBuffStation.cpp b/dScripts/02_server/Objects/AgSurvivalBuffStation.cpp
similarity index 100%
rename from dScripts/AgSurvivalBuffStation.cpp
rename to dScripts/02_server/Objects/AgSurvivalBuffStation.cpp
diff --git a/dScripts/AgSurvivalBuffStation.h b/dScripts/02_server/Objects/AgSurvivalBuffStation.h
similarity index 100%
rename from dScripts/AgSurvivalBuffStation.h
rename to dScripts/02_server/Objects/AgSurvivalBuffStation.h
diff --git a/dScripts/02_server/Objects/CMakeLists.txt b/dScripts/02_server/Objects/CMakeLists.txt
new file mode 100644
index 00000000..1b96d79f
--- /dev/null
+++ b/dScripts/02_server/Objects/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(DSCRIPTS_SOURCES_02_SERVER_OBJECTS 
+	"AgSurvivalBuffStation.cpp"
+	"StinkyFishTarget.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/StinkyFishTarget.cpp b/dScripts/02_server/Objects/StinkyFishTarget.cpp
similarity index 100%
rename from dScripts/StinkyFishTarget.cpp
rename to dScripts/02_server/Objects/StinkyFishTarget.cpp
diff --git a/dScripts/StinkyFishTarget.h b/dScripts/02_server/Objects/StinkyFishTarget.h
similarity index 100%
rename from dScripts/StinkyFishTarget.h
rename to dScripts/02_server/Objects/StinkyFishTarget.h
diff --git a/dScripts/02_server/Pets/CMakeLists.txt b/dScripts/02_server/Pets/CMakeLists.txt
new file mode 100644
index 00000000..8820a82e
--- /dev/null
+++ b/dScripts/02_server/Pets/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(DSCRIPTS_SOURCES_02_SERVER_PETS 
+	"PetFromDigServer.cpp"
+	"PetFromObjectServer.cpp"
+	"DamagingPets.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/DamagingPets.cpp b/dScripts/02_server/Pets/DamagingPets.cpp
similarity index 100%
rename from dScripts/DamagingPets.cpp
rename to dScripts/02_server/Pets/DamagingPets.cpp
diff --git a/dScripts/DamagingPets.h b/dScripts/02_server/Pets/DamagingPets.h
similarity index 100%
rename from dScripts/DamagingPets.h
rename to dScripts/02_server/Pets/DamagingPets.h
diff --git a/dScripts/PetFromDigServer.cpp b/dScripts/02_server/Pets/PetFromDigServer.cpp
similarity index 100%
rename from dScripts/PetFromDigServer.cpp
rename to dScripts/02_server/Pets/PetFromDigServer.cpp
diff --git a/dScripts/PetFromDigServer.h b/dScripts/02_server/Pets/PetFromDigServer.h
similarity index 100%
rename from dScripts/PetFromDigServer.h
rename to dScripts/02_server/Pets/PetFromDigServer.h
diff --git a/dScripts/PetFromObjectServer.cpp b/dScripts/02_server/Pets/PetFromObjectServer.cpp
similarity index 100%
rename from dScripts/PetFromObjectServer.cpp
rename to dScripts/02_server/Pets/PetFromObjectServer.cpp
diff --git a/dScripts/PetFromObjectServer.h b/dScripts/02_server/Pets/PetFromObjectServer.h
similarity index 100%
rename from dScripts/PetFromObjectServer.h
rename to dScripts/02_server/Pets/PetFromObjectServer.h
diff --git a/dScripts/CMakeLists.txt b/dScripts/CMakeLists.txt
index 0a907a05..fce3b721 100644
--- a/dScripts/CMakeLists.txt
+++ b/dScripts/CMakeLists.txt
@@ -1,263 +1,48 @@
-set(DSCRIPT_SOURCES "ActivityManager.cpp"
-	"ActMine.cpp"
-	"ActNinjaTurret.cpp"
-	"ActParadoxPipeFix.cpp"
-	"ActPlayerDeathTrigger.cpp"
-	"ActSharkPlayerDeathTrigger.cpp"
-	"ActVehicleDeathTrigger.cpp"
-	"AgBugsprayer.cpp"
-	"AgBusDoor.cpp"
-	"AgCagedBricksServer.cpp"
-	"AgDarkSpiderling.cpp"
-	"AgFans.cpp"
-	"AgImagSmashable.cpp"
-	"AgJetEffectServer.cpp"
-	"AgLaserSensorServer.cpp"
-	"AgMonumentBirds.cpp"
-	"AgMonumentLaserServer.cpp"
-	"AgMonumentRaceCancel.cpp"
-	"AgMonumentRaceGoal.cpp"
-	"AgPicnicBlanket.cpp"
-	"AgPropGuard.cpp"
-	"AgPropguards.cpp"
-	"AgQbElevator.cpp"
-	"AgQbWall.cpp"
-	"AgSalutingNpcs.cpp"
-	"AgShipPlayerDeathTrigger.cpp"
-	"AgShipPlayerShockServer.cpp"
-	"AgSpaceStuff.cpp"
-	"AgStagePlatforms.cpp"
-	"AgStromlingProperty.cpp"
-	"AgSurvivalBuffStation.cpp"
-	"AgSurvivalMech.cpp"
-	"AgSurvivalSpiderling.cpp"
-	"AgSurvivalStromling.cpp"
-	"AgTurret.cpp"
-	"AllCrateChicken.cpp"
-	"AmBlueX.cpp"
-	"AmBridge.cpp"
-	"AmConsoleTeleportServer.cpp"
-	"AmDarklingDragon.cpp"
-	"AmDarklingMech.cpp"
-	"AmDrawBridge.cpp"
-	"AmDropshipComputer.cpp"
-	"AmScrollReaderServer.cpp"
-	"AmShieldGenerator.cpp"
-	"AmShieldGeneratorQuickbuild.cpp"
-	"AmSkeletonEngineer.cpp"
-	"AmSkullkinDrill.cpp"
-	"AmSkullkinDrillStand.cpp"
-	"AmSkullkinTower.cpp"
-	"AmTeapotServer.cpp"
-	"AmTemplateSkillVolume.cpp"
-	"AnvilOfArmor.cpp"
-	"BankInteractServer.cpp"
+set(DSCRIPTS_SOURCES
+	"ActivityManager.cpp"
 	"BaseConsoleTeleportServer.cpp"
-	"BaseEnemyApe.cpp"
-	"BaseEnemyMech.cpp"
-	"BaseFootRaceManager.cpp"
-	"BaseInteractDropLootServer.cpp"
 	"BasePropertyServer.cpp"
 	"BaseRandomServer.cpp"
 	"BaseSurvivalServer.cpp"
 	"BaseWavesGenericEnemy.cpp"
 	"BaseWavesServer.cpp"
-	"Binoculars.cpp"
-	"BootyDigServer.cpp"
-	"BossSpiderQueenEnemyServer.cpp"
-	"BuccaneerValiantShip.cpp"
-	"BurningTile.cpp"
-	"CatapultBaseServer.cpp"
-	"CatapultBouncerServer.cpp"
-	"CauldronOfLife.cpp"
-	"CavePrisonCage.cpp"
 	"ChooseYourDestinationNsToNt.cpp"
-	"ClRing.cpp"
 	"CppScripts.cpp"
-	"CrabServer.cpp"
-	"DamagingPets.cpp"
 	"Darkitect.cpp"
-	"DLUVanityNPC.cpp"
-	"EnemyNjBuff.cpp"
-	"EnemyRoninSpawner.cpp"
-	"EnemySkeletonSpawner.cpp"
-	"EnemySpiderSpawner.cpp"
-	"ExplodingAsset.cpp"
-	"FallingTile.cpp"
-	"FireFirstSkillonStartup.cpp"
-	"FlameJetServer.cpp"
-	"ForceVolumeServer.cpp"
-	"FountainOfImagination.cpp"
-	"FvBounceOverWall.cpp"
-	"FvBrickPuzzleServer.cpp"
-	"FvCandle.cpp"
-	"FvConsoleLeftQuickbuild.cpp"
-	"FvConsoleRightQuickbuild.cpp"
-	"FvDragonSmashingGolemQb.cpp"
-	"FvFacilityBrick.cpp"
-	"FvFacilityPipes.cpp"
-	"FvFlyingCreviceDragon.cpp"
-	"FvFong.cpp"
-	"FvFreeGfNinjas.cpp"
-	"FvHorsemenTrigger.cpp"
-	"FvMaelstromCavalry.cpp"
-	"FvMaelstromGeyser.cpp"
-	"FvMaelstromDragon.cpp"
-	"FvNinjaGuard.cpp"
-	"FvPandaServer.cpp"
-	"FvPandaSpawnerServer.cpp"
-	"FvPassThroughWall.cpp"
-	"FvRaceSmashEggImagineServer.cpp"
-	"GfApeSmashingQB.cpp"
-	"GfArchway.cpp"
-	"GfBanana.cpp"
-	"GfBananaCluster.cpp"
-	"GfCampfire.cpp"
-	"GfCaptainsCannon.cpp"
-	"GfJailkeepMission.cpp"
-	"GfJailWalls.cpp"
-	"GfMaelstromGeyser.cpp"
-	"GfOrgan.cpp"
-	"GfParrotCrash.cpp"
-	"GfTikiTorch.cpp"
-	"GrowingFlower.cpp"
-	"HydrantBroken.cpp"
-	"HydrantSmashable.cpp"
-	"ImaginationBackpackHealServer.cpp"
-	"ImaginationShrineServer.cpp"
-	"ImgBrickConsoleQB.cpp"
-	"InstanceExitTransferPlayerToLastNonInstance.cpp"
-	"InvalidScript.cpp"
-	"LegoDieRoll.cpp"
-	"Lieutenant.cpp"
-	"MaestromExtracticatorServer.cpp"
-	"MailBoxServer.cpp"
-	"MastTeleport.cpp"
-	"MinigameTreasureChestServer.cpp"
-	"MonCoreNookDoors.cpp"
-	"MonCoreSmashableDoors.cpp"
-	"NjColeNPC.cpp"
-	"NjDragonEmblemChestServer.cpp"
-	"NjEarthDragonPetServer.cpp"
-	"NjEarthPetServer.cpp"
-	"NjGarmadonCelebration.cpp"
-	"NjhubLavaPlayerDeathTrigger.cpp"
-	"NjIceRailActivator.cpp"
-	"NjJayMissionItems.cpp"
-	"NjMonastryBossInstance.cpp"
-	"NjNPCMissionSpinjitzuServer.cpp"
-	"NjNyaMissionitems.cpp"
-	"NjRailActivatorsServer.cpp"
-	"NjRailPostServer.cpp"
-	"NjRailSwitch.cpp"
-	"NjScrollChestServer.cpp"
-	"NjWuNPC.cpp"
 	"NPCAddRemoveItem.cpp"
-	"NpcAgCourseStarter.cpp"
-	"NpcCowboyServer.cpp"
-	"NpcEpsilonServer.cpp"
-	"NpcNjAssistantServer.cpp"
-	"NpcNpSpacemanBob.cpp"
-	"NpcPirateServer.cpp"
-	"NpcWispServer.cpp"
-	"NsConcertChoiceBuild.cpp"
-	"NsConcertChoiceBuildManager.cpp"
-	"NsConcertInstrument.cpp"
-	"NsConcertQuickBuild.cpp"
-	"NsGetFactionMissionServer.cpp"
-	"NsJohnnyMissionServer.cpp"
-	"NsLegoClubDoor.cpp"
-	"NsLupTeleport.cpp"
-	"NsModularBuild.cpp"
-	"NsQbImaginationStatue.cpp"
-	"NsTokenConsoleServer.cpp"
-	"NtAssemblyTubeServer.cpp"
-	"NtBeamImaginationCollectors.cpp"
-	"NtCombatChallengeDummy.cpp"
-	"NtCombatChallengeExplodingDummy.cpp"
-	"NtCombatChallengeServer.cpp"
-	"NtConsoleTeleportServer.cpp"
-	"NtDarkitectRevealServer.cpp"
-	"NtDirtCloudServer.cpp"
-	"NtDukeServer.cpp"
 	"NtFactionSpyServer.cpp"
-	"NtHaelServer.cpp"
-	"NtImagBeamBuffer.cpp"
-	"NtImagimeterVisibility.cpp"
-	"NtOverbuildServer.cpp"
-	"NtParadoxPanelServer.cpp"
-	"NtParadoxTeleServer.cpp"
-	"NtSentinelWalkwayServer.cpp"
-	"NtSleepingGuard.cpp"
-	"NtVandaServer.cpp"
-	"NtVentureCannonServer.cpp"
-	"NtVentureSpeedPadServer.cpp"
-	"NtXRayServer.cpp"
-	"PersonalFortress.cpp"
-	"PetDigBuild.cpp"
-	"PetDigServer.cpp"
-	"PetFromDigServer.cpp"
-	"PetFromObjectServer.cpp"
-	"PirateRep.cpp"
-	"PropertyBankInteract.cpp"
-	"PropertyDeathPlane.cpp"
-	"PropertyDevice.cpp"
-	"PropertyFXDamage.cpp"
-	"PropertyPlatform.cpp"
-	"PrSeagullFly.cpp"
-	"PrWhistle.cpp"
-	"QbEnemyStunner.cpp"
-	"QbSpawner.cpp"
-	"RaceImagineCrateServer.cpp"
-	"RaceImaginePowerup.cpp"
-	"RaceMaelstromGeiser.cpp"
-	"RaceSmashServer.cpp"
-	"RainOfArrows.cpp"
-	"RandomSpawnerFin.cpp"
-	"RandomSpawnerPit.cpp"
-	"RandomSpawnerStr.cpp"
-	"RandomSpawnerZip.cpp"
-	"RemoveRentalGear.cpp"
-	"RockHydrantBroken.cpp"
-	"RockHydrantSmashable.cpp"
 	"ScriptComponent.cpp"
 	"ScriptedPowerupSpawner.cpp"
-	"SGCannon.cpp"
-	"SpawnGryphonServer.cpp"
-	"SpawnLionServer.cpp"
-	"SpawnPetBaseServer.cpp"
-	"SpawnSaberCatServer.cpp"
-	"SpawnShrakeServer.cpp"
-	"SpawnStegoServer.cpp"
-	"SpecialImaginePowerupSpawner.cpp"
-	"SpiderBossTreasureChestServer.cpp"
-	"SsModularBuildServer.cpp"
-	"StinkyFishTarget.cpp"
-	"StoryBoxInteractServer.cpp"
-	"Sunflower.cpp"
-	"TokenConsoleServer.cpp"
-	"TouchMissionUpdateServer.cpp"
-	"TreasureChestDragonServer.cpp"
-	"TriggerAmbush.cpp"
-	"VeBricksampleServer.cpp"
-	"VeEpsilonServer.cpp"
-	"VeMech.cpp"
-	"VeMissionConsole.cpp"
-	"WaveBossApe.cpp"
-	"WaveBossHammerling.cpp"
-	"WaveBossHorsemen.cpp"
-	"WaveBossSpiderling.cpp"
-	"WblGenericZone.cpp"
-	"WhFans.cpp"
-	"WildAmbients.cpp"
-	"WishingWellServer.cpp"
-	"ZoneAgMedProperty.cpp"
-	"ZoneAgProperty.cpp"
-	"ZoneAgSpiderQueen.cpp"
-	"ZoneAgSurvival.cpp"
-	"ZoneFvProperty.cpp"
-	"ZoneGfProperty.cpp"
-	"ZoneNsMedProperty.cpp"
-	"ZoneNsProperty.cpp"
-	"ZoneNsWaves.cpp"
-	"ZoneSGServer.cpp" PARENT_SCOPE)
+	"SpawnPetBaseServer.cpp")
+
+add_subdirectory(02_server)
+
+foreach(file ${DSCRIPTS_SOURCES_02_SERVER})
+	set(DSCRIPTS_SOURCES ${DSCRIPTS_SOURCES} "02_server/${file}")
+endforeach()
+
+add_subdirectory(ai)
+
+foreach(file ${DSCRIPTS_SOURCES_AI})
+	set(DSCRIPTS_SOURCES ${DSCRIPTS_SOURCES} "ai/${file}")
+endforeach()
+
+add_subdirectory(client)
+
+foreach(file ${DSCRIPTS_SOURCES_CLIENT})
+	set(DSCRIPTS_SOURCES ${DSCRIPTS_SOURCES} "client/${file}")
+endforeach()
+
+add_subdirectory(EquipmentScripts)
+
+foreach(file ${DSCRIPTS_SOURCES_EQUIPMENTSCRIPTS})
+	set(DSCRIPTS_SOURCES ${DSCRIPTS_SOURCES} "EquipmentScripts/${file}")
+endforeach()
+
+add_subdirectory(zone)
+
+foreach(file ${DSCRIPTS_SOURCES_ZONE})
+	set(DSCRIPTS_SOURCES ${DSCRIPTS_SOURCES} "zone/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES ${DSCRIPTS_SOURCES} PARENT_SCOPE)
diff --git a/dScripts/AnvilOfArmor.cpp b/dScripts/EquipmentScripts/AnvilOfArmor.cpp
similarity index 100%
rename from dScripts/AnvilOfArmor.cpp
rename to dScripts/EquipmentScripts/AnvilOfArmor.cpp
diff --git a/dScripts/AnvilOfArmor.h b/dScripts/EquipmentScripts/AnvilOfArmor.h
similarity index 100%
rename from dScripts/AnvilOfArmor.h
rename to dScripts/EquipmentScripts/AnvilOfArmor.h
diff --git a/dScripts/BuccaneerValiantShip.cpp b/dScripts/EquipmentScripts/BuccaneerValiantShip.cpp
similarity index 100%
rename from dScripts/BuccaneerValiantShip.cpp
rename to dScripts/EquipmentScripts/BuccaneerValiantShip.cpp
diff --git a/dScripts/BuccaneerValiantShip.h b/dScripts/EquipmentScripts/BuccaneerValiantShip.h
similarity index 100%
rename from dScripts/BuccaneerValiantShip.h
rename to dScripts/EquipmentScripts/BuccaneerValiantShip.h
diff --git a/dScripts/EquipmentScripts/CMakeLists.txt b/dScripts/EquipmentScripts/CMakeLists.txt
new file mode 100644
index 00000000..c870ae31
--- /dev/null
+++ b/dScripts/EquipmentScripts/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(DSCRIPTS_SOURCES_EQUIPMENTSCRIPTS 
+	"Sunflower.cpp"
+	"AnvilOfArmor.cpp"
+	"FountainOfImagination.cpp"
+	"CauldronOfLife.cpp"
+	"PersonalFortress.cpp"
+	"BuccaneerValiantShip.cpp"
+	"FireFirstSkillonStartup.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/CauldronOfLife.cpp b/dScripts/EquipmentScripts/CauldronOfLife.cpp
similarity index 100%
rename from dScripts/CauldronOfLife.cpp
rename to dScripts/EquipmentScripts/CauldronOfLife.cpp
diff --git a/dScripts/CauldronOfLife.h b/dScripts/EquipmentScripts/CauldronOfLife.h
similarity index 100%
rename from dScripts/CauldronOfLife.h
rename to dScripts/EquipmentScripts/CauldronOfLife.h
diff --git a/dScripts/FireFirstSkillonStartup.cpp b/dScripts/EquipmentScripts/FireFirstSkillonStartup.cpp
similarity index 100%
rename from dScripts/FireFirstSkillonStartup.cpp
rename to dScripts/EquipmentScripts/FireFirstSkillonStartup.cpp
diff --git a/dScripts/FireFirstSkillonStartup.h b/dScripts/EquipmentScripts/FireFirstSkillonStartup.h
similarity index 100%
rename from dScripts/FireFirstSkillonStartup.h
rename to dScripts/EquipmentScripts/FireFirstSkillonStartup.h
diff --git a/dScripts/FountainOfImagination.cpp b/dScripts/EquipmentScripts/FountainOfImagination.cpp
similarity index 100%
rename from dScripts/FountainOfImagination.cpp
rename to dScripts/EquipmentScripts/FountainOfImagination.cpp
diff --git a/dScripts/FountainOfImagination.h b/dScripts/EquipmentScripts/FountainOfImagination.h
similarity index 100%
rename from dScripts/FountainOfImagination.h
rename to dScripts/EquipmentScripts/FountainOfImagination.h
diff --git a/dScripts/PersonalFortress.cpp b/dScripts/EquipmentScripts/PersonalFortress.cpp
similarity index 100%
rename from dScripts/PersonalFortress.cpp
rename to dScripts/EquipmentScripts/PersonalFortress.cpp
diff --git a/dScripts/PersonalFortress.h b/dScripts/EquipmentScripts/PersonalFortress.h
similarity index 100%
rename from dScripts/PersonalFortress.h
rename to dScripts/EquipmentScripts/PersonalFortress.h
diff --git a/dScripts/Sunflower.cpp b/dScripts/EquipmentScripts/Sunflower.cpp
similarity index 100%
rename from dScripts/Sunflower.cpp
rename to dScripts/EquipmentScripts/Sunflower.cpp
diff --git a/dScripts/Sunflower.h b/dScripts/EquipmentScripts/Sunflower.h
similarity index 100%
rename from dScripts/Sunflower.h
rename to dScripts/EquipmentScripts/Sunflower.h
diff --git a/dScripts/ActMine.cpp b/dScripts/ai/ACT/ActMine.cpp
similarity index 100%
rename from dScripts/ActMine.cpp
rename to dScripts/ai/ACT/ActMine.cpp
diff --git a/dScripts/ActMine.h b/dScripts/ai/ACT/ActMine.h
similarity index 100%
rename from dScripts/ActMine.h
rename to dScripts/ai/ACT/ActMine.h
diff --git a/dScripts/ActPlayerDeathTrigger.cpp b/dScripts/ai/ACT/ActPlayerDeathTrigger.cpp
similarity index 100%
rename from dScripts/ActPlayerDeathTrigger.cpp
rename to dScripts/ai/ACT/ActPlayerDeathTrigger.cpp
diff --git a/dScripts/ActPlayerDeathTrigger.h b/dScripts/ai/ACT/ActPlayerDeathTrigger.h
similarity index 100%
rename from dScripts/ActPlayerDeathTrigger.h
rename to dScripts/ai/ACT/ActPlayerDeathTrigger.h
diff --git a/dScripts/ActVehicleDeathTrigger.cpp b/dScripts/ai/ACT/ActVehicleDeathTrigger.cpp
similarity index 100%
rename from dScripts/ActVehicleDeathTrigger.cpp
rename to dScripts/ai/ACT/ActVehicleDeathTrigger.cpp
diff --git a/dScripts/ActVehicleDeathTrigger.h b/dScripts/ai/ACT/ActVehicleDeathTrigger.h
similarity index 100%
rename from dScripts/ActVehicleDeathTrigger.h
rename to dScripts/ai/ACT/ActVehicleDeathTrigger.h
diff --git a/dScripts/ai/ACT/CMakeLists.txt b/dScripts/ai/ACT/CMakeLists.txt
new file mode 100644
index 00000000..79deeded
--- /dev/null
+++ b/dScripts/ai/ACT/CMakeLists.txt
@@ -0,0 +1,12 @@
+set(DSCRIPTS_SOURCES_AI_ACT
+	"ActMine.cpp"
+	"ActPlayerDeathTrigger.cpp"
+	"ActVehicleDeathTrigger.cpp")
+
+add_subdirectory(FootRace)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_ACT_FOOTRACE})
+	set(DSCRIPTS_SOURCES_AI_ACT ${DSCRIPTS_SOURCES_AI_ACT} "FootRace/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_AI_ACT ${DSCRIPTS_SOURCES_AI_ACT} PARENT_SCOPE)
diff --git a/dScripts/BaseFootRaceManager.cpp b/dScripts/ai/ACT/FootRace/BaseFootRaceManager.cpp
similarity index 100%
rename from dScripts/BaseFootRaceManager.cpp
rename to dScripts/ai/ACT/FootRace/BaseFootRaceManager.cpp
diff --git a/dScripts/BaseFootRaceManager.h b/dScripts/ai/ACT/FootRace/BaseFootRaceManager.h
similarity index 100%
rename from dScripts/BaseFootRaceManager.h
rename to dScripts/ai/ACT/FootRace/BaseFootRaceManager.h
diff --git a/dScripts/ai/ACT/FootRace/CMakeLists.txt b/dScripts/ai/ACT/FootRace/CMakeLists.txt
new file mode 100644
index 00000000..c56986ff
--- /dev/null
+++ b/dScripts/ai/ACT/FootRace/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_AI_ACT_FOOTRACE 
+	"BaseFootRaceManager.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/ActSharkPlayerDeathTrigger.cpp b/dScripts/ai/AG/ActSharkPlayerDeathTrigger.cpp
similarity index 100%
rename from dScripts/ActSharkPlayerDeathTrigger.cpp
rename to dScripts/ai/AG/ActSharkPlayerDeathTrigger.cpp
diff --git a/dScripts/ActSharkPlayerDeathTrigger.h b/dScripts/ai/AG/ActSharkPlayerDeathTrigger.h
similarity index 100%
rename from dScripts/ActSharkPlayerDeathTrigger.h
rename to dScripts/ai/AG/ActSharkPlayerDeathTrigger.h
diff --git a/dScripts/AgBusDoor.cpp b/dScripts/ai/AG/AgBusDoor.cpp
similarity index 100%
rename from dScripts/AgBusDoor.cpp
rename to dScripts/ai/AG/AgBusDoor.cpp
diff --git a/dScripts/AgBusDoor.h b/dScripts/ai/AG/AgBusDoor.h
similarity index 100%
rename from dScripts/AgBusDoor.h
rename to dScripts/ai/AG/AgBusDoor.h
diff --git a/dScripts/AgDarkSpiderling.cpp b/dScripts/ai/AG/AgDarkSpiderling.cpp
similarity index 100%
rename from dScripts/AgDarkSpiderling.cpp
rename to dScripts/ai/AG/AgDarkSpiderling.cpp
diff --git a/dScripts/AgDarkSpiderling.h b/dScripts/ai/AG/AgDarkSpiderling.h
similarity index 100%
rename from dScripts/AgDarkSpiderling.h
rename to dScripts/ai/AG/AgDarkSpiderling.h
diff --git a/dScripts/AgFans.cpp b/dScripts/ai/AG/AgFans.cpp
similarity index 100%
rename from dScripts/AgFans.cpp
rename to dScripts/ai/AG/AgFans.cpp
diff --git a/dScripts/AgFans.h b/dScripts/ai/AG/AgFans.h
similarity index 100%
rename from dScripts/AgFans.h
rename to dScripts/ai/AG/AgFans.h
diff --git a/dScripts/AgImagSmashable.cpp b/dScripts/ai/AG/AgImagSmashable.cpp
similarity index 100%
rename from dScripts/AgImagSmashable.cpp
rename to dScripts/ai/AG/AgImagSmashable.cpp
diff --git a/dScripts/AgImagSmashable.h b/dScripts/ai/AG/AgImagSmashable.h
similarity index 100%
rename from dScripts/AgImagSmashable.h
rename to dScripts/ai/AG/AgImagSmashable.h
diff --git a/dScripts/AgJetEffectServer.cpp b/dScripts/ai/AG/AgJetEffectServer.cpp
similarity index 100%
rename from dScripts/AgJetEffectServer.cpp
rename to dScripts/ai/AG/AgJetEffectServer.cpp
diff --git a/dScripts/AgJetEffectServer.h b/dScripts/ai/AG/AgJetEffectServer.h
similarity index 100%
rename from dScripts/AgJetEffectServer.h
rename to dScripts/ai/AG/AgJetEffectServer.h
diff --git a/dScripts/AgPicnicBlanket.cpp b/dScripts/ai/AG/AgPicnicBlanket.cpp
similarity index 100%
rename from dScripts/AgPicnicBlanket.cpp
rename to dScripts/ai/AG/AgPicnicBlanket.cpp
diff --git a/dScripts/AgPicnicBlanket.h b/dScripts/ai/AG/AgPicnicBlanket.h
similarity index 100%
rename from dScripts/AgPicnicBlanket.h
rename to dScripts/ai/AG/AgPicnicBlanket.h
diff --git a/dScripts/AgQbElevator.cpp b/dScripts/ai/AG/AgQbElevator.cpp
similarity index 100%
rename from dScripts/AgQbElevator.cpp
rename to dScripts/ai/AG/AgQbElevator.cpp
diff --git a/dScripts/AgQbElevator.h b/dScripts/ai/AG/AgQbElevator.h
similarity index 100%
rename from dScripts/AgQbElevator.h
rename to dScripts/ai/AG/AgQbElevator.h
diff --git a/dScripts/AgQbWall.cpp b/dScripts/ai/AG/AgQbWall.cpp
similarity index 100%
rename from dScripts/AgQbWall.cpp
rename to dScripts/ai/AG/AgQbWall.cpp
diff --git a/dScripts/AgQbWall.h b/dScripts/ai/AG/AgQbWall.h
similarity index 100%
rename from dScripts/AgQbWall.h
rename to dScripts/ai/AG/AgQbWall.h
diff --git a/dScripts/AgSalutingNpcs.cpp b/dScripts/ai/AG/AgSalutingNpcs.cpp
similarity index 100%
rename from dScripts/AgSalutingNpcs.cpp
rename to dScripts/ai/AG/AgSalutingNpcs.cpp
diff --git a/dScripts/AgSalutingNpcs.h b/dScripts/ai/AG/AgSalutingNpcs.h
similarity index 100%
rename from dScripts/AgSalutingNpcs.h
rename to dScripts/ai/AG/AgSalutingNpcs.h
diff --git a/dScripts/AgShipPlayerDeathTrigger.cpp b/dScripts/ai/AG/AgShipPlayerDeathTrigger.cpp
similarity index 100%
rename from dScripts/AgShipPlayerDeathTrigger.cpp
rename to dScripts/ai/AG/AgShipPlayerDeathTrigger.cpp
diff --git a/dScripts/AgShipPlayerDeathTrigger.h b/dScripts/ai/AG/AgShipPlayerDeathTrigger.h
similarity index 100%
rename from dScripts/AgShipPlayerDeathTrigger.h
rename to dScripts/ai/AG/AgShipPlayerDeathTrigger.h
diff --git a/dScripts/AgShipPlayerShockServer.cpp b/dScripts/ai/AG/AgShipPlayerShockServer.cpp
similarity index 100%
rename from dScripts/AgShipPlayerShockServer.cpp
rename to dScripts/ai/AG/AgShipPlayerShockServer.cpp
diff --git a/dScripts/AgShipPlayerShockServer.h b/dScripts/ai/AG/AgShipPlayerShockServer.h
similarity index 100%
rename from dScripts/AgShipPlayerShockServer.h
rename to dScripts/ai/AG/AgShipPlayerShockServer.h
diff --git a/dScripts/AgSpaceStuff.cpp b/dScripts/ai/AG/AgSpaceStuff.cpp
similarity index 100%
rename from dScripts/AgSpaceStuff.cpp
rename to dScripts/ai/AG/AgSpaceStuff.cpp
diff --git a/dScripts/AgSpaceStuff.h b/dScripts/ai/AG/AgSpaceStuff.h
similarity index 100%
rename from dScripts/AgSpaceStuff.h
rename to dScripts/ai/AG/AgSpaceStuff.h
diff --git a/dScripts/AgStagePlatforms.cpp b/dScripts/ai/AG/AgStagePlatforms.cpp
similarity index 100%
rename from dScripts/AgStagePlatforms.cpp
rename to dScripts/ai/AG/AgStagePlatforms.cpp
diff --git a/dScripts/AgStagePlatforms.h b/dScripts/ai/AG/AgStagePlatforms.h
similarity index 100%
rename from dScripts/AgStagePlatforms.h
rename to dScripts/ai/AG/AgStagePlatforms.h
diff --git a/dScripts/AgStromlingProperty.cpp b/dScripts/ai/AG/AgStromlingProperty.cpp
similarity index 100%
rename from dScripts/AgStromlingProperty.cpp
rename to dScripts/ai/AG/AgStromlingProperty.cpp
diff --git a/dScripts/AgStromlingProperty.h b/dScripts/ai/AG/AgStromlingProperty.h
similarity index 100%
rename from dScripts/AgStromlingProperty.h
rename to dScripts/ai/AG/AgStromlingProperty.h
diff --git a/dScripts/AgTurret.cpp b/dScripts/ai/AG/AgTurret.cpp
similarity index 100%
rename from dScripts/AgTurret.cpp
rename to dScripts/ai/AG/AgTurret.cpp
diff --git a/dScripts/AgTurret.h b/dScripts/ai/AG/AgTurret.h
similarity index 100%
rename from dScripts/AgTurret.h
rename to dScripts/ai/AG/AgTurret.h
diff --git a/dScripts/ai/AG/CMakeLists.txt b/dScripts/ai/AG/CMakeLists.txt
new file mode 100644
index 00000000..092b8de7
--- /dev/null
+++ b/dScripts/ai/AG/CMakeLists.txt
@@ -0,0 +1,18 @@
+set(DSCRIPTS_SOURCES_AI_AG 
+	"AgShipPlayerDeathTrigger.cpp"
+	"AgSpaceStuff.cpp"
+	"AgShipPlayerShockServer.cpp"
+	"AgImagSmashable.cpp"
+	"ActSharkPlayerDeathTrigger.cpp"
+	"AgBusDoor.cpp"
+	"AgTurret.cpp"
+	"AgFans.cpp"
+	"AgSalutingNpcs.cpp"
+	"AgJetEffectServer.cpp"
+	"AgQbElevator.cpp"
+	"AgStromlingProperty.cpp"
+	"AgDarkSpiderling.cpp"
+	"AgPicnicBlanket.cpp"
+	"AgStagePlatforms.cpp"
+	"AgQbWall.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/ai/CMakeLists.txt b/dScripts/ai/CMakeLists.txt
new file mode 100644
index 00000000..44944b90
--- /dev/null
+++ b/dScripts/ai/CMakeLists.txt
@@ -0,0 +1,81 @@
+set(DSCRIPTS_SOURCES_AI)
+
+add_subdirectory(ACT)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_ACT})
+	set(DSCRIPTS_SOURCES_AI ${DSCRIPTS_SOURCES_AI} "ACT/${file}")
+endforeach()
+
+add_subdirectory(AG)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_AG})
+	set(DSCRIPTS_SOURCES_AI ${DSCRIPTS_SOURCES_AI} "AG/${file}")
+endforeach()
+
+add_subdirectory(FV)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_FV})
+	set(DSCRIPTS_SOURCES_AI ${DSCRIPTS_SOURCES_AI} "FV/${file}")
+endforeach()
+
+add_subdirectory(GENERAL)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_GENERAL})
+	set(DSCRIPTS_SOURCES_AI ${DSCRIPTS_SOURCES_AI} "GENERAL/${file}")
+endforeach()
+
+add_subdirectory(GF)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_GF})
+	set(DSCRIPTS_SOURCES_AI ${DSCRIPTS_SOURCES_AI} "GF/${file}")
+endforeach()
+
+add_subdirectory(MINIGAME)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_MINIGAME})
+	set(DSCRIPTS_SOURCES_AI ${DSCRIPTS_SOURCES_AI} "MINIGAME/${file}")
+endforeach()
+
+add_subdirectory(NP)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_NP})
+	set(DSCRIPTS_SOURCES_AI ${DSCRIPTS_SOURCES_AI} "NP/${file}")
+endforeach()
+
+add_subdirectory(NS)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_NS})
+	set(DSCRIPTS_SOURCES_AI ${DSCRIPTS_SOURCES_AI} "NS/${file}")
+endforeach()
+
+add_subdirectory(PETS)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_PETS})
+	set(DSCRIPTS_SOURCES_AI ${DSCRIPTS_SOURCES_AI} "PETS/${file}")
+endforeach()
+
+add_subdirectory(PROPERTY)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_PROPERTY})
+	set(DSCRIPTS_SOURCES_AI ${DSCRIPTS_SOURCES_AI} "PROPERTY/${file}")
+endforeach()
+
+add_subdirectory(RACING)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_RACING})
+	set(DSCRIPTS_SOURCES_AI ${DSCRIPTS_SOURCES_AI} "RACING/${file}")
+endforeach()
+
+add_subdirectory(SPEC)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_SPEC})
+	set(DSCRIPTS_SOURCES_AI ${DSCRIPTS_SOURCES_AI} "SPEC/${file}")
+endforeach()
+
+add_subdirectory(WILD)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_WILD})
+	set(DSCRIPTS_SOURCES_AI ${DSCRIPTS_SOURCES_AI} "WILD/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_AI ${DSCRIPTS_SOURCES_AI} PARENT_SCOPE)
diff --git a/dScripts/ActNinjaTurret.cpp b/dScripts/ai/FV/ActNinjaTurret.cpp
similarity index 100%
rename from dScripts/ActNinjaTurret.cpp
rename to dScripts/ai/FV/ActNinjaTurret.cpp
diff --git a/dScripts/ActNinjaTurret.h b/dScripts/ai/FV/ActNinjaTurret.h
similarity index 100%
rename from dScripts/ActNinjaTurret.h
rename to dScripts/ai/FV/ActNinjaTurret.h
diff --git a/dScripts/ActParadoxPipeFix.cpp b/dScripts/ai/FV/ActParadoxPipeFix.cpp
similarity index 100%
rename from dScripts/ActParadoxPipeFix.cpp
rename to dScripts/ai/FV/ActParadoxPipeFix.cpp
diff --git a/dScripts/ActParadoxPipeFix.h b/dScripts/ai/FV/ActParadoxPipeFix.h
similarity index 100%
rename from dScripts/ActParadoxPipeFix.h
rename to dScripts/ai/FV/ActParadoxPipeFix.h
diff --git a/dScripts/ai/FV/CMakeLists.txt b/dScripts/ai/FV/CMakeLists.txt
new file mode 100644
index 00000000..2a8a3367
--- /dev/null
+++ b/dScripts/ai/FV/CMakeLists.txt
@@ -0,0 +1,18 @@
+set(DSCRIPTS_SOURCES_AI_FV 
+	"ActNinjaTurret.cpp"
+	"FvFlyingCreviceDragon.cpp"
+	"FvDragonSmashingGolemQb.cpp"
+	"FvFreeGfNinjas.cpp"
+	"FvPandaSpawnerServer.cpp"
+	"FvPandaServer.cpp"
+	"FvBrickPuzzleServer.cpp"
+	"FvConsoleLeftQuickbuild.cpp"
+	"FvConsoleRightQuickbuild.cpp"
+	"FvFacilityBrick.cpp"
+	"FvFacilityPipes.cpp"
+	"ActParadoxPipeFix.cpp"
+	"FvNinjaGuard.cpp"
+	"FvPassThroughWall.cpp"
+	"FvBounceOverWall.cpp"
+	"FvMaelstromGeyser.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/FvBounceOverWall.cpp b/dScripts/ai/FV/FvBounceOverWall.cpp
similarity index 100%
rename from dScripts/FvBounceOverWall.cpp
rename to dScripts/ai/FV/FvBounceOverWall.cpp
diff --git a/dScripts/FvBounceOverWall.h b/dScripts/ai/FV/FvBounceOverWall.h
similarity index 100%
rename from dScripts/FvBounceOverWall.h
rename to dScripts/ai/FV/FvBounceOverWall.h
diff --git a/dScripts/FvBrickPuzzleServer.cpp b/dScripts/ai/FV/FvBrickPuzzleServer.cpp
similarity index 100%
rename from dScripts/FvBrickPuzzleServer.cpp
rename to dScripts/ai/FV/FvBrickPuzzleServer.cpp
diff --git a/dScripts/FvBrickPuzzleServer.h b/dScripts/ai/FV/FvBrickPuzzleServer.h
similarity index 100%
rename from dScripts/FvBrickPuzzleServer.h
rename to dScripts/ai/FV/FvBrickPuzzleServer.h
diff --git a/dScripts/FvConsoleLeftQuickbuild.cpp b/dScripts/ai/FV/FvConsoleLeftQuickbuild.cpp
similarity index 100%
rename from dScripts/FvConsoleLeftQuickbuild.cpp
rename to dScripts/ai/FV/FvConsoleLeftQuickbuild.cpp
diff --git a/dScripts/FvConsoleLeftQuickbuild.h b/dScripts/ai/FV/FvConsoleLeftQuickbuild.h
similarity index 100%
rename from dScripts/FvConsoleLeftQuickbuild.h
rename to dScripts/ai/FV/FvConsoleLeftQuickbuild.h
diff --git a/dScripts/FvConsoleRightQuickbuild.cpp b/dScripts/ai/FV/FvConsoleRightQuickbuild.cpp
similarity index 100%
rename from dScripts/FvConsoleRightQuickbuild.cpp
rename to dScripts/ai/FV/FvConsoleRightQuickbuild.cpp
diff --git a/dScripts/FvConsoleRightQuickbuild.h b/dScripts/ai/FV/FvConsoleRightQuickbuild.h
similarity index 100%
rename from dScripts/FvConsoleRightQuickbuild.h
rename to dScripts/ai/FV/FvConsoleRightQuickbuild.h
diff --git a/dScripts/FvDragonSmashingGolemQb.cpp b/dScripts/ai/FV/FvDragonSmashingGolemQb.cpp
similarity index 100%
rename from dScripts/FvDragonSmashingGolemQb.cpp
rename to dScripts/ai/FV/FvDragonSmashingGolemQb.cpp
diff --git a/dScripts/FvDragonSmashingGolemQb.h b/dScripts/ai/FV/FvDragonSmashingGolemQb.h
similarity index 100%
rename from dScripts/FvDragonSmashingGolemQb.h
rename to dScripts/ai/FV/FvDragonSmashingGolemQb.h
diff --git a/dScripts/FvFacilityBrick.cpp b/dScripts/ai/FV/FvFacilityBrick.cpp
similarity index 100%
rename from dScripts/FvFacilityBrick.cpp
rename to dScripts/ai/FV/FvFacilityBrick.cpp
diff --git a/dScripts/FvFacilityBrick.h b/dScripts/ai/FV/FvFacilityBrick.h
similarity index 100%
rename from dScripts/FvFacilityBrick.h
rename to dScripts/ai/FV/FvFacilityBrick.h
diff --git a/dScripts/FvFacilityPipes.cpp b/dScripts/ai/FV/FvFacilityPipes.cpp
similarity index 100%
rename from dScripts/FvFacilityPipes.cpp
rename to dScripts/ai/FV/FvFacilityPipes.cpp
diff --git a/dScripts/FvFacilityPipes.h b/dScripts/ai/FV/FvFacilityPipes.h
similarity index 100%
rename from dScripts/FvFacilityPipes.h
rename to dScripts/ai/FV/FvFacilityPipes.h
diff --git a/dScripts/FvFlyingCreviceDragon.cpp b/dScripts/ai/FV/FvFlyingCreviceDragon.cpp
similarity index 100%
rename from dScripts/FvFlyingCreviceDragon.cpp
rename to dScripts/ai/FV/FvFlyingCreviceDragon.cpp
diff --git a/dScripts/FvFlyingCreviceDragon.h b/dScripts/ai/FV/FvFlyingCreviceDragon.h
similarity index 100%
rename from dScripts/FvFlyingCreviceDragon.h
rename to dScripts/ai/FV/FvFlyingCreviceDragon.h
diff --git a/dScripts/FvFreeGfNinjas.cpp b/dScripts/ai/FV/FvFreeGfNinjas.cpp
similarity index 100%
rename from dScripts/FvFreeGfNinjas.cpp
rename to dScripts/ai/FV/FvFreeGfNinjas.cpp
diff --git a/dScripts/FvFreeGfNinjas.h b/dScripts/ai/FV/FvFreeGfNinjas.h
similarity index 100%
rename from dScripts/FvFreeGfNinjas.h
rename to dScripts/ai/FV/FvFreeGfNinjas.h
diff --git a/dScripts/FvMaelstromGeyser.cpp b/dScripts/ai/FV/FvMaelstromGeyser.cpp
similarity index 100%
rename from dScripts/FvMaelstromGeyser.cpp
rename to dScripts/ai/FV/FvMaelstromGeyser.cpp
diff --git a/dScripts/FvMaelstromGeyser.h b/dScripts/ai/FV/FvMaelstromGeyser.h
similarity index 100%
rename from dScripts/FvMaelstromGeyser.h
rename to dScripts/ai/FV/FvMaelstromGeyser.h
diff --git a/dScripts/FvNinjaGuard.cpp b/dScripts/ai/FV/FvNinjaGuard.cpp
similarity index 100%
rename from dScripts/FvNinjaGuard.cpp
rename to dScripts/ai/FV/FvNinjaGuard.cpp
diff --git a/dScripts/FvNinjaGuard.h b/dScripts/ai/FV/FvNinjaGuard.h
similarity index 100%
rename from dScripts/FvNinjaGuard.h
rename to dScripts/ai/FV/FvNinjaGuard.h
diff --git a/dScripts/FvPandaServer.cpp b/dScripts/ai/FV/FvPandaServer.cpp
similarity index 100%
rename from dScripts/FvPandaServer.cpp
rename to dScripts/ai/FV/FvPandaServer.cpp
diff --git a/dScripts/FvPandaServer.h b/dScripts/ai/FV/FvPandaServer.h
similarity index 100%
rename from dScripts/FvPandaServer.h
rename to dScripts/ai/FV/FvPandaServer.h
diff --git a/dScripts/FvPandaSpawnerServer.cpp b/dScripts/ai/FV/FvPandaSpawnerServer.cpp
similarity index 100%
rename from dScripts/FvPandaSpawnerServer.cpp
rename to dScripts/ai/FV/FvPandaSpawnerServer.cpp
diff --git a/dScripts/FvPandaSpawnerServer.h b/dScripts/ai/FV/FvPandaSpawnerServer.h
similarity index 100%
rename from dScripts/FvPandaSpawnerServer.h
rename to dScripts/ai/FV/FvPandaSpawnerServer.h
diff --git a/dScripts/FvPassThroughWall.cpp b/dScripts/ai/FV/FvPassThroughWall.cpp
similarity index 100%
rename from dScripts/FvPassThroughWall.cpp
rename to dScripts/ai/FV/FvPassThroughWall.cpp
diff --git a/dScripts/FvPassThroughWall.h b/dScripts/ai/FV/FvPassThroughWall.h
similarity index 100%
rename from dScripts/FvPassThroughWall.h
rename to dScripts/ai/FV/FvPassThroughWall.h
diff --git a/dScripts/ai/GENERAL/CMakeLists.txt b/dScripts/ai/GENERAL/CMakeLists.txt
new file mode 100644
index 00000000..da973658
--- /dev/null
+++ b/dScripts/ai/GENERAL/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(DSCRIPTS_SOURCES_AI_GENERAL 
+	"InstanceExitTransferPlayerToLastNonInstance.cpp"
+	"LegoDieRoll.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/InstanceExitTransferPlayerToLastNonInstance.cpp b/dScripts/ai/GENERAL/InstanceExitTransferPlayerToLastNonInstance.cpp
similarity index 100%
rename from dScripts/InstanceExitTransferPlayerToLastNonInstance.cpp
rename to dScripts/ai/GENERAL/InstanceExitTransferPlayerToLastNonInstance.cpp
diff --git a/dScripts/InstanceExitTransferPlayerToLastNonInstance.h b/dScripts/ai/GENERAL/InstanceExitTransferPlayerToLastNonInstance.h
similarity index 100%
rename from dScripts/InstanceExitTransferPlayerToLastNonInstance.h
rename to dScripts/ai/GENERAL/InstanceExitTransferPlayerToLastNonInstance.h
diff --git a/dScripts/LegoDieRoll.cpp b/dScripts/ai/GENERAL/LegoDieRoll.cpp
similarity index 100%
rename from dScripts/LegoDieRoll.cpp
rename to dScripts/ai/GENERAL/LegoDieRoll.cpp
diff --git a/dScripts/LegoDieRoll.h b/dScripts/ai/GENERAL/LegoDieRoll.h
similarity index 100%
rename from dScripts/LegoDieRoll.h
rename to dScripts/ai/GENERAL/LegoDieRoll.h
diff --git a/dScripts/ai/GF/CMakeLists.txt b/dScripts/ai/GF/CMakeLists.txt
new file mode 100644
index 00000000..9937618c
--- /dev/null
+++ b/dScripts/ai/GF/CMakeLists.txt
@@ -0,0 +1,14 @@
+set(DSCRIPTS_SOURCES_AI_GF 
+	"GfCampfire.cpp"
+	"GfOrgan.cpp"
+	"GfBanana.cpp"
+	"GfBananaCluster.cpp"
+	"GfJailkeepMission.cpp"
+	"TriggerAmbush.cpp"
+	"GfJailWalls.cpp"
+	"PetDigBuild.cpp"
+	"GfArchway.cpp"
+	"GfMaelstromGeyser.cpp"
+	"PirateRep.cpp"
+	"GfParrotCrash.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/GfArchway.cpp b/dScripts/ai/GF/GfArchway.cpp
similarity index 100%
rename from dScripts/GfArchway.cpp
rename to dScripts/ai/GF/GfArchway.cpp
diff --git a/dScripts/GfArchway.h b/dScripts/ai/GF/GfArchway.h
similarity index 100%
rename from dScripts/GfArchway.h
rename to dScripts/ai/GF/GfArchway.h
diff --git a/dScripts/GfBanana.cpp b/dScripts/ai/GF/GfBanana.cpp
similarity index 100%
rename from dScripts/GfBanana.cpp
rename to dScripts/ai/GF/GfBanana.cpp
diff --git a/dScripts/GfBanana.h b/dScripts/ai/GF/GfBanana.h
similarity index 100%
rename from dScripts/GfBanana.h
rename to dScripts/ai/GF/GfBanana.h
diff --git a/dScripts/GfBananaCluster.cpp b/dScripts/ai/GF/GfBananaCluster.cpp
similarity index 100%
rename from dScripts/GfBananaCluster.cpp
rename to dScripts/ai/GF/GfBananaCluster.cpp
diff --git a/dScripts/GfBananaCluster.h b/dScripts/ai/GF/GfBananaCluster.h
similarity index 100%
rename from dScripts/GfBananaCluster.h
rename to dScripts/ai/GF/GfBananaCluster.h
diff --git a/dScripts/GfCampfire.cpp b/dScripts/ai/GF/GfCampfire.cpp
similarity index 100%
rename from dScripts/GfCampfire.cpp
rename to dScripts/ai/GF/GfCampfire.cpp
diff --git a/dScripts/GfCampfire.h b/dScripts/ai/GF/GfCampfire.h
similarity index 100%
rename from dScripts/GfCampfire.h
rename to dScripts/ai/GF/GfCampfire.h
diff --git a/dScripts/GfJailWalls.cpp b/dScripts/ai/GF/GfJailWalls.cpp
similarity index 100%
rename from dScripts/GfJailWalls.cpp
rename to dScripts/ai/GF/GfJailWalls.cpp
diff --git a/dScripts/GfJailWalls.h b/dScripts/ai/GF/GfJailWalls.h
similarity index 100%
rename from dScripts/GfJailWalls.h
rename to dScripts/ai/GF/GfJailWalls.h
diff --git a/dScripts/GfJailkeepMission.cpp b/dScripts/ai/GF/GfJailkeepMission.cpp
similarity index 100%
rename from dScripts/GfJailkeepMission.cpp
rename to dScripts/ai/GF/GfJailkeepMission.cpp
diff --git a/dScripts/GfJailkeepMission.h b/dScripts/ai/GF/GfJailkeepMission.h
similarity index 100%
rename from dScripts/GfJailkeepMission.h
rename to dScripts/ai/GF/GfJailkeepMission.h
diff --git a/dScripts/GfMaelstromGeyser.cpp b/dScripts/ai/GF/GfMaelstromGeyser.cpp
similarity index 100%
rename from dScripts/GfMaelstromGeyser.cpp
rename to dScripts/ai/GF/GfMaelstromGeyser.cpp
diff --git a/dScripts/GfMaelstromGeyser.h b/dScripts/ai/GF/GfMaelstromGeyser.h
similarity index 100%
rename from dScripts/GfMaelstromGeyser.h
rename to dScripts/ai/GF/GfMaelstromGeyser.h
diff --git a/dScripts/GfOrgan.cpp b/dScripts/ai/GF/GfOrgan.cpp
similarity index 100%
rename from dScripts/GfOrgan.cpp
rename to dScripts/ai/GF/GfOrgan.cpp
diff --git a/dScripts/GfOrgan.h b/dScripts/ai/GF/GfOrgan.h
similarity index 100%
rename from dScripts/GfOrgan.h
rename to dScripts/ai/GF/GfOrgan.h
diff --git a/dScripts/GfParrotCrash.cpp b/dScripts/ai/GF/GfParrotCrash.cpp
similarity index 100%
rename from dScripts/GfParrotCrash.cpp
rename to dScripts/ai/GF/GfParrotCrash.cpp
diff --git a/dScripts/GfParrotCrash.h b/dScripts/ai/GF/GfParrotCrash.h
similarity index 100%
rename from dScripts/GfParrotCrash.h
rename to dScripts/ai/GF/GfParrotCrash.h
diff --git a/dScripts/PetDigBuild.cpp b/dScripts/ai/GF/PetDigBuild.cpp
similarity index 100%
rename from dScripts/PetDigBuild.cpp
rename to dScripts/ai/GF/PetDigBuild.cpp
diff --git a/dScripts/PetDigBuild.h b/dScripts/ai/GF/PetDigBuild.h
similarity index 100%
rename from dScripts/PetDigBuild.h
rename to dScripts/ai/GF/PetDigBuild.h
diff --git a/dScripts/PirateRep.cpp b/dScripts/ai/GF/PirateRep.cpp
similarity index 100%
rename from dScripts/PirateRep.cpp
rename to dScripts/ai/GF/PirateRep.cpp
diff --git a/dScripts/PirateRep.h b/dScripts/ai/GF/PirateRep.h
similarity index 100%
rename from dScripts/PirateRep.h
rename to dScripts/ai/GF/PirateRep.h
diff --git a/dScripts/TriggerAmbush.cpp b/dScripts/ai/GF/TriggerAmbush.cpp
similarity index 100%
rename from dScripts/TriggerAmbush.cpp
rename to dScripts/ai/GF/TriggerAmbush.cpp
diff --git a/dScripts/TriggerAmbush.h b/dScripts/ai/GF/TriggerAmbush.h
similarity index 100%
rename from dScripts/TriggerAmbush.h
rename to dScripts/ai/GF/TriggerAmbush.h
diff --git a/dScripts/ai/MINIGAME/CMakeLists.txt b/dScripts/ai/MINIGAME/CMakeLists.txt
new file mode 100644
index 00000000..d4517519
--- /dev/null
+++ b/dScripts/ai/MINIGAME/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(DSCRIPTS_SOURCES_AI_MINIGAME)
+
+add_subdirectory(SG_GF)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_MINIGAME_SG_GF})
+	set(DSCRIPTS_SOURCES_AI_MINIGAME ${DSCRIPTS_SOURCES_AI_MINIGAME} "SG_GF/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_AI_MINIGAME ${DSCRIPTS_SOURCES_AI_MINIGAME} PARENT_SCOPE)
diff --git a/dScripts/ai/MINIGAME/SG_GF/CMakeLists.txt b/dScripts/ai/MINIGAME/SG_GF/CMakeLists.txt
new file mode 100644
index 00000000..87bd879a
--- /dev/null
+++ b/dScripts/ai/MINIGAME/SG_GF/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(DSCRIPTS_SOURCES_AI_MINIGAME_SG_GF
+	"ZoneSGServer.cpp")
+
+add_subdirectory(SERVER)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_MINIGAME_SG_GF_SERVER})
+	set(DSCRIPTS_SOURCES_AI_MINIGAME_SG_GF ${DSCRIPTS_SOURCES_AI_MINIGAME_SG_GF} "SERVER/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_AI_MINIGAME_SG_GF ${DSCRIPTS_SOURCES_AI_MINIGAME_SG_GF} PARENT_SCOPE)
diff --git a/dScripts/ai/MINIGAME/SG_GF/SERVER/CMakeLists.txt b/dScripts/ai/MINIGAME/SG_GF/SERVER/CMakeLists.txt
new file mode 100644
index 00000000..fb79c0e9
--- /dev/null
+++ b/dScripts/ai/MINIGAME/SG_GF/SERVER/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_AI_MINIGAME_SG_GF_SERVER 
+	"SGCannon.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/SGCannon.cpp b/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp
similarity index 100%
rename from dScripts/SGCannon.cpp
rename to dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp
diff --git a/dScripts/SGCannon.h b/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.h
similarity index 100%
rename from dScripts/SGCannon.h
rename to dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.h
diff --git a/dScripts/ZoneSGServer.cpp b/dScripts/ai/MINIGAME/SG_GF/ZoneSGServer.cpp
similarity index 100%
rename from dScripts/ZoneSGServer.cpp
rename to dScripts/ai/MINIGAME/SG_GF/ZoneSGServer.cpp
diff --git a/dScripts/ZoneSGServer.h b/dScripts/ai/MINIGAME/SG_GF/ZoneSGServer.h
similarity index 100%
rename from dScripts/ZoneSGServer.h
rename to dScripts/ai/MINIGAME/SG_GF/ZoneSGServer.h
diff --git a/dScripts/ai/NP/CMakeLists.txt b/dScripts/ai/NP/CMakeLists.txt
new file mode 100644
index 00000000..39a7301a
--- /dev/null
+++ b/dScripts/ai/NP/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_AI_NP 
+	"NpcNpSpacemanBob.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/NpcNpSpacemanBob.cpp b/dScripts/ai/NP/NpcNpSpacemanBob.cpp
similarity index 100%
rename from dScripts/NpcNpSpacemanBob.cpp
rename to dScripts/ai/NP/NpcNpSpacemanBob.cpp
diff --git a/dScripts/NpcNpSpacemanBob.h b/dScripts/ai/NP/NpcNpSpacemanBob.h
similarity index 100%
rename from dScripts/NpcNpSpacemanBob.h
rename to dScripts/ai/NP/NpcNpSpacemanBob.h
diff --git a/dScripts/ai/NS/CMakeLists.txt b/dScripts/ai/NS/CMakeLists.txt
new file mode 100644
index 00000000..e8ec84b1
--- /dev/null
+++ b/dScripts/ai/NS/CMakeLists.txt
@@ -0,0 +1,24 @@
+set(DSCRIPTS_SOURCES_AI_NS
+	"ClRing.cpp"
+	"NsConcertChoiceBuild.cpp"
+	"NsConcertInstrument.cpp"
+	"NsConcertQuickBuild.cpp"
+	"NsGetFactionMissionServer.cpp"
+	"NsJohnnyMissionServer.cpp"
+	"NsModularBuild.cpp"
+	"NsQbImaginationStatue.cpp"
+	"WhFans.cpp")
+
+add_subdirectory(NS_PP_01)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_NS_NS_PP_01})
+	set(DSCRIPTS_SOURCES_AI_NS ${DSCRIPTS_SOURCES_AI_NS} "NS_PP_01/${file}")
+endforeach()
+
+add_subdirectory(WH)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_NS_WH})
+	set(DSCRIPTS_SOURCES_AI_NS ${DSCRIPTS_SOURCES_AI_NS} "WH/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_AI_NS ${DSCRIPTS_SOURCES_AI_NS} PARENT_SCOPE)
diff --git a/dScripts/ClRing.cpp b/dScripts/ai/NS/ClRing.cpp
similarity index 100%
rename from dScripts/ClRing.cpp
rename to dScripts/ai/NS/ClRing.cpp
diff --git a/dScripts/ClRing.h b/dScripts/ai/NS/ClRing.h
similarity index 100%
rename from dScripts/ClRing.h
rename to dScripts/ai/NS/ClRing.h
diff --git a/dScripts/ai/NS/NS_PP_01/CMakeLists.txt b/dScripts/ai/NS/NS_PP_01/CMakeLists.txt
new file mode 100644
index 00000000..3f26c135
--- /dev/null
+++ b/dScripts/ai/NS/NS_PP_01/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_AI_NS_NS_PP_01 
+	"PropertyDeathPlane.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/PropertyDeathPlane.cpp b/dScripts/ai/NS/NS_PP_01/PropertyDeathPlane.cpp
similarity index 100%
rename from dScripts/PropertyDeathPlane.cpp
rename to dScripts/ai/NS/NS_PP_01/PropertyDeathPlane.cpp
diff --git a/dScripts/PropertyDeathPlane.h b/dScripts/ai/NS/NS_PP_01/PropertyDeathPlane.h
similarity index 100%
rename from dScripts/PropertyDeathPlane.h
rename to dScripts/ai/NS/NS_PP_01/PropertyDeathPlane.h
diff --git a/dScripts/NsConcertChoiceBuild.cpp b/dScripts/ai/NS/NsConcertChoiceBuild.cpp
similarity index 100%
rename from dScripts/NsConcertChoiceBuild.cpp
rename to dScripts/ai/NS/NsConcertChoiceBuild.cpp
diff --git a/dScripts/NsConcertChoiceBuild.h b/dScripts/ai/NS/NsConcertChoiceBuild.h
similarity index 100%
rename from dScripts/NsConcertChoiceBuild.h
rename to dScripts/ai/NS/NsConcertChoiceBuild.h
diff --git a/dScripts/NsConcertInstrument.cpp b/dScripts/ai/NS/NsConcertInstrument.cpp
similarity index 100%
rename from dScripts/NsConcertInstrument.cpp
rename to dScripts/ai/NS/NsConcertInstrument.cpp
diff --git a/dScripts/NsConcertInstrument.h b/dScripts/ai/NS/NsConcertInstrument.h
similarity index 100%
rename from dScripts/NsConcertInstrument.h
rename to dScripts/ai/NS/NsConcertInstrument.h
diff --git a/dScripts/NsConcertQuickBuild.cpp b/dScripts/ai/NS/NsConcertQuickBuild.cpp
similarity index 100%
rename from dScripts/NsConcertQuickBuild.cpp
rename to dScripts/ai/NS/NsConcertQuickBuild.cpp
diff --git a/dScripts/NsConcertQuickBuild.h b/dScripts/ai/NS/NsConcertQuickBuild.h
similarity index 100%
rename from dScripts/NsConcertQuickBuild.h
rename to dScripts/ai/NS/NsConcertQuickBuild.h
diff --git a/dScripts/NsGetFactionMissionServer.cpp b/dScripts/ai/NS/NsGetFactionMissionServer.cpp
similarity index 100%
rename from dScripts/NsGetFactionMissionServer.cpp
rename to dScripts/ai/NS/NsGetFactionMissionServer.cpp
diff --git a/dScripts/NsGetFactionMissionServer.h b/dScripts/ai/NS/NsGetFactionMissionServer.h
similarity index 100%
rename from dScripts/NsGetFactionMissionServer.h
rename to dScripts/ai/NS/NsGetFactionMissionServer.h
diff --git a/dScripts/NsJohnnyMissionServer.cpp b/dScripts/ai/NS/NsJohnnyMissionServer.cpp
similarity index 100%
rename from dScripts/NsJohnnyMissionServer.cpp
rename to dScripts/ai/NS/NsJohnnyMissionServer.cpp
diff --git a/dScripts/NsJohnnyMissionServer.h b/dScripts/ai/NS/NsJohnnyMissionServer.h
similarity index 100%
rename from dScripts/NsJohnnyMissionServer.h
rename to dScripts/ai/NS/NsJohnnyMissionServer.h
diff --git a/dScripts/NsModularBuild.cpp b/dScripts/ai/NS/NsModularBuild.cpp
similarity index 100%
rename from dScripts/NsModularBuild.cpp
rename to dScripts/ai/NS/NsModularBuild.cpp
diff --git a/dScripts/NsModularBuild.h b/dScripts/ai/NS/NsModularBuild.h
similarity index 100%
rename from dScripts/NsModularBuild.h
rename to dScripts/ai/NS/NsModularBuild.h
diff --git a/dScripts/NsQbImaginationStatue.cpp b/dScripts/ai/NS/NsQbImaginationStatue.cpp
similarity index 100%
rename from dScripts/NsQbImaginationStatue.cpp
rename to dScripts/ai/NS/NsQbImaginationStatue.cpp
diff --git a/dScripts/NsQbImaginationStatue.h b/dScripts/ai/NS/NsQbImaginationStatue.h
similarity index 100%
rename from dScripts/NsQbImaginationStatue.h
rename to dScripts/ai/NS/NsQbImaginationStatue.h
diff --git a/dScripts/ai/NS/WH/CMakeLists.txt b/dScripts/ai/NS/WH/CMakeLists.txt
new file mode 100644
index 00000000..179a417f
--- /dev/null
+++ b/dScripts/ai/NS/WH/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(DSCRIPTS_SOURCES_AI_NS_WH 
+	"RockHydrantSmashable.cpp"
+	"RockHydrantBroken.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/RockHydrantBroken.cpp b/dScripts/ai/NS/WH/RockHydrantBroken.cpp
similarity index 100%
rename from dScripts/RockHydrantBroken.cpp
rename to dScripts/ai/NS/WH/RockHydrantBroken.cpp
diff --git a/dScripts/RockHydrantBroken.h b/dScripts/ai/NS/WH/RockHydrantBroken.h
similarity index 100%
rename from dScripts/RockHydrantBroken.h
rename to dScripts/ai/NS/WH/RockHydrantBroken.h
diff --git a/dScripts/RockHydrantSmashable.cpp b/dScripts/ai/NS/WH/RockHydrantSmashable.cpp
similarity index 100%
rename from dScripts/RockHydrantSmashable.cpp
rename to dScripts/ai/NS/WH/RockHydrantSmashable.cpp
diff --git a/dScripts/RockHydrantSmashable.h b/dScripts/ai/NS/WH/RockHydrantSmashable.h
similarity index 100%
rename from dScripts/RockHydrantSmashable.h
rename to dScripts/ai/NS/WH/RockHydrantSmashable.h
diff --git a/dScripts/WhFans.cpp b/dScripts/ai/NS/WhFans.cpp
similarity index 100%
rename from dScripts/WhFans.cpp
rename to dScripts/ai/NS/WhFans.cpp
diff --git a/dScripts/WhFans.h b/dScripts/ai/NS/WhFans.h
similarity index 100%
rename from dScripts/WhFans.h
rename to dScripts/ai/NS/WhFans.h
diff --git a/dScripts/ai/PETS/CMakeLists.txt b/dScripts/ai/PETS/CMakeLists.txt
new file mode 100644
index 00000000..93a9012d
--- /dev/null
+++ b/dScripts/ai/PETS/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_AI_PETS 
+	"HydrantSmashable.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/HydrantSmashable.cpp b/dScripts/ai/PETS/HydrantSmashable.cpp
similarity index 100%
rename from dScripts/HydrantSmashable.cpp
rename to dScripts/ai/PETS/HydrantSmashable.cpp
diff --git a/dScripts/HydrantSmashable.h b/dScripts/ai/PETS/HydrantSmashable.h
similarity index 100%
rename from dScripts/HydrantSmashable.h
rename to dScripts/ai/PETS/HydrantSmashable.h
diff --git a/dScripts/AgPropGuard.cpp b/dScripts/ai/PROPERTY/AG/AgPropGuard.cpp
similarity index 100%
rename from dScripts/AgPropGuard.cpp
rename to dScripts/ai/PROPERTY/AG/AgPropGuard.cpp
diff --git a/dScripts/AgPropGuard.h b/dScripts/ai/PROPERTY/AG/AgPropGuard.h
similarity index 100%
rename from dScripts/AgPropGuard.h
rename to dScripts/ai/PROPERTY/AG/AgPropGuard.h
diff --git a/dScripts/ai/PROPERTY/AG/CMakeLists.txt b/dScripts/ai/PROPERTY/AG/CMakeLists.txt
new file mode 100644
index 00000000..f2139463
--- /dev/null
+++ b/dScripts/ai/PROPERTY/AG/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_AI_PROPERTY_AG 
+	"AgPropGuard.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/AgPropguards.cpp b/dScripts/ai/PROPERTY/AgPropguards.cpp
similarity index 100%
rename from dScripts/AgPropguards.cpp
rename to dScripts/ai/PROPERTY/AgPropguards.cpp
diff --git a/dScripts/AgPropguards.h b/dScripts/ai/PROPERTY/AgPropguards.h
similarity index 100%
rename from dScripts/AgPropguards.h
rename to dScripts/ai/PROPERTY/AgPropguards.h
diff --git a/dScripts/ai/PROPERTY/CMakeLists.txt b/dScripts/ai/PROPERTY/CMakeLists.txt
new file mode 100644
index 00000000..295137b4
--- /dev/null
+++ b/dScripts/ai/PROPERTY/CMakeLists.txt
@@ -0,0 +1,11 @@
+set(DSCRIPTS_SOURCES_AI_PROPERTY
+	"AgPropguards.cpp"
+	"PropertyFXDamage.cpp")
+
+add_subdirectory(AG)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_PROPERTY_AG})
+	set(DSCRIPTS_SOURCES_AI_PROPERTY ${DSCRIPTS_SOURCES_AI_PROPERTY} "AG/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_AI_PROPERTY ${DSCRIPTS_SOURCES_AI_PROPERTY} PARENT_SCOPE)
diff --git a/dScripts/PropertyFXDamage.cpp b/dScripts/ai/PROPERTY/PropertyFXDamage.cpp
similarity index 100%
rename from dScripts/PropertyFXDamage.cpp
rename to dScripts/ai/PROPERTY/PropertyFXDamage.cpp
diff --git a/dScripts/PropertyFXDamage.h b/dScripts/ai/PROPERTY/PropertyFXDamage.h
similarity index 100%
rename from dScripts/PropertyFXDamage.h
rename to dScripts/ai/PROPERTY/PropertyFXDamage.h
diff --git a/dScripts/ai/RACING/CMakeLists.txt b/dScripts/ai/RACING/CMakeLists.txt
new file mode 100644
index 00000000..0c1918de
--- /dev/null
+++ b/dScripts/ai/RACING/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(DSCRIPTS_SOURCES_AI_RACING)
+
+add_subdirectory(OBJECTS)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_RACING_OBJECTS})
+	set(DSCRIPTS_SOURCES_AI_RACING ${DSCRIPTS_SOURCES_AI_RACING} "OBJECTS/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_AI_RACING ${DSCRIPTS_SOURCES_AI_RACING} PARENT_SCOPE)
diff --git a/dScripts/ai/RACING/OBJECTS/CMakeLists.txt b/dScripts/ai/RACING/OBJECTS/CMakeLists.txt
new file mode 100644
index 00000000..4ef427d5
--- /dev/null
+++ b/dScripts/ai/RACING/OBJECTS/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(DSCRIPTS_SOURCES_AI_RACING_OBJECTS 
+	"RaceImagineCrateServer.cpp"
+	"RaceImaginePowerup.cpp"
+	"FvRaceSmashEggImagineServer.cpp"
+	"RaceSmashServer.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/FvRaceSmashEggImagineServer.cpp b/dScripts/ai/RACING/OBJECTS/FvRaceSmashEggImagineServer.cpp
similarity index 100%
rename from dScripts/FvRaceSmashEggImagineServer.cpp
rename to dScripts/ai/RACING/OBJECTS/FvRaceSmashEggImagineServer.cpp
diff --git a/dScripts/FvRaceSmashEggImagineServer.h b/dScripts/ai/RACING/OBJECTS/FvRaceSmashEggImagineServer.h
similarity index 100%
rename from dScripts/FvRaceSmashEggImagineServer.h
rename to dScripts/ai/RACING/OBJECTS/FvRaceSmashEggImagineServer.h
diff --git a/dScripts/RaceImagineCrateServer.cpp b/dScripts/ai/RACING/OBJECTS/RaceImagineCrateServer.cpp
similarity index 100%
rename from dScripts/RaceImagineCrateServer.cpp
rename to dScripts/ai/RACING/OBJECTS/RaceImagineCrateServer.cpp
diff --git a/dScripts/RaceImagineCrateServer.h b/dScripts/ai/RACING/OBJECTS/RaceImagineCrateServer.h
similarity index 100%
rename from dScripts/RaceImagineCrateServer.h
rename to dScripts/ai/RACING/OBJECTS/RaceImagineCrateServer.h
diff --git a/dScripts/RaceImaginePowerup.cpp b/dScripts/ai/RACING/OBJECTS/RaceImaginePowerup.cpp
similarity index 100%
rename from dScripts/RaceImaginePowerup.cpp
rename to dScripts/ai/RACING/OBJECTS/RaceImaginePowerup.cpp
diff --git a/dScripts/RaceImaginePowerup.h b/dScripts/ai/RACING/OBJECTS/RaceImaginePowerup.h
similarity index 100%
rename from dScripts/RaceImaginePowerup.h
rename to dScripts/ai/RACING/OBJECTS/RaceImaginePowerup.h
diff --git a/dScripts/RaceSmashServer.cpp b/dScripts/ai/RACING/OBJECTS/RaceSmashServer.cpp
similarity index 100%
rename from dScripts/RaceSmashServer.cpp
rename to dScripts/ai/RACING/OBJECTS/RaceSmashServer.cpp
diff --git a/dScripts/RaceSmashServer.h b/dScripts/ai/RACING/OBJECTS/RaceSmashServer.h
similarity index 100%
rename from dScripts/RaceSmashServer.h
rename to dScripts/ai/RACING/OBJECTS/RaceSmashServer.h
diff --git a/dScripts/ai/SPEC/CMakeLists.txt b/dScripts/ai/SPEC/CMakeLists.txt
new file mode 100644
index 00000000..c4c5b809
--- /dev/null
+++ b/dScripts/ai/SPEC/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_AI_SPEC 
+	"SpecialImaginePowerupSpawner.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/SpecialImaginePowerupSpawner.cpp b/dScripts/ai/SPEC/SpecialImaginePowerupSpawner.cpp
similarity index 100%
rename from dScripts/SpecialImaginePowerupSpawner.cpp
rename to dScripts/ai/SPEC/SpecialImaginePowerupSpawner.cpp
diff --git a/dScripts/SpecialImaginePowerupSpawner.h b/dScripts/ai/SPEC/SpecialImaginePowerupSpawner.h
similarity index 100%
rename from dScripts/SpecialImaginePowerupSpawner.h
rename to dScripts/ai/SPEC/SpecialImaginePowerupSpawner.h
diff --git a/dScripts/AllCrateChicken.cpp b/dScripts/ai/WILD/AllCrateChicken.cpp
similarity index 100%
rename from dScripts/AllCrateChicken.cpp
rename to dScripts/ai/WILD/AllCrateChicken.cpp
diff --git a/dScripts/AllCrateChicken.h b/dScripts/ai/WILD/AllCrateChicken.h
similarity index 100%
rename from dScripts/AllCrateChicken.h
rename to dScripts/ai/WILD/AllCrateChicken.h
diff --git a/dScripts/ai/WILD/CMakeLists.txt b/dScripts/ai/WILD/CMakeLists.txt
new file mode 100644
index 00000000..57470f72
--- /dev/null
+++ b/dScripts/ai/WILD/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(DSCRIPTS_SOURCES_AI_WILD 
+	"AllCrateChicken.cpp"
+	"WildAmbients.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/WildAmbients.cpp b/dScripts/ai/WILD/WildAmbients.cpp
similarity index 100%
rename from dScripts/WildAmbients.cpp
rename to dScripts/ai/WILD/WildAmbients.cpp
diff --git a/dScripts/WildAmbients.h b/dScripts/ai/WILD/WildAmbients.h
similarity index 100%
rename from dScripts/WildAmbients.h
rename to dScripts/ai/WILD/WildAmbients.h
diff --git a/dScripts/client/CMakeLists.txt b/dScripts/client/CMakeLists.txt
new file mode 100644
index 00000000..c2777508
--- /dev/null
+++ b/dScripts/client/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(DSCRIPTS_SOURCES_CLIENT)
+
+add_subdirectory(ai)
+
+foreach(file ${DSCRIPTS_SOURCES_CLIENT_AI})
+	set(DSCRIPTS_SOURCES_CLIENT ${DSCRIPTS_SOURCES_CLIENT} "ai/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_CLIENT ${DSCRIPTS_SOURCES_CLIENT} PARENT_SCOPE)
diff --git a/dScripts/client/ai/CMakeLists.txt b/dScripts/client/ai/CMakeLists.txt
new file mode 100644
index 00000000..c1358c57
--- /dev/null
+++ b/dScripts/client/ai/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(DSCRIPTS_SOURCES_CLIENT_AI)
+
+add_subdirectory(PR)
+
+foreach(file ${DSCRIPTS_SOURCES_CLIENT_AI_PR})
+	set(DSCRIPTS_SOURCES_CLIENT_AI ${DSCRIPTS_SOURCES_CLIENT_AI} "PR/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_CLIENT_AI ${DSCRIPTS_SOURCES_CLIENT_AI} PARENT_SCOPE)
diff --git a/dScripts/client/ai/PR/CMakeLists.txt b/dScripts/client/ai/PR/CMakeLists.txt
new file mode 100644
index 00000000..ef7d5d6a
--- /dev/null
+++ b/dScripts/client/ai/PR/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(DSCRIPTS_SOURCES_CLIENT_AI_PR 
+	"PrWhistle.cpp"
+	"CrabServer.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/CrabServer.cpp b/dScripts/client/ai/PR/CrabServer.cpp
similarity index 100%
rename from dScripts/CrabServer.cpp
rename to dScripts/client/ai/PR/CrabServer.cpp
diff --git a/dScripts/CrabServer.h b/dScripts/client/ai/PR/CrabServer.h
similarity index 100%
rename from dScripts/CrabServer.h
rename to dScripts/client/ai/PR/CrabServer.h
diff --git a/dScripts/PrWhistle.cpp b/dScripts/client/ai/PR/PrWhistle.cpp
similarity index 100%
rename from dScripts/PrWhistle.cpp
rename to dScripts/client/ai/PR/PrWhistle.cpp
diff --git a/dScripts/PrWhistle.h b/dScripts/client/ai/PR/PrWhistle.h
similarity index 100%
rename from dScripts/PrWhistle.h
rename to dScripts/client/ai/PR/PrWhistle.h
diff --git a/dScripts/zone/AG/CMakeLists.txt b/dScripts/zone/AG/CMakeLists.txt
new file mode 100644
index 00000000..14426a46
--- /dev/null
+++ b/dScripts/zone/AG/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_ZONE_AG 
+	"ZoneAgSurvival.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/ZoneAgSurvival.cpp b/dScripts/zone/AG/ZoneAgSurvival.cpp
similarity index 100%
rename from dScripts/ZoneAgSurvival.cpp
rename to dScripts/zone/AG/ZoneAgSurvival.cpp
diff --git a/dScripts/ZoneAgSurvival.h b/dScripts/zone/AG/ZoneAgSurvival.h
similarity index 100%
rename from dScripts/ZoneAgSurvival.h
rename to dScripts/zone/AG/ZoneAgSurvival.h
diff --git a/dScripts/zone/CMakeLists.txt b/dScripts/zone/CMakeLists.txt
new file mode 100644
index 00000000..5d800031
--- /dev/null
+++ b/dScripts/zone/CMakeLists.txt
@@ -0,0 +1,21 @@
+set(DSCRIPTS_SOURCES_ZONE)
+
+add_subdirectory(AG)
+
+foreach(file ${DSCRIPTS_SOURCES_ZONE_AG})
+	set(DSCRIPTS_SOURCES_ZONE ${DSCRIPTS_SOURCES_ZONE} "AG/${file}")
+endforeach()
+
+add_subdirectory(LUPs)
+
+foreach(file ${DSCRIPTS_SOURCES_ZONE_LUPS})
+	set(DSCRIPTS_SOURCES_ZONE ${DSCRIPTS_SOURCES_ZONE} "LUPs/${file}")
+endforeach()
+
+add_subdirectory(PROPERTY)
+
+foreach(file ${DSCRIPTS_SOURCES_ZONE_PROPERTY})
+	set(DSCRIPTS_SOURCES_ZONE ${DSCRIPTS_SOURCES_ZONE} "PROPERTY/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_ZONE ${DSCRIPTS_SOURCES_ZONE} PARENT_SCOPE)
diff --git a/dScripts/zone/LUPs/CMakeLists.txt b/dScripts/zone/LUPs/CMakeLists.txt
new file mode 100644
index 00000000..b3b55ad6
--- /dev/null
+++ b/dScripts/zone/LUPs/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_ZONE_LUPS 
+	"WblGenericZone.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/WblGenericZone.cpp b/dScripts/zone/LUPs/WblGenericZone.cpp
similarity index 100%
rename from dScripts/WblGenericZone.cpp
rename to dScripts/zone/LUPs/WblGenericZone.cpp
diff --git a/dScripts/WblGenericZone.h b/dScripts/zone/LUPs/WblGenericZone.h
similarity index 100%
rename from dScripts/WblGenericZone.h
rename to dScripts/zone/LUPs/WblGenericZone.h
diff --git a/dScripts/zone/PROPERTY/CMakeLists.txt b/dScripts/zone/PROPERTY/CMakeLists.txt
new file mode 100644
index 00000000..b0588181
--- /dev/null
+++ b/dScripts/zone/PROPERTY/CMakeLists.txt
@@ -0,0 +1,21 @@
+set(DSCRIPTS_SOURCES_ZONE_PROPERTY)
+
+add_subdirectory(FV)
+
+foreach(file ${DSCRIPTS_SOURCES_ZONE_PROPERTY_FV})
+	set(DSCRIPTS_SOURCES_ZONE_PROPERTY ${DSCRIPTS_SOURCES_ZONE_PROPERTY} "FV/${file}")
+endforeach()
+
+add_subdirectory(GF)
+
+foreach(file ${DSCRIPTS_SOURCES_ZONE_PROPERTY_GF})
+	set(DSCRIPTS_SOURCES_ZONE_PROPERTY ${DSCRIPTS_SOURCES_ZONE_PROPERTY} "GF/${file}")
+endforeach()
+
+add_subdirectory(NS)
+
+foreach(file ${DSCRIPTS_SOURCES_ZONE_PROPERTY_NS})
+	set(DSCRIPTS_SOURCES_ZONE_PROPERTY ${DSCRIPTS_SOURCES_ZONE_PROPERTY} "NS/${file}")
+endforeach()
+
+set(DSCRIPTS_SOURCES_ZONE_PROPERTY ${DSCRIPTS_SOURCES_ZONE_PROPERTY} PARENT_SCOPE)
diff --git a/dScripts/zone/PROPERTY/FV/CMakeLists.txt b/dScripts/zone/PROPERTY/FV/CMakeLists.txt
new file mode 100644
index 00000000..60da048d
--- /dev/null
+++ b/dScripts/zone/PROPERTY/FV/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_ZONE_PROPERTY_FV 
+	"ZoneFvProperty.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/ZoneFvProperty.cpp b/dScripts/zone/PROPERTY/FV/ZoneFvProperty.cpp
similarity index 100%
rename from dScripts/ZoneFvProperty.cpp
rename to dScripts/zone/PROPERTY/FV/ZoneFvProperty.cpp
diff --git a/dScripts/ZoneFvProperty.h b/dScripts/zone/PROPERTY/FV/ZoneFvProperty.h
similarity index 100%
rename from dScripts/ZoneFvProperty.h
rename to dScripts/zone/PROPERTY/FV/ZoneFvProperty.h
diff --git a/dScripts/zone/PROPERTY/GF/CMakeLists.txt b/dScripts/zone/PROPERTY/GF/CMakeLists.txt
new file mode 100644
index 00000000..fed6033b
--- /dev/null
+++ b/dScripts/zone/PROPERTY/GF/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_ZONE_PROPERTY_GF 
+	"ZoneGfProperty.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/ZoneGfProperty.cpp b/dScripts/zone/PROPERTY/GF/ZoneGfProperty.cpp
similarity index 100%
rename from dScripts/ZoneGfProperty.cpp
rename to dScripts/zone/PROPERTY/GF/ZoneGfProperty.cpp
diff --git a/dScripts/ZoneGfProperty.h b/dScripts/zone/PROPERTY/GF/ZoneGfProperty.h
similarity index 100%
rename from dScripts/ZoneGfProperty.h
rename to dScripts/zone/PROPERTY/GF/ZoneGfProperty.h
diff --git a/dScripts/zone/PROPERTY/NS/CMakeLists.txt b/dScripts/zone/PROPERTY/NS/CMakeLists.txt
new file mode 100644
index 00000000..0e1f392c
--- /dev/null
+++ b/dScripts/zone/PROPERTY/NS/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(DSCRIPTS_SOURCES_ZONE_PROPERTY_NS 
+	"ZoneNsProperty.cpp"
+	PARENT_SCOPE)
diff --git a/dScripts/ZoneNsProperty.cpp b/dScripts/zone/PROPERTY/NS/ZoneNsProperty.cpp
similarity index 100%
rename from dScripts/ZoneNsProperty.cpp
rename to dScripts/zone/PROPERTY/NS/ZoneNsProperty.cpp
diff --git a/dScripts/ZoneNsProperty.h b/dScripts/zone/PROPERTY/NS/ZoneNsProperty.h
similarity index 100%
rename from dScripts/ZoneNsProperty.h
rename to dScripts/zone/PROPERTY/NS/ZoneNsProperty.h
diff --git a/dWorldServer/WorldServer.cpp b/dWorldServer/WorldServer.cpp
index 89243d59..d4e55cb5 100644
--- a/dWorldServer/WorldServer.cpp
+++ b/dWorldServer/WorldServer.cpp
@@ -55,6 +55,7 @@
 #include "MasterPackets.h"
 #include "Player.h"
 #include "PropertyManagementComponent.h"
+#include "AssetManager.h"
 
 #include "ZCompression.h"
 
@@ -68,6 +69,8 @@ namespace Game {
 	dLocale* locale;
 	std::mt19937 randomEngine;
 
+	AssetManager* assetManager;
+
 	RakPeerInterface* chatServer;
 	SystemAddress chatSysAddr;
 }
@@ -142,9 +145,19 @@ int main(int argc, char** argv) {
 	Game::logger->SetLogDebugStatements(config.GetValue("log_debug_statements") == "1");
 	if (config.GetValue("disable_chat") == "1") chatDisabled = true;
 
+	try {
+		std::string client_path = config.GetValue("client_location");
+		if (client_path.empty()) client_path = "./res";
+		Game::assetManager = new AssetManager(client_path);
+	} catch (std::runtime_error& ex) {
+		Game::logger->Log("WorldServer", "Got an error while setting up assets: %s", ex.what());
+
+		return EXIT_FAILURE;
+	}
+
 	// Connect to CDClient
 	try {
-		CDClientDatabase::Connect("./res/CDServer.sqlite");
+		CDClientDatabase::Connect((Game::assetManager->GetResPath() / "CDServer.sqlite").string());
 	} catch (CppSQLite3Exception& e) {
 		Game::logger->Log("WorldServer", "Unable to connect to CDServer SQLite Database");
 		Game::logger->Log("WorldServer", "Error: %s", e.errorMessage());
@@ -189,7 +202,7 @@ int main(int argc, char** argv) {
 	ObjectIDManager::Instance()->Initialize();
 	UserManager::Instance()->Initialize();
 	LootGenerator::Instance();
-	Game::chatFilter = new dChatFilter("./res/chatplus_en_us", bool(std::stoi(config.GetValue("dont_generate_dcf"))));
+	Game::chatFilter = new dChatFilter(Game::assetManager->GetResPath().string() + "/chatplus_en_us", bool(std::stoi(config.GetValue("dont_generate_dcf"))));
 
 	Game::server = new dServer(masterIP, ourPort, instanceID, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::World, zoneID);
 
@@ -243,14 +256,14 @@ int main(int argc, char** argv) {
 			std::ifstream fileStream;
 
 			static const std::vector<std::string> aliases = {
-				"res/CDServers.fdb",
-				"res/cdserver.fdb",
-				"res/CDClient.fdb",
-				"res/cdclient.fdb",
+				"CDServers.fdb",
+				"cdserver.fdb",
+				"CDClient.fdb",
+				"cdclient.fdb",
 			};
 
 			for (const auto& file : aliases) {
-				fileStream.open(file, std::ios::binary | std::ios::in);
+				fileStream.open(Game::assetManager->GetResPath() / file, std::ios::binary | std::ios::in);
 				if (fileStream.is_open()) {
 					break;
 				}
diff --git a/dZoneManager/Level.cpp b/dZoneManager/Level.cpp
index f12adc56..dd38d208 100644
--- a/dZoneManager/Level.cpp
+++ b/dZoneManager/Level.cpp
@@ -13,17 +13,22 @@
 #include "EntityManager.h"
 #include "CDFeatureGatingTable.h"
 #include "CDClientManager.h"
+#include "AssetManager.h"
 
 Level::Level(Zone* parentZone, const std::string& filepath) {
 	m_ParentZone = parentZone;
-	std::ifstream file(filepath, std::ios_base::in | std::ios_base::binary);
-	if (file) {
-		ReadChunks(file);
-	} else {
+
+	auto buffer = Game::assetManager->GetFileAsBuffer(filepath.c_str());
+
+	if (!buffer.m_Success) {
 		Game::logger->Log("Level", "Failed to load %s", filepath.c_str());
+		return;
 	}
 
-	file.close();
+	std::istream file(&buffer);
+	ReadChunks(file);
+
+	buffer.close();
 }
 
 Level::~Level() {
@@ -41,7 +46,7 @@ const void Level::PrintAllObjects() {
 	}
 }
 
-void Level::ReadChunks(std::ifstream& file) {
+void Level::ReadChunks(std::istream& file) {
 	const uint32_t CHNK_HEADER = ('C' + ('H' << 8) + ('N' << 16) + ('K' << 24));
 
 	while (!file.eof()) {
@@ -139,7 +144,7 @@ void Level::ReadChunks(std::ifstream& file) {
 	}
 }
 
-void Level::ReadFileInfoChunk(std::ifstream& file, Header& header) {
+void Level::ReadFileInfoChunk(std::istream& file, Header& header) {
 	FileInfoChunk* fi = new FileInfoChunk;
 	BinaryIO::BinaryRead(file, fi->version);
 	BinaryIO::BinaryRead(file, fi->revision);
@@ -152,7 +157,7 @@ void Level::ReadFileInfoChunk(std::ifstream& file, Header& header) {
 	if (header.fileInfo->revision == 3452816845 && m_ParentZone->GetZoneID().GetMapID() == 1100) header.fileInfo->revision = 26;
 }
 
-void Level::ReadSceneObjectDataChunk(std::ifstream& file, Header& header) {
+void Level::ReadSceneObjectDataChunk(std::istream& file, Header& header) {
 	SceneObjectDataChunk* chunk = new SceneObjectDataChunk;
 	uint32_t objectsCount = 0;
 	BinaryIO::BinaryRead(file, objectsCount);
diff --git a/dZoneManager/Level.h b/dZoneManager/Level.h
index e724363f..83daeedb 100644
--- a/dZoneManager/Level.h
+++ b/dZoneManager/Level.h
@@ -67,7 +67,7 @@ private:
 	Zone* m_ParentZone;
 
 	//private functions:
-	void ReadChunks(std::ifstream& file);
-	void ReadFileInfoChunk(std::ifstream& file, Header& header);
-	void ReadSceneObjectDataChunk(std::ifstream& file, Header& header);
+	void ReadChunks(std::istream& file);
+	void ReadFileInfoChunk(std::istream& file, Header& header);
+	void ReadSceneObjectDataChunk(std::istream& file, Header& header);
 };
diff --git a/dZoneManager/Zone.cpp b/dZoneManager/Zone.cpp
index 08c08051..5d3a7879 100644
--- a/dZoneManager/Zone.cpp
+++ b/dZoneManager/Zone.cpp
@@ -7,6 +7,7 @@
 #include "GeneralUtils.h"
 #include "BinaryIO.h"
 
+#include "AssetManager.h"
 #include "CDClientManager.h"
 #include "CDZoneTableTable.h"
 #include "Spawner.h"
@@ -40,7 +41,8 @@ void Zone::LoadZoneIntoMemory() {
 	m_ZonePath = m_ZoneFilePath.substr(0, m_ZoneFilePath.rfind('/') + 1);
 	if (m_ZoneFilePath == "ERR") return;
 
-	std::ifstream file(m_ZoneFilePath, std::ios::binary);
+	AssetMemoryBuffer buffer = Game::assetManager->GetFileAsBuffer(m_ZoneFilePath.c_str());
+	std::istream file(&buffer);
 	if (file) {
 		BinaryIO::BinaryRead(file, m_ZoneFileFormatVersion);
 
@@ -144,17 +146,13 @@ void Zone::LoadZoneIntoMemory() {
 				}
 
 			}
-
-
-			//m_PathData.resize(m_PathDataLength);
-			//file.read((char*)&m_PathData[0], m_PathDataLength);
 		}
 	} else {
 		Game::logger->Log("Zone", "Failed to open: %s", m_ZoneFilePath.c_str());
 	}
 	m_ZonePath = m_ZoneFilePath.substr(0, m_ZoneFilePath.rfind('/') + 1);
 
-	file.close();
+	buffer.close();
 }
 
 std::string Zone::GetFilePathForZoneID() {
@@ -162,7 +160,7 @@ std::string Zone::GetFilePathForZoneID() {
 	CDZoneTableTable* zoneTable = CDClientManager::Instance()->GetTable<CDZoneTableTable>("ZoneTable");
 	const CDZoneTable* zone = zoneTable->Query(this->GetZoneID().GetMapID());
 	if (zone != nullptr) {
-		std::string toReturn = "./res/maps/" + zone->zoneName;
+		std::string toReturn = "maps/" + zone->zoneName;
 		std::transform(toReturn.begin(), toReturn.end(), toReturn.begin(), ::tolower);
 		return toReturn;
 	}
@@ -222,7 +220,7 @@ const void Zone::PrintAllGameObjects() {
 	}
 }
 
-void Zone::LoadScene(std::ifstream& file) {
+void Zone::LoadScene(std::istream& file) {
 	SceneRef scene;
 	scene.level = nullptr;
 	LWOSCENEID lwoSceneID(LWOZONEID_INVALID, 0);
@@ -264,10 +262,17 @@ void Zone::LoadScene(std::ifstream& file) {
 
 std::vector<LUTriggers::Trigger*> Zone::LoadLUTriggers(std::string triggerFile, LWOSCENEID sceneID) {
 	std::vector<LUTriggers::Trigger*> lvlTriggers;
-	std::ifstream file(m_ZonePath + triggerFile);
+
+	auto buffer = Game::assetManager->GetFileAsBuffer((m_ZonePath + triggerFile).c_str());
+
+	if (!buffer.m_Success) return lvlTriggers;
+
+	std::istream file(&buffer);
 	std::stringstream data;
 	data << file.rdbuf();
 
+	buffer.close();
+
 	if (data.str().size() == 0) return lvlTriggers;
 
 	tinyxml2::XMLDocument* doc = new tinyxml2::XMLDocument();
@@ -336,7 +341,7 @@ const Path* Zone::GetPath(std::string name) const {
 	return nullptr;
 }
 
-void Zone::LoadSceneTransition(std::ifstream& file) {
+void Zone::LoadSceneTransition(std::istream& file) {
 	SceneTransition sceneTrans;
 	if (m_ZoneFileFormatVersion < Zone::ZoneFileFormatVersion::Auramar) {
 		uint8_t length;
@@ -355,14 +360,14 @@ void Zone::LoadSceneTransition(std::ifstream& file) {
 	m_SceneTransitions.push_back(sceneTrans);
 }
 
-SceneTransitionInfo Zone::LoadSceneTransitionInfo(std::ifstream& file) {
+SceneTransitionInfo Zone::LoadSceneTransitionInfo(std::istream& file) {
 	SceneTransitionInfo info;
 	BinaryIO::BinaryRead(file, info.sceneID);
 	BinaryIO::BinaryRead(file, info.position);
 	return info;
 }
 
-void Zone::LoadPath(std::ifstream& file) {
+void Zone::LoadPath(std::istream& file) {
 	// Currently only spawner (type 4) paths are supported
 	Path path = Path();
 
diff --git a/dZoneManager/Zone.h b/dZoneManager/Zone.h
index 50530273..f041b616 100644
--- a/dZoneManager/Zone.h
+++ b/dZoneManager/Zone.h
@@ -225,9 +225,9 @@ private:
 	std::map<LWOSCENEID, uint32_t, mapCompareLwoSceneIDs> m_MapRevisions; //rhs is the revision!
 
 	//private ("helper") functions:
-	void LoadScene(std::ifstream& file);
+	void LoadScene(std::istream& file);
 	std::vector<LUTriggers::Trigger*> LoadLUTriggers(std::string triggerFile, LWOSCENEID sceneID);
-	void LoadSceneTransition(std::ifstream& file);
-	SceneTransitionInfo LoadSceneTransitionInfo(std::ifstream& file);
-	void LoadPath(std::ifstream& file);
+	void LoadSceneTransition(std::istream& file);
+	SceneTransitionInfo LoadSceneTransitionInfo(std::istream& file);
+	void LoadPath(std::istream& file);
 };
diff --git a/migrations/dlu/6_property_behaviors.sql b/migrations/dlu/6_property_behaviors.sql
new file mode 100644
index 00000000..b858db67
--- /dev/null
+++ b/migrations/dlu/6_property_behaviors.sql
@@ -0,0 +1,11 @@
+ALTER TABLE properties_contents
+	ADD COLUMN model_name TEXT NOT NULL DEFAULT "",
+	ADD COLUMN model_description TEXT NOT NULL DEFAULT "",
+	ADD COLUMN behavior_1 INT NOT NULL DEFAULT 0,
+	ADD COLUMN behavior_2 INT NOT NULL DEFAULT 0,
+	ADD COLUMN behavior_3 INT NOT NULL DEFAULT 0,
+	ADD COLUMN behavior_4 INT NOT NULL DEFAULT 0,
+	ADD COLUMN behavior_5 INT NOT NULL DEFAULT 0;
+
+UPDATE properties_contents SET model_name = CONCAT("Objects_", lot, "_name") WHERE model_name = "";
+CREATE TABLE IF NOT EXISTS behaviors (id INT NOT NULL, behavior_info TEXT NOT NULL);
diff --git a/resources/sharedconfig.ini b/resources/sharedconfig.ini
index 1a377d28..847a6b7c 100644
--- a/resources/sharedconfig.ini
+++ b/resources/sharedconfig.ini
@@ -21,3 +21,7 @@ max_clients=999
 
 # Where to put crashlogs
 dump_folder=
+
+# The location of the client
+# Either the folder with /res or with /client and /versions
+client_location=