diff --git a/.gitignore b/.gitignore
index 9be79d14..329d0971 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,4 +117,11 @@ src/servers/Scripts/*/ScriptLoader.cpp
# cotire generated files/folders
cotire/
-*_cotire.cmake
\ No newline at end of file
+*_cotire.cmake
+
+*objects.txt
+*exports.def
+
+# doxygen output folder
+doxygen/generated/
+doxygen/*.tmp
\ No newline at end of file
diff --git a/README.md b/README.md
index 0b3dc99a..2b7b3878 100644
--- a/README.md
+++ b/README.md
@@ -13,32 +13,14 @@ Sapphire requires the following software:
| *Name* | *Windows* | *Linux* |
| ------ | --------- | ------- |
-| CMake 2.6+ and C++14 capable compiler | [Visual Studio 2017](https://www.visualstudio.com/) | `gcc 4.9` and `g++ 4.9` or newer |
+| CMake 3.0.2+ and C++14 capable compiler | [Visual Studio 2017](https://www.visualstudio.com/) | `gcc 4.9` and `g++ 4.9` or newer |
| Boost 1.63.0 | [Win32 precompiled binaries](https://sourceforge.net/projects/boost/files/boost-binaries/1.63.0/boost_1_63_0-msvc-14.0-32.exe/download) | Boost libraries from your distribution's package manager |
| MySQL Server 5.7 | [Official Site](https://dev.mysql.com/downloads/mysql/) | MySQL server from your distribution's package manager |
-**Windows**
-Set the environment variables ``BOOST_ROOT_DIR`` and ``BOOST_LIB_DIR`` to ``[boost main folder]`` and ``[boost main folder]/lib32-msvc-14.0`` respectively **or** copy your boost installation into the project's ``src/lib`` folder.
-
-Visual Studio 2017 users: open `Visual Studio Installer` and ensure `Individual Components > SDKs, libraries, and frameworks > Windows Universal C Runtime` is installed. You may also need to install `Individual Components > Compilers, build tools, and runtimes > VC++ 2015.3 v140 toolset for desktop (x86, 64)`.
-
-To enable [Edit and Continue](https://msdn.microsoft.com/en-us/library/esaeyddf.aspx) ensure you define `-DCMAKE_BUILD_TYPE="Debug"` when generating with CMake.
-
-If you installed CMake outside of Visual Studio and have it in your `PATH` environment variable, navigate to Sapphire folder and `cmake -DCMAKE_BUILD_TYPE="Debug" && cmake --build .`.
-
-Otherwise:
-* In *Visual Studio 2017*: Open the project via ``File`` > ``Open`` > ``Folder`` and wait, till CMake automatically finishes cache generation. Right click any CMakeLists.txt and select build to build a application.
-To configure debug startup parameters, select ``Debug and Launch settings``, the application you want to set up parameters for, and add a ``args`` json array containing your launch parameters in ``configurations``.
-If Visual Studio fails to generate a CMake Cache or does not show options to build, make sure that the newest version of it is installed and all environment variables are set correctly. Keep in mind that generating a cache can take a while on some machines.
-
-The solution `Sapphire.sln` is also generated in the main Sapphire folder.
-
-**Linux**
-`cmake . -DSAPPHIRE_BOOST_VER="your.boost.ver" && make -j JOBS` where `JOBS` is number of cores on your system.
-`-j JOBS` can be omitted if your system lacks resources (spoiler: your system probably lacks resources if running on 1GB RAM or lower, or if the build fails due to being out of memory)
+Please check the [wiki](https://github.com/SapphireMordred/Sapphire/wiki) for detailed installation/build instructions for your OS.
## Links
* [Sapphire on YouTube](https://www.youtube.com/channel/UCJKYuovoGsq7PxSAfrNJKbw)
-Final Fantasy XIV © 2010-2017 SQUARE ENIX CO., LTD. All Rights Reserved. We are not affiliated with SQUARE ENIX CO., LTD. in any way.
+Final Fantasy XIV © 2010-2018 SQUARE ENIX CO., LTD. All Rights Reserved. We are not affiliated with SQUARE ENIX CO., LTD. in any way.
diff --git a/bin/config/global.ini.default b/bin/config/global.ini.default
new file mode 100644
index 00000000..072d3f7c
--- /dev/null
+++ b/bin/config/global.ini.default
@@ -0,0 +1,23 @@
+[Database]
+Host = 127.0.0.1
+Port = 3306
+Database = sapphire
+Username = root
+Password =
+SyncThreads = 2
+AsyncThreads = 2
+
+[GlobalParameters]
+ServerSecret = default
+DataPath = C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack
+
+[GlobalNetwork]
+; Values definining how Users and other servers will access - these have to be set to your public IP when running a public server
+ZoneHost = 127.0.0.1
+ZonePort = 54992
+
+LobbyHost = 127.0.0.1
+LobbyPort = 54994
+
+RestHost = 127.0.0.1
+RestPort = 80
\ No newline at end of file
diff --git a/bin/config/lobby.ini.default b/bin/config/lobby.ini.default
new file mode 100644
index 00000000..077e947c
--- /dev/null
+++ b/bin/config/lobby.ini.default
@@ -0,0 +1,8 @@
+[Lobby]
+WorldID = 67
+AllowNoSessionConnect = false
+WorldName = Sapphire
+
+[LobbyNetwork]
+ListenIp = 0.0.0.0
+ListenPort = 54994
\ No newline at end of file
diff --git a/bin/config/rest.ini.default b/bin/config/rest.ini.default
new file mode 100644
index 00000000..d51b4967
--- /dev/null
+++ b/bin/config/rest.ini.default
@@ -0,0 +1,6 @@
+[CharacterCreation]
+DefaultGMRank = 255
+
+[RestNetwork]
+ListenIp = 0.0.0.0
+ListenPort = 80
\ No newline at end of file
diff --git a/bin/config/settings_lobby.xml b/bin/config/settings_lobby.xml
deleted file mode 100644
index df2052ce..00000000
--- a/bin/config/settings_lobby.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-