diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00810894..e598031f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,6 +61,8 @@ add_subdirectory("src/servers")
 add_subdirectory("src/libraries/sapphire/datReader")
 add_subdirectory("src/libraries/sapphire/mysqlConnector")
 
+add_subdirectory("src/common")
+
 add_subdirectory("src/tools/exd_common_gen")
 add_subdirectory("src/tools/exd_struct_gen")
 add_subdirectory("src/tools/exd_struct_test")
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index a879addf..7d9fd527 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB UTILS_PUBLIC_INCLUDE_FILES
         "${CMAKE_CURRENT_SOURCE_DIR}"
         "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
 file(GLOB UTILS_SOURCE_FILES
-        "${CMAKE_CURRENT_SOURCE_DIR}*.cpp"
+        "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
         "${CMAKE_CURRENT_SOURCE_DIR}/Config/*.cpp"
         "${CMAKE_CURRENT_SOURCE_DIR}/Crypt/*.cpp"
         "${CMAKE_CURRENT_SOURCE_DIR}/Database/*.cpp"
@@ -17,12 +17,13 @@ file(GLOB UTILS_SOURCE_FILES
         "${CMAKE_CURRENT_SOURCE_DIR}/Network/PacketDef/*.cpp"
         "${CMAKE_CURRENT_SOURCE_DIR}/Script/*.cpp"
         "${CMAKE_CURRENT_SOURCE_DIR}/Util/*.cpp")
+      
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
-add_library(Common ${UTILS_PUBLIC_INCLUDE_FILES} ${UTILS_SOURCE_FILES})
+add_library(common ${UTILS_PUBLIC_INCLUDE_FILES} ${UTILS_SOURCE_FILES})
 
-set_target_properties(Common PROPERTIES
+set_target_properties(common PROPERTIES
     CXX_STANDARD 14
     CXX_STANDARD_REQUIRED ON
     CXX_EXTENSIONS ON
@@ -33,7 +34,7 @@ set_target_properties(Common PROPERTIES
 )
 
 if (UNIX)
-  target_link_libraries( Common xivdat mysqlclient mysqlConnector )
+  target_link_libraries( common xivdat mysqlclient mysqlConnector )
 else()
-  target_link_libraries( Common xivdat mysqlConnector libmysql )
+  target_link_libraries( common xivdat mysqlConnector libmysql )
 endif()
diff --git a/src/common/Database/DbConnection.cpp b/src/common/Database/DbConnection.cpp
index fdb9533f..b0633492 100644
--- a/src/common/Database/DbConnection.cpp
+++ b/src/common/Database/DbConnection.cpp
@@ -2,7 +2,7 @@
 #include "DbWorker.h"
 #include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h"
 
-#include "src/servers/Server_Common/Logging/Logger.h"
+#include <common/Logging/Logger.h>
 #include "PreparedStatement.h"
 #include <boost/make_shared.hpp>
 
diff --git a/src/common/Database/DbLoader.cpp b/src/common/Database/DbLoader.cpp
index 5e537856..c74d30b2 100644
--- a/src/common/Database/DbLoader.cpp
+++ b/src/common/Database/DbLoader.cpp
@@ -2,7 +2,7 @@
 #include <mysqld_error.h>
 #include "CharaDbConnection.h"
 #include "DbWorkerPool.h"
-#include "src/servers/Server_Common/Logging/Logger.h"
+#include <common/Logging/Logger.h>
 
 extern Core::Logger g_log;
 
diff --git a/src/common/Database/DbWorker.cpp b/src/common/Database/DbWorker.cpp
index 9c1f5c8b..a242eb04 100644
--- a/src/common/Database/DbWorker.cpp
+++ b/src/common/Database/DbWorker.cpp
@@ -1,6 +1,6 @@
 #include "DbWorker.h"
 #include "Operation.h"
-#include <Server_Common/Util/LockedWaitQueue.h>
+#include <common/Util/LockedWaitQueue.h>
 
 Core::Db::DbWorker::DbWorker( Core::LockedWaitQueue< boost::shared_ptr< Operation > >* newQueue, DbConnection* pConn )
 {
diff --git a/src/common/Database/DbWorker.h b/src/common/Database/DbWorker.h
index 679b1522..cfadb795 100644
--- a/src/common/Database/DbWorker.h
+++ b/src/common/Database/DbWorker.h
@@ -3,7 +3,7 @@
 
 #include <atomic>
 #include <thread>
-#include <Server_Common/Util/LockedWaitQueue.h>
+#include <common/Util/LockedWaitQueue.h>
 #include <boost/shared_ptr.hpp>
 
 namespace Core
diff --git a/src/common/Database/DbWorkerPool.cpp b/src/common/Database/DbWorkerPool.cpp
index 575bf457..ceb44110 100644
--- a/src/common/Database/DbWorkerPool.cpp
+++ b/src/common/Database/DbWorkerPool.cpp
@@ -7,7 +7,7 @@
 #include "CharaDbConnection.h"
 #include <boost/make_shared.hpp>
 
-#include <Server_Common/Logging/Logger.h>
+#include <common/Logging/Logger.h>
 extern Core::Logger g_log;
 
 class PingOperation : public Core::Db::Operation
@@ -273,4 +273,4 @@ void DatabaseWorkerPool<T>::ExecuteOrAppend(SQLTransaction& trans, PreparedState
 }
 */
 
-template class Core::Db::DbWorkerPool< Core::Db::CharaDbConnection >;
\ No newline at end of file
+template class Core::Db::DbWorkerPool< Core::Db::CharaDbConnection >;
diff --git a/src/common/Network/Acceptor.cpp b/src/common/Network/Acceptor.cpp
index 0d89bad4..f86bb7a3 100644
--- a/src/common/Network/Acceptor.cpp
+++ b/src/common/Network/Acceptor.cpp
@@ -1,6 +1,6 @@
-#include "src/servers/Server_Common/Network/Hive.h"
+#include <common/Network/Hive.h>
 #include "Acceptor.h"
-#include "src/servers/Server_Common/Network/Connection.h"
+#include <common/Network/Connection.h>
 #include <boost/interprocess/detail/atomic.hpp>
 #include <boost/bind.hpp>
 
@@ -127,4 +127,4 @@ namespace Core
       }
 
    }
-}
\ No newline at end of file
+}
diff --git a/src/common/Network/GamePacket.cpp b/src/common/Network/GamePacket.cpp
index c67f4fb6..10564229 100644
--- a/src/common/Network/GamePacket.cpp
+++ b/src/common/Network/GamePacket.cpp
@@ -5,7 +5,7 @@
 #include <time.h>
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
-#include "Server_Common/Util/Util.h"
+#include <common/Util/Util.h>
 
 Core::Network::Packets::GamePacket::GamePacket( uint16_t subType, uint16_t size, uint32_t id1, uint32_t id2, uint16_t type )
 {
diff --git a/src/common/Network/PacketContainer.cpp b/src/common/Network/PacketContainer.cpp
index 906d3de4..efe6235c 100644
--- a/src/common/Network/PacketContainer.cpp
+++ b/src/common/Network/PacketContainer.cpp
@@ -1,6 +1,6 @@
 #include "PacketContainer.h"
 #include "GamePacket.h"
-#include "src/servers/Server_Common/Common.h"
+#include <common/Common.h>
 
 #include <boost/format.hpp>
 
diff --git a/src/common/Version.cpp b/src/common/Version.cpp
index f526b0a4..e739d043 100644
--- a/src/common/Version.cpp
+++ b/src/common/Version.cpp
@@ -3,7 +3,7 @@
 namespace Core { 
     namespace Version {
 
-    const std::string GIT_HASH = "1673292b62618715cecd0656402e934709779f0e";
+    const std::string GIT_HASH = "32d886675c6f621494001715e6cf9c99217e1b48";
     const std::string VERSION = "-128-NOTFOUND";
 
    } /* Version */
diff --git a/src/servers/Server_Lobby/CMakeLists.txt b/src/servers/Server_Lobby/CMakeLists.txt
index ae31962a..5df73b16 100644
--- a/src/servers/Server_Lobby/CMakeLists.txt
+++ b/src/servers/Server_Lobby/CMakeLists.txt
@@ -8,7 +8,7 @@ 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_dependencies(server_lobby common xivdat)
 
 set_target_properties(server_lobby PROPERTIES
     CXX_STANDARD 14
@@ -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(server_lobby common xivdat pthread mysqlclient mysqlConnector dl z)
 else()
-  target_link_libraries(server_lobby Common xivdat libmysql mysqlConnector zlib1)
+  target_link_libraries(server_lobby common xivdat libmysql mysqlConnector zlib1)
 endif()
 
 target_link_libraries(server_lobby ${Boost_LIBRARIES} ${Boost_LIBRARIES})
diff --git a/src/servers/Server_REST/CMakeLists.txt b/src/servers/Server_REST/CMakeLists.txt
index 47556899..52d0cd75 100644
--- a/src/servers/Server_REST/CMakeLists.txt
+++ b/src/servers/Server_REST/CMakeLists.txt
@@ -7,7 +7,7 @@ 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_dependencies(server_rest common xivdat)
 
 set_target_properties(server_rest PROPERTIES
     CXX_STANDARD 14
@@ -21,12 +21,12 @@ set_target_properties(server_rest PROPERTIES
 )
 
 if (UNIX)
-  target_link_libraries (server_rest Common xivdat pthread mysqlclient mysqlConnector dl z)
+  target_link_libraries (server_rest 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 (server_rest common xivdat libmysql mysqlConnector zlib1)
 
 endif()
 
diff --git a/src/servers/Server_Zone/CMakeLists.txt b/src/servers/Server_Zone/CMakeLists.txt
index 2e68e3bf..a310748c 100644
--- a/src/servers/Server_Zone/CMakeLists.txt
+++ b/src/servers/Server_Zone/CMakeLists.txt
@@ -40,7 +40,7 @@ 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_dependencies(server_zone common xivdat mysqlConnector )
 
 set_target_properties(server_zone PROPERTIES
     CXX_STANDARD 14
@@ -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 ( server_zone common xivdat pthread mysqlclient mysqlConnector dl z )
 else()
-  target_link_libraries ( server_zone Common xivdat libmysql zlib1 mysqlConnector )
+  target_link_libraries ( server_zone common xivdat libmysql zlib1 mysqlConnector )
 endif()
 
 target_link_libraries(server_zone ${Boost_LIBRARIES} )
diff --git a/src/tools/exd_common_gen/CMakeLists.txt b/src/tools/exd_common_gen/CMakeLists.txt
index 986a5342..ee45df8a 100644
--- a/src/tools/exd_common_gen/CMakeLists.txt
+++ b/src/tools/exd_common_gen/CMakeLists.txt
@@ -24,9 +24,9 @@ set_target_properties(exd_common_gen PROPERTIES
 )
 
 if (UNIX)
-  target_link_libraries (exd_common_gen Common xivdat pthread mysqlclient dl z)
+  target_link_libraries (exd_common_gen common xivdat pthread mysqlclient dl z)
 else()
-  target_link_libraries (exd_common_gen Common xivdat libmysql zlib1)
+  target_link_libraries (exd_common_gen common xivdat libmysql zlib1)
 
   # ignore unchecked iterators warnings from msvc
   add_definitions(-D_SCL_SECURE_NO_WARNINGS)
diff --git a/src/tools/exd_struct_gen/CMakeLists.txt b/src/tools/exd_struct_gen/CMakeLists.txt
index db111ae5..55a4f094 100644
--- a/src/tools/exd_struct_gen/CMakeLists.txt
+++ b/src/tools/exd_struct_gen/CMakeLists.txt
@@ -24,9 +24,9 @@ set_target_properties(exd_struct_gen PROPERTIES
 )
 
 if (UNIX)
-  target_link_libraries (exd_struct_gen Common xivdat pthread mysqlclient dl z)
+  target_link_libraries (exd_struct_gen common xivdat pthread mysqlclient dl z)
 else()
-  target_link_libraries (exd_struct_gen Common xivdat libmysql zlib1)
+  target_link_libraries (exd_struct_gen common xivdat libmysql zlib1)
 endif()
 
 target_link_libraries(exd_struct_gen ${Boost_LIBRARIES} ${Boost_LIBRARIES})
diff --git a/src/tools/exd_struct_test/CMakeLists.txt b/src/tools/exd_struct_test/CMakeLists.txt
index a59f5121..817c85a4 100644
--- a/src/tools/exd_struct_test/CMakeLists.txt
+++ b/src/tools/exd_struct_test/CMakeLists.txt
@@ -24,9 +24,9 @@ set_target_properties(exd_struct_test PROPERTIES
 )
 
 if (UNIX)
-  target_link_libraries (exd_struct_test Common xivdat pthread mysqlclient dl z)
+  target_link_libraries (exd_struct_test common xivdat pthread mysqlclient dl z)
 else()
-  target_link_libraries (exd_struct_test Common xivdat libmysql zlib1)
+  target_link_libraries (exd_struct_test common xivdat libmysql zlib1)
 endif()
 
 target_link_libraries(exd_struct_test ${Boost_LIBRARIES} ${Boost_LIBRARIES})
diff --git a/src/tools/quest_parser/CMakeLists.txt b/src/tools/quest_parser/CMakeLists.txt
index 5fd8176d..9dc1c308 100644
--- a/src/tools/quest_parser/CMakeLists.txt
+++ b/src/tools/quest_parser/CMakeLists.txt
@@ -30,9 +30,9 @@ set_target_properties(quest_parse PROPERTIES
 )
 
 if (UNIX)
-  target_link_libraries (quest_parse Common xivdat pthread mysqlclient dl z)
+  target_link_libraries (quest_parse common xivdat pthread mysqlclient dl z)
 else()
-  target_link_libraries (quest_parse Common xivdat libmysql zlib1)
+  target_link_libraries (quest_parse common xivdat libmysql zlib1)
 endif()
 
 target_link_libraries(quest_parse ${Boost_LIBRARIES} ${Boost_LIBRARIES})