diff --git a/scripts/native/CMakeLists.txt b/scripts/native/CMakeLists.txt
index b7b5de1e..a4cb50bb 100644
--- a/scripts/native/CMakeLists.txt
+++ b/scripts/native/CMakeLists.txt
@@ -5,7 +5,7 @@ file(GLOB SCRIPT_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
 file(GLOB_RECURSE SCRIPT_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
 
 include_directories("${CMAKE_SOURCE_DIR}/src/servers/")
-include_directories("${CMAKE_SOURCE_DIR}/src/servers/Server_Zone/")
+include_directories("${CMAKE_SOURCE_DIR}/src/servers/sapphire_zone/")
 
 if(MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Yc${CMAKE_CURRENT_SOURCE_DIR}/ScriptObject.h /FI${CMAKE_CURRENT_SOURCE_DIR}/ScriptObject.h")
@@ -37,11 +37,11 @@ foreach(_sourcefile ${SCRIPT_FILES})
         )
     endif()
 
-    target_link_libraries("${_file}" server_zone)
+    target_link_libraries("${_file}" sapphire_zone)
 
     add_custom_command(TARGET "${_file}" POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/${_file}.exp"
         COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/${_file}.lib"
         COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/${_file}.ilk"
     )
-endforeach(_sourcefile ${SCRIPT_FILES})
\ No newline at end of file
+endforeach(_sourcefile ${SCRIPT_FILES})
diff --git a/src/common/Version.cpp b/src/common/Version.cpp
index 80a9ba46..03ec7020 100644
--- a/src/common/Version.cpp
+++ b/src/common/Version.cpp
@@ -3,7 +3,7 @@
 namespace Core { 
     namespace Version {
 
-    const std::string GIT_HASH = "4606e83d151f02fa17e98e832c01b3680987b5f5";
+    const std::string GIT_HASH = "232d9cd1addda0a363375b86054cc479fc69b2ef";
     const std::string VERSION = "-128-NOTFOUND";
 
    } /* Version */
diff --git a/src/servers/CMakeLists.txt b/src/servers/CMakeLists.txt
index afd85d75..82613bd6 100644
--- a/src/servers/CMakeLists.txt
+++ b/src/servers/CMakeLists.txt
@@ -9,6 +9,6 @@ set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
 include_directories("${PROJECT_INCLUDE_DIR}")
 include_directories("${PROJECT_SOURCE_DIR}")
 
-add_subdirectory(${PROJECT_SOURCE_DIR}/Server_Lobby)
-add_subdirectory(${PROJECT_SOURCE_DIR}/Server_REST)
-add_subdirectory(${PROJECT_SOURCE_DIR}/Server_Zone)
+add_subdirectory(${PROJECT_SOURCE_DIR}/sapphire_lobby)
+add_subdirectory(${PROJECT_SOURCE_DIR}/sapphire_api)
+add_subdirectory(${PROJECT_SOURCE_DIR}/sapphire_zone)
diff --git a/src/servers/Server_REST/CMakeLists.txt b/src/servers/sapphire_api/CMakeLists.txt
similarity index 68%
rename from src/servers/Server_REST/CMakeLists.txt
rename to src/servers/sapphire_api/CMakeLists.txt
index 52d0cd75..21fd736e 100644
--- a/src/servers/Server_REST/CMakeLists.txt
+++ b/src/servers/sapphire_api/CMakeLists.txt
@@ -6,10 +6,10 @@ file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
 file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
-add_executable(server_rest ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
-add_dependencies(server_rest common xivdat)
+add_executable(sapphire_api ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
+add_dependencies(sapphire_api common xivdat)
 
-set_target_properties(server_rest PROPERTIES
+set_target_properties(sapphire_api PROPERTIES
     CXX_STANDARD 14
     CXX_STANDARD_REQUIRED ON
     CXX_EXTENSIONS ON
@@ -21,13 +21,13 @@ set_target_properties(server_rest PROPERTIES
 )
 
 if (UNIX)
-  target_link_libraries (server_rest common xivdat pthread mysqlclient mysqlConnector dl z)
+  target_link_libraries (sapphire_api common xivdat pthread mysqlclient mysqlConnector dl z)
 else()
   # ignore unchecked iterators warnings from msvc
   add_definitions(-D_SCL_SECURE_NO_WARNINGS)
 
-  target_link_libraries (server_rest common xivdat libmysql mysqlConnector zlib1)
+  target_link_libraries (sapphire_api common xivdat libmysql mysqlConnector zlib1)
 
 endif()
 
-target_link_libraries( server_rest ${Boost_LIBRARIES} ${Boost_LIBRARIES} )
+target_link_libraries( sapphire_api ${Boost_LIBRARIES} ${Boost_LIBRARIES} )
diff --git a/src/servers/Server_REST/Forwards.h b/src/servers/sapphire_api/Forwards.h
similarity index 100%
rename from src/servers/Server_REST/Forwards.h
rename to src/servers/sapphire_api/Forwards.h
diff --git a/src/servers/Server_REST/LoginSession.cpp b/src/servers/sapphire_api/LoginSession.cpp
similarity index 100%
rename from src/servers/Server_REST/LoginSession.cpp
rename to src/servers/sapphire_api/LoginSession.cpp
diff --git a/src/servers/Server_REST/LoginSession.h b/src/servers/sapphire_api/LoginSession.h
similarity index 100%
rename from src/servers/Server_REST/LoginSession.h
rename to src/servers/sapphire_api/LoginSession.h
diff --git a/src/servers/Server_REST/PlayerMinimal.cpp b/src/servers/sapphire_api/PlayerMinimal.cpp
similarity index 100%
rename from src/servers/Server_REST/PlayerMinimal.cpp
rename to src/servers/sapphire_api/PlayerMinimal.cpp
diff --git a/src/servers/Server_REST/PlayerMinimal.h b/src/servers/sapphire_api/PlayerMinimal.h
similarity index 100%
rename from src/servers/Server_REST/PlayerMinimal.h
rename to src/servers/sapphire_api/PlayerMinimal.h
diff --git a/src/servers/Server_REST/SapphireAPI.cpp b/src/servers/sapphire_api/SapphireAPI.cpp
similarity index 100%
rename from src/servers/Server_REST/SapphireAPI.cpp
rename to src/servers/sapphire_api/SapphireAPI.cpp
diff --git a/src/servers/Server_REST/SapphireAPI.h b/src/servers/sapphire_api/SapphireAPI.h
similarity index 100%
rename from src/servers/Server_REST/SapphireAPI.h
rename to src/servers/sapphire_api/SapphireAPI.h
diff --git a/src/servers/Server_REST/Session.cpp b/src/servers/sapphire_api/Session.cpp
similarity index 100%
rename from src/servers/Server_REST/Session.cpp
rename to src/servers/sapphire_api/Session.cpp
diff --git a/src/servers/Server_REST/Session.h b/src/servers/sapphire_api/Session.h
similarity index 100%
rename from src/servers/Server_REST/Session.h
rename to src/servers/sapphire_api/Session.h
diff --git a/src/servers/Server_REST/client_http.hpp b/src/servers/sapphire_api/client_http.hpp
similarity index 100%
rename from src/servers/Server_REST/client_http.hpp
rename to src/servers/sapphire_api/client_http.hpp
diff --git a/src/servers/Server_REST/main.cpp b/src/servers/sapphire_api/main.cpp
similarity index 100%
rename from src/servers/Server_REST/main.cpp
rename to src/servers/sapphire_api/main.cpp
diff --git a/src/servers/Server_REST/server_http.hpp b/src/servers/sapphire_api/server_http.hpp
similarity index 100%
rename from src/servers/Server_REST/server_http.hpp
rename to src/servers/sapphire_api/server_http.hpp
diff --git a/src/servers/Server_Lobby/CMakeLists.txt b/src/servers/sapphire_lobby/CMakeLists.txt
similarity index 65%
rename from src/servers/Server_Lobby/CMakeLists.txt
rename to src/servers/sapphire_lobby/CMakeLists.txt
index 5df73b16..1674c61d 100644
--- a/src/servers/Server_Lobby/CMakeLists.txt
+++ b/src/servers/sapphire_lobby/CMakeLists.txt
@@ -7,10 +7,10 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
 
-add_executable(server_lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
-add_dependencies(server_lobby common xivdat)
+add_executable(sapphire_lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
+add_dependencies(sapphire_lobby common xivdat)
 
-set_target_properties(server_lobby PROPERTIES
+set_target_properties(sapphire_lobby PROPERTIES
     CXX_STANDARD 14
     CXX_STANDARD_REQUIRED ON
     CXX_EXTENSIONS ON
@@ -22,9 +22,9 @@ set_target_properties(server_lobby PROPERTIES
 )
 
 if (UNIX)
-  target_link_libraries(server_lobby common xivdat pthread mysqlclient mysqlConnector dl z)
+  target_link_libraries(sapphire_lobby common xivdat pthread mysqlclient mysqlConnector dl z)
 else()
-  target_link_libraries(server_lobby common xivdat libmysql mysqlConnector zlib1)
+  target_link_libraries(sapphire_lobby common xivdat libmysql mysqlConnector zlib1)
 endif()
 
-target_link_libraries(server_lobby ${Boost_LIBRARIES} ${Boost_LIBRARIES})
+target_link_libraries(sapphire_lobby ${Boost_LIBRARIES} ${Boost_LIBRARIES})
diff --git a/src/servers/Server_Lobby/Forwards.h b/src/servers/sapphire_lobby/Forwards.h
similarity index 100%
rename from src/servers/Server_Lobby/Forwards.h
rename to src/servers/sapphire_lobby/Forwards.h
diff --git a/src/servers/Server_Lobby/GameConnection.cpp b/src/servers/sapphire_lobby/GameConnection.cpp
similarity index 100%
rename from src/servers/Server_Lobby/GameConnection.cpp
rename to src/servers/sapphire_lobby/GameConnection.cpp
diff --git a/src/servers/Server_Lobby/GameConnection.h b/src/servers/sapphire_lobby/GameConnection.h
similarity index 100%
rename from src/servers/Server_Lobby/GameConnection.h
rename to src/servers/sapphire_lobby/GameConnection.h
diff --git a/src/servers/Server_Lobby/LobbyPacketContainer.cpp b/src/servers/sapphire_lobby/LobbyPacketContainer.cpp
similarity index 100%
rename from src/servers/Server_Lobby/LobbyPacketContainer.cpp
rename to src/servers/sapphire_lobby/LobbyPacketContainer.cpp
diff --git a/src/servers/Server_Lobby/LobbyPacketContainer.h b/src/servers/sapphire_lobby/LobbyPacketContainer.h
similarity index 100%
rename from src/servers/Server_Lobby/LobbyPacketContainer.h
rename to src/servers/sapphire_lobby/LobbyPacketContainer.h
diff --git a/src/servers/Server_Lobby/LobbySession.cpp b/src/servers/sapphire_lobby/LobbySession.cpp
similarity index 100%
rename from src/servers/Server_Lobby/LobbySession.cpp
rename to src/servers/sapphire_lobby/LobbySession.cpp
diff --git a/src/servers/Server_Lobby/LobbySession.h b/src/servers/sapphire_lobby/LobbySession.h
similarity index 100%
rename from src/servers/Server_Lobby/LobbySession.h
rename to src/servers/sapphire_lobby/LobbySession.h
diff --git a/src/servers/Server_Lobby/RestConnector.cpp b/src/servers/sapphire_lobby/RestConnector.cpp
similarity index 100%
rename from src/servers/Server_Lobby/RestConnector.cpp
rename to src/servers/sapphire_lobby/RestConnector.cpp
diff --git a/src/servers/Server_Lobby/RestConnector.h b/src/servers/sapphire_lobby/RestConnector.h
similarity index 100%
rename from src/servers/Server_Lobby/RestConnector.h
rename to src/servers/sapphire_lobby/RestConnector.h
diff --git a/src/servers/Server_Lobby/ServerLobby.cpp b/src/servers/sapphire_lobby/ServerLobby.cpp
similarity index 100%
rename from src/servers/Server_Lobby/ServerLobby.cpp
rename to src/servers/sapphire_lobby/ServerLobby.cpp
diff --git a/src/servers/Server_Lobby/ServerLobby.h b/src/servers/sapphire_lobby/ServerLobby.h
similarity index 100%
rename from src/servers/Server_Lobby/ServerLobby.h
rename to src/servers/sapphire_lobby/ServerLobby.h
diff --git a/src/servers/Server_Lobby/client_http.hpp b/src/servers/sapphire_lobby/client_http.hpp
similarity index 100%
rename from src/servers/Server_Lobby/client_http.hpp
rename to src/servers/sapphire_lobby/client_http.hpp
diff --git a/src/servers/Server_Lobby/mainLobbyServer.cpp b/src/servers/sapphire_lobby/mainLobbyServer.cpp
similarity index 100%
rename from src/servers/Server_Lobby/mainLobbyServer.cpp
rename to src/servers/sapphire_lobby/mainLobbyServer.cpp
diff --git a/src/servers/Server_Zone/Action/Action.cpp b/src/servers/sapphire_zone/Action/Action.cpp
similarity index 100%
rename from src/servers/Server_Zone/Action/Action.cpp
rename to src/servers/sapphire_zone/Action/Action.cpp
diff --git a/src/servers/Server_Zone/Action/Action.h b/src/servers/sapphire_zone/Action/Action.h
similarity index 100%
rename from src/servers/Server_Zone/Action/Action.h
rename to src/servers/sapphire_zone/Action/Action.h
diff --git a/src/servers/Server_Zone/Action/ActionCast.cpp b/src/servers/sapphire_zone/Action/ActionCast.cpp
similarity index 100%
rename from src/servers/Server_Zone/Action/ActionCast.cpp
rename to src/servers/sapphire_zone/Action/ActionCast.cpp
diff --git a/src/servers/Server_Zone/Action/ActionCast.h b/src/servers/sapphire_zone/Action/ActionCast.h
similarity index 100%
rename from src/servers/Server_Zone/Action/ActionCast.h
rename to src/servers/sapphire_zone/Action/ActionCast.h
diff --git a/src/servers/Server_Zone/Action/ActionCollision.cpp b/src/servers/sapphire_zone/Action/ActionCollision.cpp
similarity index 100%
rename from src/servers/Server_Zone/Action/ActionCollision.cpp
rename to src/servers/sapphire_zone/Action/ActionCollision.cpp
diff --git a/src/servers/Server_Zone/Action/ActionCollision.h b/src/servers/sapphire_zone/Action/ActionCollision.h
similarity index 100%
rename from src/servers/Server_Zone/Action/ActionCollision.h
rename to src/servers/sapphire_zone/Action/ActionCollision.h
diff --git a/src/servers/Server_Zone/Action/ActionMount.cpp b/src/servers/sapphire_zone/Action/ActionMount.cpp
similarity index 100%
rename from src/servers/Server_Zone/Action/ActionMount.cpp
rename to src/servers/sapphire_zone/Action/ActionMount.cpp
diff --git a/src/servers/Server_Zone/Action/ActionMount.h b/src/servers/sapphire_zone/Action/ActionMount.h
similarity index 100%
rename from src/servers/Server_Zone/Action/ActionMount.h
rename to src/servers/sapphire_zone/Action/ActionMount.h
diff --git a/src/servers/Server_Zone/Action/ActionTeleport.cpp b/src/servers/sapphire_zone/Action/ActionTeleport.cpp
similarity index 100%
rename from src/servers/Server_Zone/Action/ActionTeleport.cpp
rename to src/servers/sapphire_zone/Action/ActionTeleport.cpp
diff --git a/src/servers/Server_Zone/Action/ActionTeleport.h b/src/servers/sapphire_zone/Action/ActionTeleport.h
similarity index 100%
rename from src/servers/Server_Zone/Action/ActionTeleport.h
rename to src/servers/sapphire_zone/Action/ActionTeleport.h
diff --git a/src/servers/Server_Zone/Action/EventAction.cpp b/src/servers/sapphire_zone/Action/EventAction.cpp
similarity index 100%
rename from src/servers/Server_Zone/Action/EventAction.cpp
rename to src/servers/sapphire_zone/Action/EventAction.cpp
diff --git a/src/servers/Server_Zone/Action/EventAction.h b/src/servers/sapphire_zone/Action/EventAction.h
similarity index 100%
rename from src/servers/Server_Zone/Action/EventAction.h
rename to src/servers/sapphire_zone/Action/EventAction.h
diff --git a/src/servers/Server_Zone/Action/EventItemAction.cpp b/src/servers/sapphire_zone/Action/EventItemAction.cpp
similarity index 100%
rename from src/servers/Server_Zone/Action/EventItemAction.cpp
rename to src/servers/sapphire_zone/Action/EventItemAction.cpp
diff --git a/src/servers/Server_Zone/Action/EventItemAction.h b/src/servers/sapphire_zone/Action/EventItemAction.h
similarity index 100%
rename from src/servers/Server_Zone/Action/EventItemAction.h
rename to src/servers/sapphire_zone/Action/EventItemAction.h
diff --git a/src/servers/Server_Zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp
similarity index 100%
rename from src/servers/Server_Zone/Actor/Actor.cpp
rename to src/servers/sapphire_zone/Actor/Actor.cpp
diff --git a/src/servers/Server_Zone/Actor/Actor.h b/src/servers/sapphire_zone/Actor/Actor.h
similarity index 100%
rename from src/servers/Server_Zone/Actor/Actor.h
rename to src/servers/sapphire_zone/Actor/Actor.h
diff --git a/src/servers/Server_Zone/Actor/BattleNpc.cpp b/src/servers/sapphire_zone/Actor/BattleNpc.cpp
similarity index 100%
rename from src/servers/Server_Zone/Actor/BattleNpc.cpp
rename to src/servers/sapphire_zone/Actor/BattleNpc.cpp
diff --git a/src/servers/Server_Zone/Actor/BattleNpc.h b/src/servers/sapphire_zone/Actor/BattleNpc.h
similarity index 100%
rename from src/servers/Server_Zone/Actor/BattleNpc.h
rename to src/servers/sapphire_zone/Actor/BattleNpc.h
diff --git a/src/servers/Server_Zone/Actor/BattleNpcTemplate.cpp b/src/servers/sapphire_zone/Actor/BattleNpcTemplate.cpp
similarity index 100%
rename from src/servers/Server_Zone/Actor/BattleNpcTemplate.cpp
rename to src/servers/sapphire_zone/Actor/BattleNpcTemplate.cpp
diff --git a/src/servers/Server_Zone/Actor/BattleNpcTemplate.h b/src/servers/sapphire_zone/Actor/BattleNpcTemplate.h
similarity index 100%
rename from src/servers/Server_Zone/Actor/BattleNpcTemplate.h
rename to src/servers/sapphire_zone/Actor/BattleNpcTemplate.h
diff --git a/src/servers/Server_Zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
similarity index 100%
rename from src/servers/Server_Zone/Actor/Player.cpp
rename to src/servers/sapphire_zone/Actor/Player.cpp
diff --git a/src/servers/Server_Zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
similarity index 100%
rename from src/servers/Server_Zone/Actor/Player.h
rename to src/servers/sapphire_zone/Actor/Player.h
diff --git a/src/servers/Server_Zone/Actor/PlayerEvent.cpp b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
similarity index 100%
rename from src/servers/Server_Zone/Actor/PlayerEvent.cpp
rename to src/servers/sapphire_zone/Actor/PlayerEvent.cpp
diff --git a/src/servers/Server_Zone/Actor/PlayerInventory.cpp b/src/servers/sapphire_zone/Actor/PlayerInventory.cpp
similarity index 100%
rename from src/servers/Server_Zone/Actor/PlayerInventory.cpp
rename to src/servers/sapphire_zone/Actor/PlayerInventory.cpp
diff --git a/src/servers/Server_Zone/Actor/PlayerQuest.cpp b/src/servers/sapphire_zone/Actor/PlayerQuest.cpp
similarity index 99%
rename from src/servers/Server_Zone/Actor/PlayerQuest.cpp
rename to src/servers/sapphire_zone/Actor/PlayerQuest.cpp
index 14246254..3a4c144d 100644
--- a/src/servers/Server_Zone/Actor/PlayerQuest.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerQuest.cpp
@@ -8,9 +8,9 @@
 
 #include "Network/PacketWrappers/QuestMessagePacket.h"
 
-#include "Server_Zone/Session.h"
+#include "Session.h"
+#include "Inventory/Inventory.h"
 #include "Player.h"
-#include "Server_Zone/Inventory/Inventory.h"
 
 extern Core::Data::ExdData g_exdData;
 
diff --git a/src/servers/Server_Zone/Actor/PlayerSql.cpp b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
similarity index 100%
rename from src/servers/Server_Zone/Actor/PlayerSql.cpp
rename to src/servers/sapphire_zone/Actor/PlayerSql.cpp
diff --git a/src/servers/Server_Zone/CMakeLists.txt b/src/servers/sapphire_zone/CMakeLists.txt
similarity index 77%
rename from src/servers/Server_Zone/CMakeLists.txt
rename to src/servers/sapphire_zone/CMakeLists.txt
index a310748c..c091712d 100644
--- a/src/servers/Server_Zone/CMakeLists.txt
+++ b/src/servers/sapphire_zone/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
 cmake_policy(SET CMP0015 NEW)
 cmake_policy(SET CMP0014 OLD)
 
-project(Sapphire_Zone)
+project(sapphire_zone)
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
 
 file(GLOB SERVER_PUBLIC_INCLUDE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -39,10 +39,10 @@ file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
 
-add_executable(server_zone ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} )
-add_dependencies(server_zone common xivdat mysqlConnector )
+add_executable(sapphire_zone ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} )
+add_dependencies(sapphire_zone common xivdat mysqlConnector )
 
-set_target_properties(server_zone PROPERTIES
+set_target_properties(sapphire_zone PROPERTIES
     CXX_STANDARD 14
     CXX_STANDARD_REQUIRED ON
     CXX_EXTENSIONS ON
@@ -56,9 +56,9 @@ set_target_properties(server_zone PROPERTIES
 )
 
 if (UNIX)
-  target_link_libraries ( server_zone common xivdat pthread mysqlclient mysqlConnector dl z )
+  target_link_libraries ( sapphire_zone common xivdat pthread mysqlclient mysqlConnector dl z )
 else()
-  target_link_libraries ( server_zone common xivdat libmysql zlib1 mysqlConnector )
+  target_link_libraries ( sapphire_zone common xivdat libmysql zlib1 mysqlConnector )
 endif()
 
-target_link_libraries(server_zone ${Boost_LIBRARIES} )
+target_link_libraries( sapphire_zone ${Boost_LIBRARIES} )
diff --git a/src/servers/Server_Zone/ContentFinder/ContentFinder.cpp b/src/servers/sapphire_zone/ContentFinder/ContentFinder.cpp
similarity index 100%
rename from src/servers/Server_Zone/ContentFinder/ContentFinder.cpp
rename to src/servers/sapphire_zone/ContentFinder/ContentFinder.cpp
diff --git a/src/servers/Server_Zone/ContentFinder/ContentFinder.h b/src/servers/sapphire_zone/ContentFinder/ContentFinder.h
similarity index 100%
rename from src/servers/Server_Zone/ContentFinder/ContentFinder.h
rename to src/servers/sapphire_zone/ContentFinder/ContentFinder.h
diff --git a/src/servers/Server_Zone/DebugCommand/DebugCommand.h b/src/servers/sapphire_zone/DebugCommand/DebugCommand.h
similarity index 100%
rename from src/servers/Server_Zone/DebugCommand/DebugCommand.h
rename to src/servers/sapphire_zone/DebugCommand/DebugCommand.h
diff --git a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
similarity index 100%
rename from src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
rename to src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
diff --git a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.h
similarity index 100%
rename from src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h
rename to src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.h
diff --git a/src/servers/Server_Zone/Event/Event.cpp b/src/servers/sapphire_zone/Event/Event.cpp
similarity index 100%
rename from src/servers/Server_Zone/Event/Event.cpp
rename to src/servers/sapphire_zone/Event/Event.cpp
diff --git a/src/servers/Server_Zone/Event/Event.h b/src/servers/sapphire_zone/Event/Event.h
similarity index 100%
rename from src/servers/Server_Zone/Event/Event.h
rename to src/servers/sapphire_zone/Event/Event.h
diff --git a/src/servers/Server_Zone/Event/EventHelper.cpp b/src/servers/sapphire_zone/Event/EventHelper.cpp
similarity index 100%
rename from src/servers/Server_Zone/Event/EventHelper.cpp
rename to src/servers/sapphire_zone/Event/EventHelper.cpp
diff --git a/src/servers/Server_Zone/Event/EventHelper.h b/src/servers/sapphire_zone/Event/EventHelper.h
similarity index 100%
rename from src/servers/Server_Zone/Event/EventHelper.h
rename to src/servers/sapphire_zone/Event/EventHelper.h
diff --git a/src/servers/Server_Zone/Forwards.h b/src/servers/sapphire_zone/Forwards.h
similarity index 100%
rename from src/servers/Server_Zone/Forwards.h
rename to src/servers/sapphire_zone/Forwards.h
diff --git a/src/servers/Server_Zone/Inventory/Inventory.cpp b/src/servers/sapphire_zone/Inventory/Inventory.cpp
similarity index 100%
rename from src/servers/Server_Zone/Inventory/Inventory.cpp
rename to src/servers/sapphire_zone/Inventory/Inventory.cpp
diff --git a/src/servers/Server_Zone/Inventory/Inventory.h b/src/servers/sapphire_zone/Inventory/Inventory.h
similarity index 100%
rename from src/servers/Server_Zone/Inventory/Inventory.h
rename to src/servers/sapphire_zone/Inventory/Inventory.h
diff --git a/src/servers/Server_Zone/Inventory/Item.cpp b/src/servers/sapphire_zone/Inventory/Item.cpp
similarity index 100%
rename from src/servers/Server_Zone/Inventory/Item.cpp
rename to src/servers/sapphire_zone/Inventory/Item.cpp
diff --git a/src/servers/Server_Zone/Inventory/Item.h b/src/servers/sapphire_zone/Inventory/Item.h
similarity index 100%
rename from src/servers/Server_Zone/Inventory/Item.h
rename to src/servers/sapphire_zone/Inventory/Item.h
diff --git a/src/servers/Server_Zone/Inventory/ItemContainer.cpp b/src/servers/sapphire_zone/Inventory/ItemContainer.cpp
similarity index 100%
rename from src/servers/Server_Zone/Inventory/ItemContainer.cpp
rename to src/servers/sapphire_zone/Inventory/ItemContainer.cpp
diff --git a/src/servers/Server_Zone/Inventory/ItemContainer.h b/src/servers/sapphire_zone/Inventory/ItemContainer.h
similarity index 100%
rename from src/servers/Server_Zone/Inventory/ItemContainer.h
rename to src/servers/sapphire_zone/Inventory/ItemContainer.h
diff --git a/src/servers/Server_Zone/Linkshell/Linkshell.cpp b/src/servers/sapphire_zone/Linkshell/Linkshell.cpp
similarity index 100%
rename from src/servers/Server_Zone/Linkshell/Linkshell.cpp
rename to src/servers/sapphire_zone/Linkshell/Linkshell.cpp
diff --git a/src/servers/Server_Zone/Linkshell/Linkshell.h b/src/servers/sapphire_zone/Linkshell/Linkshell.h
similarity index 100%
rename from src/servers/Server_Zone/Linkshell/Linkshell.h
rename to src/servers/sapphire_zone/Linkshell/Linkshell.h
diff --git a/src/servers/Server_Zone/Linkshell/LinkshellMgr.cpp b/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp
similarity index 100%
rename from src/servers/Server_Zone/Linkshell/LinkshellMgr.cpp
rename to src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp
diff --git a/src/servers/Server_Zone/Linkshell/LinkshellMgr.h b/src/servers/sapphire_zone/Linkshell/LinkshellMgr.h
similarity index 100%
rename from src/servers/Server_Zone/Linkshell/LinkshellMgr.h
rename to src/servers/sapphire_zone/Linkshell/LinkshellMgr.h
diff --git a/src/servers/Server_Zone/Math/CalcBattle.cpp b/src/servers/sapphire_zone/Math/CalcBattle.cpp
similarity index 100%
rename from src/servers/Server_Zone/Math/CalcBattle.cpp
rename to src/servers/sapphire_zone/Math/CalcBattle.cpp
diff --git a/src/servers/Server_Zone/Math/CalcBattle.h b/src/servers/sapphire_zone/Math/CalcBattle.h
similarity index 100%
rename from src/servers/Server_Zone/Math/CalcBattle.h
rename to src/servers/sapphire_zone/Math/CalcBattle.h
diff --git a/src/servers/Server_Zone/Math/CalcStats.cpp b/src/servers/sapphire_zone/Math/CalcStats.cpp
similarity index 100%
rename from src/servers/Server_Zone/Math/CalcStats.cpp
rename to src/servers/sapphire_zone/Math/CalcStats.cpp
diff --git a/src/servers/Server_Zone/Math/CalcStats.h b/src/servers/sapphire_zone/Math/CalcStats.h
similarity index 100%
rename from src/servers/Server_Zone/Math/CalcStats.h
rename to src/servers/sapphire_zone/Math/CalcStats.h
diff --git a/src/servers/Server_Zone/Network/GameConnection.cpp b/src/servers/sapphire_zone/Network/GameConnection.cpp
similarity index 100%
rename from src/servers/Server_Zone/Network/GameConnection.cpp
rename to src/servers/sapphire_zone/Network/GameConnection.cpp
diff --git a/src/servers/Server_Zone/Network/GameConnection.h b/src/servers/sapphire_zone/Network/GameConnection.h
similarity index 100%
rename from src/servers/Server_Zone/Network/GameConnection.h
rename to src/servers/sapphire_zone/Network/GameConnection.h
diff --git a/src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
similarity index 100%
rename from src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp
rename to src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
diff --git a/src/servers/Server_Zone/Network/Handlers/CFHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp
similarity index 100%
rename from src/servers/Server_Zone/Network/Handlers/CFHandlers.cpp
rename to src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp
diff --git a/src/servers/Server_Zone/Network/Handlers/EventHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
similarity index 100%
rename from src/servers/Server_Zone/Network/Handlers/EventHandlers.cpp
rename to src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
diff --git a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
similarity index 100%
rename from src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
rename to src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
diff --git a/src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
similarity index 100%
rename from src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp
rename to src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
diff --git a/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
similarity index 100%
rename from src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp
rename to src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
diff --git a/src/servers/Server_Zone/Network/Handlers/SkillHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
similarity index 100%
rename from src/servers/Server_Zone/Network/Handlers/SkillHandler.cpp
rename to src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket142.h
similarity index 100%
rename from src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h
rename to src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket142.h
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket143.h
similarity index 100%
rename from src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h
rename to src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket143.h
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket144.h
similarity index 100%
rename from src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h
rename to src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket144.h
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/ChatPacket.h
similarity index 100%
rename from src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h
rename to src/servers/sapphire_zone/Network/PacketWrappers/ChatPacket.h
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/EventFinishPacket.h
similarity index 100%
rename from src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h
rename to src/servers/sapphire_zone/Network/PacketWrappers/EventFinishPacket.h
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/EventPlayPacket.h
similarity index 100%
rename from src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h
rename to src/servers/sapphire_zone/Network/PacketWrappers/EventPlayPacket.h
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h
similarity index 100%
rename from src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h
rename to src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h
similarity index 100%
rename from src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h
rename to src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/ModelEquipPacket.h
similarity index 100%
rename from src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h
rename to src/servers/sapphire_zone/Network/PacketWrappers/ModelEquipPacket.h
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h
similarity index 100%
rename from src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h
rename to src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/PingPacket.h
similarity index 100%
rename from src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h
rename to src/servers/sapphire_zone/Network/PacketWrappers/PingPacket.h
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h
similarity index 100%
rename from src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h
rename to src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerStateFlagsPacket.h
similarity index 100%
rename from src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h
rename to src/servers/sapphire_zone/Network/PacketWrappers/PlayerStateFlagsPacket.h
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/QuestMessagePacket.h
similarity index 100%
rename from src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h
rename to src/servers/sapphire_zone/Network/PacketWrappers/QuestMessagePacket.h
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/ServerNoticePacket.h
similarity index 100%
rename from src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h
rename to src/servers/sapphire_zone/Network/PacketWrappers/ServerNoticePacket.h
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/UpdateHpMpTpPacket.h
similarity index 100%
rename from src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h
rename to src/servers/sapphire_zone/Network/PacketWrappers/UpdateHpMpTpPacket.h
diff --git a/src/servers/Server_Zone/Script/NativeScriptApi.h b/src/servers/sapphire_zone/Script/NativeScriptApi.h
similarity index 100%
rename from src/servers/Server_Zone/Script/NativeScriptApi.h
rename to src/servers/sapphire_zone/Script/NativeScriptApi.h
diff --git a/src/servers/Server_Zone/Script/NativeScriptManager.cpp b/src/servers/sapphire_zone/Script/NativeScriptManager.cpp
similarity index 100%
rename from src/servers/Server_Zone/Script/NativeScriptManager.cpp
rename to src/servers/sapphire_zone/Script/NativeScriptManager.cpp
diff --git a/src/servers/Server_Zone/Script/NativeScriptManager.h b/src/servers/sapphire_zone/Script/NativeScriptManager.h
similarity index 100%
rename from src/servers/Server_Zone/Script/NativeScriptManager.h
rename to src/servers/sapphire_zone/Script/NativeScriptManager.h
diff --git a/src/servers/Server_Zone/Script/ScriptInfo.h b/src/servers/sapphire_zone/Script/ScriptInfo.h
similarity index 100%
rename from src/servers/Server_Zone/Script/ScriptInfo.h
rename to src/servers/sapphire_zone/Script/ScriptInfo.h
diff --git a/src/servers/Server_Zone/Script/ScriptLoader.cpp b/src/servers/sapphire_zone/Script/ScriptLoader.cpp
similarity index 100%
rename from src/servers/Server_Zone/Script/ScriptLoader.cpp
rename to src/servers/sapphire_zone/Script/ScriptLoader.cpp
diff --git a/src/servers/Server_Zone/Script/ScriptLoader.h b/src/servers/sapphire_zone/Script/ScriptLoader.h
similarity index 100%
rename from src/servers/Server_Zone/Script/ScriptLoader.h
rename to src/servers/sapphire_zone/Script/ScriptLoader.h
diff --git a/src/servers/Server_Zone/Script/ScriptManager.cpp b/src/servers/sapphire_zone/Script/ScriptManager.cpp
similarity index 100%
rename from src/servers/Server_Zone/Script/ScriptManager.cpp
rename to src/servers/sapphire_zone/Script/ScriptManager.cpp
diff --git a/src/servers/Server_Zone/Script/ScriptManager.h b/src/servers/sapphire_zone/Script/ScriptManager.h
similarity index 100%
rename from src/servers/Server_Zone/Script/ScriptManager.h
rename to src/servers/sapphire_zone/Script/ScriptManager.h
diff --git a/src/servers/Server_Zone/ServerZone.cpp b/src/servers/sapphire_zone/ServerZone.cpp
similarity index 100%
rename from src/servers/Server_Zone/ServerZone.cpp
rename to src/servers/sapphire_zone/ServerZone.cpp
diff --git a/src/servers/Server_Zone/ServerZone.h b/src/servers/sapphire_zone/ServerZone.h
similarity index 100%
rename from src/servers/Server_Zone/ServerZone.h
rename to src/servers/sapphire_zone/ServerZone.h
diff --git a/src/servers/Server_Zone/Session.cpp b/src/servers/sapphire_zone/Session.cpp
similarity index 100%
rename from src/servers/Server_Zone/Session.cpp
rename to src/servers/sapphire_zone/Session.cpp
diff --git a/src/servers/Server_Zone/Session.h b/src/servers/sapphire_zone/Session.h
similarity index 100%
rename from src/servers/Server_Zone/Session.h
rename to src/servers/sapphire_zone/Session.h
diff --git a/src/servers/Server_Zone/StatusEffect/StatusEffect.cpp b/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp
similarity index 100%
rename from src/servers/Server_Zone/StatusEffect/StatusEffect.cpp
rename to src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp
diff --git a/src/servers/Server_Zone/StatusEffect/StatusEffect.h b/src/servers/sapphire_zone/StatusEffect/StatusEffect.h
similarity index 100%
rename from src/servers/Server_Zone/StatusEffect/StatusEffect.h
rename to src/servers/sapphire_zone/StatusEffect/StatusEffect.h
diff --git a/src/servers/Server_Zone/Zone/Cell.cpp b/src/servers/sapphire_zone/Zone/Cell.cpp
similarity index 100%
rename from src/servers/Server_Zone/Zone/Cell.cpp
rename to src/servers/sapphire_zone/Zone/Cell.cpp
diff --git a/src/servers/Server_Zone/Zone/Cell.h b/src/servers/sapphire_zone/Zone/Cell.h
similarity index 100%
rename from src/servers/Server_Zone/Zone/Cell.h
rename to src/servers/sapphire_zone/Zone/Cell.h
diff --git a/src/servers/Server_Zone/Zone/CellHandler.h b/src/servers/sapphire_zone/Zone/CellHandler.h
similarity index 100%
rename from src/servers/Server_Zone/Zone/CellHandler.h
rename to src/servers/sapphire_zone/Zone/CellHandler.h
diff --git a/src/servers/Server_Zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
similarity index 100%
rename from src/servers/Server_Zone/Zone/Zone.cpp
rename to src/servers/sapphire_zone/Zone/Zone.cpp
diff --git a/src/servers/Server_Zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
similarity index 100%
rename from src/servers/Server_Zone/Zone/Zone.h
rename to src/servers/sapphire_zone/Zone/Zone.h
diff --git a/src/servers/Server_Zone/Zone/ZoneMgr.cpp b/src/servers/sapphire_zone/Zone/ZoneMgr.cpp
similarity index 100%
rename from src/servers/Server_Zone/Zone/ZoneMgr.cpp
rename to src/servers/sapphire_zone/Zone/ZoneMgr.cpp
diff --git a/src/servers/Server_Zone/Zone/ZoneMgr.h b/src/servers/sapphire_zone/Zone/ZoneMgr.h
similarity index 100%
rename from src/servers/Server_Zone/Zone/ZoneMgr.h
rename to src/servers/sapphire_zone/Zone/ZoneMgr.h
diff --git a/src/servers/Server_Zone/Zone/ZonePosition.cpp b/src/servers/sapphire_zone/Zone/ZonePosition.cpp
similarity index 100%
rename from src/servers/Server_Zone/Zone/ZonePosition.cpp
rename to src/servers/sapphire_zone/Zone/ZonePosition.cpp
diff --git a/src/servers/Server_Zone/Zone/ZonePosition.h b/src/servers/sapphire_zone/Zone/ZonePosition.h
similarity index 100%
rename from src/servers/Server_Zone/Zone/ZonePosition.h
rename to src/servers/sapphire_zone/Zone/ZonePosition.h
diff --git a/src/servers/Server_Zone/mainGameServer.cpp b/src/servers/sapphire_zone/mainGameServer.cpp
similarity index 100%
rename from src/servers/Server_Zone/mainGameServer.cpp
rename to src/servers/sapphire_zone/mainGameServer.cpp