diff --git a/.gitignore b/.gitignore
index c5e9b74a..6dbbad9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,7 @@ cmake_install.cmake
 install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
+*.cbp
 
 # Binary Template
 *.bt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e4005ad..e5d37a77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,10 +19,25 @@ endif()
 set(SAPPHIRE_BOOST_FOLDER_NAME boost_1_60_0)
 set(SERVER_COMMON_DIR ${CMAKE_SOURCE_DIR}/src/servers/Server_Common)
 
-
 include( "cmake/boost.cmake" )
 include( "cmake/compiler.cmake" )
 
+
+if(UNIX)
+    include_directories("/usr/include/mysql/")
+else()
+    include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/MySQL/")
+    if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+        # 32 bit link
+        link_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/MySQL/x86)
+        link_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/zlib/x86)
+    else()
+        # 64 bit link
+        link_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/MySQL/x64)
+        link_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/zlib/x64)
+    endif()
+endif()
+
 if( NOT $MYSQLCONNECTORCPP_ROOT_DIR )
     set( MYSQLCONNECTORCPP_ROOT_DIR "G:\\programming\\libs\\MySQL1.1.9" )
 endif()
@@ -32,9 +47,11 @@ FIND_PACKAGE(MySQLConnectorCPP)
 if( MYSQLCONNECTORCPP_FOUND )
     message( "Found Mysql C++ Connector at ${MYSQLCONNECTORCPP_INCLUDE_DIR}" )
 else()
-    message( FATAL_ERROR "You are missing the Mysql C++ Connector 1.1" )
+    message( FATAL_ERROR "Missing Mysql C++ Connector 1.1" )
 endif()
 
+
+
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/ChaiScript-6.0.0/include/")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/sapphire/datReader/")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src")
diff --git a/cmake/boost.cmake b/cmake/boost.cmake
index 9286a487..4f3dda80 100644
--- a/cmake/boost.cmake
+++ b/cmake/boost.cmake
@@ -14,10 +14,10 @@ if(UNIX)
   endif()
 else()
 
-  if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../../external/${SAPPHIRE_BOOST_FOLDER_NAME})
+  if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME})
     message(STATUS "Using boost in /libraries/external")
-	  set(Boost_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../external/${SAPPHIRE_BOOST_FOLDER_NAME})
-    set(BOOST_LIBRARYDIR ${CMAKE_CURRENT_SOURCE_DIR}/../../external/${SAPPHIRE_BOOST_FOLDER_NAME}/lib32-msvc-14.0)
+	  set(Boost_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME})
+    set(BOOST_LIBRARYDIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME}/lib32-msvc-14.0)
   else()
       find_package(Boost ${SAPPHIRE_BOOST_VER} COMPONENTS system)
       if(Boost_FOUND)
diff --git a/src/servers/Server_Common/CMakeLists.txt b/src/servers/Server_Common/CMakeLists.txt
index 4f213405..6f1290cf 100644
--- a/src/servers/Server_Common/CMakeLists.txt
+++ b/src/servers/Server_Common/CMakeLists.txt
@@ -1,14 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 project(Sapphire)
 
-if(UNIX)
-  include_directories("/usr/include/mysql/")
-else()
-  include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/")
-  message(STATUS "Using boost in /libraries/external")
-endif()
-
-
 file(GLOB UTILS_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
 file(GLOB UTILS_SOURCE_FILES
         "${CMAKE_CURRENT_SOURCE_DIR}*.cpp"
diff --git a/src/servers/Server_Lobby/CMakeLists.txt b/src/servers/Server_Lobby/CMakeLists.txt
index 6e0f8f17..57e57488 100644
--- a/src/servers/Server_Lobby/CMakeLists.txt
+++ b/src/servers/Server_Lobby/CMakeLists.txt
@@ -5,22 +5,6 @@ project(Sapphire)
 file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
 file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 
-if(UNIX)
-  include_directories("/usr/include/mysql/")
-else()
-  include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/")
-endif()
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-  # 32 bit link
-  link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x86)
-  link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x86)
-else()
-  # 64 bit link
-  link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x64)
-  link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x64)
-endif()
-
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
 
 add_executable(server_lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
diff --git a/src/servers/Server_REST/CMakeLists.txt b/src/servers/Server_REST/CMakeLists.txt
index 5fc2bb22..2575639e 100644
--- a/src/servers/Server_REST/CMakeLists.txt
+++ b/src/servers/Server_REST/CMakeLists.txt
@@ -6,22 +6,6 @@ file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
 file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 
 
-if(UNIX)
-  include_directories("/usr/include/mysql/")
-else()
-  include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/")
-endif()
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-  # 32 bit link
-  link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x86)
-  link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x86)
-else()
-# 64 bit link
-  link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x64)
-  link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x64)
-endif()
-
 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)
diff --git a/src/servers/Server_Zone/CMakeLists.txt b/src/servers/Server_Zone/CMakeLists.txt
index 0c02a533..4fc68b2a 100644
--- a/src/servers/Server_Zone/CMakeLists.txt
+++ b/src/servers/Server_Zone/CMakeLists.txt
@@ -20,21 +20,6 @@ file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
         StatusEffect/*.c*
         Zone/*.c*)
 
-if(UNIX)
-  include_directories("/usr/include/mysql/")
-else()
-  include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/")
-  if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-      # 32 bit link
-      link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x86)
-      link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x86)
-  else()
-      # 64 bit link
-      link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x64)
-      link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x64)
-  endif()
-endif()
-
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
 
 add_executable(server_zone ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} )