diff --git a/.gitignore b/.gitignore
index 8dc90910c..1386548bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,12 +2,13 @@ build/
 nbproject/
 ipch/
 Win32/
-MCServer/MCServer
-MCServer/buildinfo
-MCServer/CONTRIBUTORS
-MCServer/LICENSE
-MCServer/Licenses
-MCServer/itemblacklist
+MCServer
+Server/Cuberite
+Server/buildinfo
+Server/CONTRIBUTORS
+Server/LICENSE
+Server/Licenses
+Server/itemblacklist
 Testing/
 ChunkWorxSave.ini
 doxy/
@@ -71,11 +72,11 @@ CMakeFiles
 Makefile
 cmake_install.cmake
 install_mainfest.txt
-src/MCServer
+src/Cuberite
 lib/tolua++/tolua
 src/Bindings/Bindings.*
 src/Bindings/BindingDependencies.txt
-MCServer.dir/
+Cuberite.dir/
 src/AllFiles.lst
 
 #win32 cmake stuff
diff --git a/.gitmodules b/.gitmodules
index f3653ec9f..7ea69d180 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,23 +1,23 @@
 [submodule "MCServer/Plugins/Core"]
-	path = MCServer/Plugins/Core
+	path = Server/Plugins/Core
 	url = https://github.com/mc-server/Core.git
 [submodule "MCServer/Plugins/ProtectionAreas"]
-	path = MCServer/Plugins/ProtectionAreas
+	path = Server/Plugins/ProtectionAreas
 	url = https://github.com/mc-server/ProtectionAreas.git
 [submodule "MCServer/Plugins/TransAPI"]
-	path = MCServer/Plugins/TransAPI
+	path = Server/Plugins/TransAPI
 	url = https://github.com/bearbin/transapi.git
 [submodule "MCServer/Plugins/ChunkWorx"]
-	path = MCServer/Plugins/ChunkWorx
+	path = Server/Plugins/ChunkWorx
 	url = https://github.com/mc-server/ChunkWorx.git
 [submodule "MCServer/Plugins/ChatLog"]
-	path = MCServer/Plugins/ChatLog
+	path = Server/Plugins/ChatLog
 	url = https://github.com/mc-server/ChatLog.git
 [submodule "MCServer/Plugins/Handy"]
-	path = MCServer/Plugins/Handy
+	path = Server/Plugins/Handy
 	url = https://github.com/mc-server/Handy.git
 [submodule "MCServer/Plugins/MagicCarpet"]
-	path = MCServer/Plugins/MagicCarpet
+	path = Server/Plugins/MagicCarpet
 	url = https://github.com/mc-server/MagicCarpet.git
 [submodule "lib/polarssl"]
 	path = lib/polarssl
diff --git a/.travis.yml b/.travis.yml
index d5305f601..01b51ee9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: cpp
 sudo: false
 
-compiler: 
+compiler:
 - clang
 - gcc
 
@@ -16,8 +16,8 @@ addons:
 script: ./CIbuild.sh
 
 env:
-  - TRAVIS_MCSERVER_BUILD_TYPE=RELEASE MCSERVER_PATH=./MCServer
-  - TRAVIS_MCSERVER_BUILD_TYPE=DEBUG   MCSERVER_PATH=./MCServer_debug
+  - TRAVIS_CUBERITE_BUILD_TYPE=RELEASE CUBERITE_PATH=./Cuberite
+  - TRAVIS_CUBERITE_BUILD_TYPE=DEBUG   CUBERITE_PATH=./Cuberite_debug
 
 notifications:
   email:
diff --git a/CIbuild.sh b/CIbuild.sh
index f1a583c79..8a91549ad 100755
--- a/CIbuild.sh
+++ b/CIbuild.sh
@@ -2,9 +2,9 @@
 
 set -e
 
-export MCSERVER_BUILD_SERIES_NAME="Travis $CC $TRAVIS_MCSERVER_BUILD_TYPE"
-export MCSERVER_BUILD_ID=$TRAVIS_JOB_NUMBER
-export MCSERVER_BUILD_DATETIME=`date`
+export CUBERITE_BUILD_SERIES_NAME="Travis $CC $TRAVIS_CUBERITE_BUILD_TYPE"
+export CUBERITE_BUILD_ID=$TRAVIS_JOB_NUMBER
+export CUBERITE_BUILD_DATETIME=`date`
 
 if [ "$CXX" == "g++" ]; then
 	# This is a temporary workaround to allow the identification of GCC-4.8 by CMake, required for C++11 features
@@ -21,8 +21,8 @@ cd ..
 echo "Building..."
 make -j 2;
 make -j 2 test ARGS="-V";
-cd MCServer/;
-if [ "$TRAVIS_MCSERVER_BUILD_TYPE" != "COVERAGE" ]; then
-	echo restart | $MCSERVER_PATH;
-	echo stop | $MCSERVER_PATH;
+cd Server/;
+if [ "$TRAVIS_CUBERITE_BUILD_TYPE" != "COVERAGE" ]; then
+	echo restart | $CUBERITE_PATH;
+	echo stop | $CUBERITE_PATH;
 fi
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c95e10a53..78bbc5c89 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,9 +10,9 @@ endif()
 
 # These env variables are used for configuring Travis CI builds.
 # See https://github.com/mc-server/MCServer/pull/767
-if(DEFINED ENV{TRAVIS_MCSERVER_BUILD_TYPE})
-	message("Setting build type to $ENV{TRAVIS_MCSERVER_BUILD_TYPE}")
-	set(CMAKE_BUILD_TYPE $ENV{TRAVIS_MCSERVER_BUILD_TYPE})
+if(DEFINED ENV{TRAVIS_CUBERITE_BUILD_TYPE})
+	message("Setting build type to $ENV{TRAVIS_CUBERITE_BUILD_TYPE}")
+	set(CMAKE_BUILD_TYPE $ENV{TRAVIS_CUBERITE_BUILD_TYPE})
 endif()
 
 if(DEFINED ENV{TRAVIS_MCSERVER_FORCE32})
@@ -23,13 +23,13 @@ if(DEFINED ENV{TRAVIS_BUILD_WITH_COVERAGE})
 	set(BUILD_WITH_COVERAGE $ENV{TRAVIS_BUILD_WITH_COVERAGE})
 endif()
 
-if(DEFINED ENV{MCSERVER_BUILD_ID})
+if(DEFINED ENV{CUBERITE_BUILD_ID})
 	# The build info is defined by the build system (Travis / Jenkins)
-	set(BUILD_ID $ENV{MCSERVER_BUILD_ID})
-	set(BUILD_SERIES_NAME $ENV{MCSERVER_BUILD_SERIES_NAME})
-	set(BUILD_DATETIME $ENV{MCSERVER_BUILD_DATETIME})
-	if(DEFINED ENV{MCSERVER_BUILD_COMMIT_ID})
-		set(BUILD_COMMIT_ID $ENV{MCSERVER_BUILD_COMMIT_ID})
+	set(BUILD_ID $ENV{CUBERITE_BUILD_ID})
+	set(BUILD_SERIES_NAME $ENV{CUBERITE_BUILD_SERIES_NAME})
+	set(BUILD_DATETIME $ENV{CUBERITE_BUILD_DATETIME})
+	if(DEFINED ENV{CUBERITE_BUILD_COMMIT_ID})
+		set(BUILD_COMMIT_ID $ENV{CUBERITE_BUILD_COMMIT_ID})
 	else()
 		message("Commit id not set, attempting to determine id from git")
 		execute_process(
@@ -75,16 +75,16 @@ endif()
 # We need C++11 features, Visual Studio has those from VS2012, but it needs a new platform toolset for those; VS2013 supports them natively:
 # Adapted from http://binglongx.wordpress.com/2013/06/28/set-non-default-platform-toolset-in-cmake/
 if(MSVC OR MSVC_IDE)
-  if( MSVC_VERSION LESS 1700 )       # VC10- / VS2010-
-    message(FATAL_ERROR "The project requires C++11 features. "
-      "You need at least Visual Studio 11 (Microsoft Visual Studio 2012), "
-      "with Microsoft Visual C++ Compiler Nov 2012 CTP (v120_CTP_Nov2012).")
-  elseif( MSVC_VERSION EQUAL 1700 )  # VC11 / VS2012
-    message( "VC11: using Microsoft Visual Studio 2012 "
-      "with Microsoft Visual C++ Compiler Nov 2012 CTP (v120_CTP_Nov2012)" )
-    set(CMAKE_GENERATOR_TOOLSET "v120_CTP_Nov2012" CACHE STRING "Platform Toolset" FORCE)
-  else() # VC12+, assuming C++11 supported.
-  endif()
+	if( MSVC_VERSION LESS 1700 )       # VC10- / VS2010-
+		message(FATAL_ERROR "The project requires C++11 features. "
+		"You need at least Visual Studio 11 (Microsoft Visual Studio 2012), "
+		"with Microsoft Visual C++ Compiler Nov 2012 CTP (v120_CTP_Nov2012).")
+	elseif( MSVC_VERSION EQUAL 1700 )  # VC11 / VS2012
+		message( "VC11: using Microsoft Visual Studio 2012 "
+		"with Microsoft Visual C++ Compiler Nov 2012 CTP (v120_CTP_Nov2012)" )
+		set(CMAKE_GENERATOR_TOOLSET "v120_CTP_Nov2012" CACHE STRING "Platform Toolset" FORCE)
+	else() # VC12+, assuming C++11 supported.
+	endif()
 endif()
 
 set(BUILD_TOOLS OFF CACHE BOOL "")
@@ -129,7 +129,7 @@ endif()
 
 
 
-project (MCServer)
+project (Cuberite)
 
 # Set options for SQLiteCpp, disable all their tests and lints:
 set(SQLITECPP_RUN_CPPLINT     OFF CACHE BOOL "Run cpplint.py tool for Google C++ StyleGuide."  FORCE)
@@ -259,4 +259,3 @@ if (MSVC)
 		)
 	endif()
 endif()
-
diff --git a/MCServer/delete_windows_service.cmd b/MCServer/delete_windows_service.cmd
deleted file mode 100644
index ab6238e2f..000000000
--- a/MCServer/delete_windows_service.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-set SERVICENAME="MCServer"
-
-sc delete %SERVICENAME%
\ No newline at end of file
diff --git a/MCServer/favicon.png b/MCServer/favicon.png
deleted file mode 100644
index 946cce005..000000000
Binary files a/MCServer/favicon.png and /dev/null differ
diff --git a/MCServer/install_windows_service.cmd b/MCServer/install_windows_service.cmd
deleted file mode 100644
index d6b6c15a3..000000000
--- a/MCServer/install_windows_service.cmd
+++ /dev/null
@@ -1,7 +0,0 @@
-rem Alter this if you need to install multiple instances.
-@echo off
-set SERVICENAME="MCServer"
-
-set CURRENTDIR=%CD%
-sc create %SERVICENAME% binPath= "%CURRENTDIR%\MCServer.exe -d" start= auto DisplayName= %SERVICENAME%
-sc description %SERVICENAME% "Minecraft server instance"
\ No newline at end of file
diff --git a/MCServer/profile_run.cmd b/MCServer/profile_run.cmd
deleted file mode 100644
index 6137e9d4d..000000000
--- a/MCServer/profile_run.cmd
+++ /dev/null
@@ -1,101 +0,0 @@
-@echo off
-::
-:: Profiling using a MSVC standalone profiler
-::
-:: See http://www.codeproject.com/Articles/144643/Profiling-of-C-Applications-in-Visual-Studio-for-F for details
-:: Note that this script assumes a newer version of the tool, Performance Tools 2010, so that it is Win7-compatible
-:: Download at http://www.microsoft.com/en-ca/download/details.aspx?id=23205
-::
-:: This script sets the profiler up, then starts the app, waits for it to finish and stops the profiler.
-:: Then it generates all the CSV report files
-::
-:: It expects the MS Performance tools installed in C:\Program Files\Microsoft Visual Studio 9.0\Team Tools\Performance Tools
-:: You can override this path by setting the pt environment variable prior to launching this script
-::
-:: By default it will launch the 32-bit release version of MCServer; set the app environment variable to another executable to run that instead.
-:: Set the IsExecutablex64 env variable to \x64 to profile a 64-bit executable instead (available as the profile_run_x64.cmd script)
-:: Note that the app needs to be compiled with the "/PROFILE" flag in order for the profiling to work
-
-
-
-
-setlocal
-
-:: Get the 32-bit program files folder
-:: Note that in Win7 the %ProgramFiles% variable points to 32-bit program files for normal users and to 64-bit program files for elevated users
-:: This script needs elevation, but the performance tools are 32-bit only
-if "%programfiles(x86)%p" == "p" (
-	set ProgFiles="%ProgramFiles%"
-) else (
-	set ProgFiles="%ProgramFiles(x86)%"
-)
-
-:: Check that the required variables exist, provide defaults:
-if %pt%n == n (
-	set pt="%ProgFiles:"=%\Microsoft Visual Studio 10.0\Team Tools\Performance Tools"
-)
-
-if %app%n == n (
-	set app=MCServer_profile.exe
-)
-
-if %outputdir%n == n (
-	set outputdir=..\Profiling
-)
-
-
-
-
-:: Create the output directory, if it didn't exist
-mkdir %outputdir%
-
-
-
-
-
-:: Start the profiler
-set outputname=profile.vsp
-set output=%outputdir%\%outputname%
-%pt%%IsExecutablex64%\vsperfcmd /start:sample /output:%output%
-if errorlevel 1 goto haderror
-
-:: Launch the application via the profiler
-%pt%%IsExecutablex64%\vsperfcmd /launch:%app%
-if errorlevel 1 goto haderrorshutdown
-
-:: Shut down the profiler (this command waits, until the application is terminated)
-%pt%%IsExecutablex64%\vsperfcmd /shutdown
-if errorlevel 1 goto haderror
-
-
-
-
-
-:: cd to outputdir, so that the reports are generated there
-cd %outputdir%
-
-:: generate the report files (.csv)
-%pt%\vsperfreport /summary:all %outputname% /symbolpath:"srv*C:\Programovani\Symbols*http://msdl.microsoft.com/download/symbols" 
-if errorlevel 1 goto haderror
-
-
-
-
-
-goto finished
-
-
-
-
-:haderrorshutdown
-echo An error was encountered, shutting down the profiler
-%pt%%IsExecutablex64%\vsperfcmd /shutdown
-
-:haderror
-echo An error was encountered
-pause
-
-
-
-
-:finished
diff --git a/MCServer/profile_run_debug.cmd b/MCServer/profile_run_debug.cmd
deleted file mode 100644
index a9792541a..000000000
--- a/MCServer/profile_run_debug.cmd
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-:: This script uses the profile_run.cmd script to run profiling on the DebugProfile executable
-
-set app=MCServer_debug_profile.exe
-call profile_run.cmd
diff --git a/MCServer/profile_run_x64.cmd b/MCServer/profile_run_x64.cmd
deleted file mode 100644
index 242136f4b..000000000
--- a/MCServer/profile_run_x64.cmd
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-:: This script uses the profile_run.cmd script to run profiling on a x64 release executable
-
-set IsExecutablex64=\x64
-call profile_run.cmd
diff --git a/MCServer/.gitignore b/Server/.gitignore
similarity index 93%
rename from MCServer/.gitignore
rename to Server/.gitignore
index 6da9aa7c7..161734f86 100644
--- a/MCServer/.gitignore
+++ b/Server/.gitignore
@@ -3,8 +3,8 @@
 *.exp
 *.lib
 *.ini
-MCServer
-MCServer_debug
+Cuberite
+Cuberite_debug
 CommLogs/
 GalExports/
 logs
@@ -33,4 +33,3 @@ mcserver_api.lua
 # Ignore the webadmin certs / privkey, so that no-one commits theirs by accident:
 webadmin/httpscert.crt
 webadmin/httpskey.pem
-
diff --git a/MCServer/Plugins/.gitignore b/Server/Plugins/.gitignore
similarity index 100%
rename from MCServer/Plugins/.gitignore
rename to Server/Plugins/.gitignore
diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/Server/Plugins/APIDump/APIDesc.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/APIDesc.lua
rename to Server/Plugins/APIDump/APIDesc.lua
diff --git a/MCServer/Plugins/APIDump/APIDump.deproj b/Server/Plugins/APIDump/APIDump.deproj
similarity index 100%
rename from MCServer/Plugins/APIDump/APIDump.deproj
rename to Server/Plugins/APIDump/APIDump.deproj
diff --git a/MCServer/Plugins/APIDump/Classes/BlockEntities.lua b/Server/Plugins/APIDump/Classes/BlockEntities.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Classes/BlockEntities.lua
rename to Server/Plugins/APIDump/Classes/BlockEntities.lua
diff --git a/MCServer/Plugins/APIDump/Classes/Geometry.lua b/Server/Plugins/APIDump/Classes/Geometry.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Classes/Geometry.lua
rename to Server/Plugins/APIDump/Classes/Geometry.lua
diff --git a/MCServer/Plugins/APIDump/Classes/Network.lua b/Server/Plugins/APIDump/Classes/Network.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Classes/Network.lua
rename to Server/Plugins/APIDump/Classes/Network.lua
diff --git a/MCServer/Plugins/APIDump/Classes/Plugins.lua b/Server/Plugins/APIDump/Classes/Plugins.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Classes/Plugins.lua
rename to Server/Plugins/APIDump/Classes/Plugins.lua
diff --git a/MCServer/Plugins/APIDump/Classes/Projectiles.lua b/Server/Plugins/APIDump/Classes/Projectiles.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Classes/Projectiles.lua
rename to Server/Plugins/APIDump/Classes/Projectiles.lua
diff --git a/MCServer/Plugins/APIDump/Classes/WebAdmin.lua b/Server/Plugins/APIDump/Classes/WebAdmin.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Classes/WebAdmin.lua
rename to Server/Plugins/APIDump/Classes/WebAdmin.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnBlockSpread.lua b/Server/Plugins/APIDump/Hooks/OnBlockSpread.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnBlockSpread.lua
rename to Server/Plugins/APIDump/Hooks/OnBlockSpread.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnBlockToPickups.lua b/Server/Plugins/APIDump/Hooks/OnBlockToPickups.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnBlockToPickups.lua
rename to Server/Plugins/APIDump/Hooks/OnBlockToPickups.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnChat.lua b/Server/Plugins/APIDump/Hooks/OnChat.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnChat.lua
rename to Server/Plugins/APIDump/Hooks/OnChat.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnChunkAvailable.lua b/Server/Plugins/APIDump/Hooks/OnChunkAvailable.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnChunkAvailable.lua
rename to Server/Plugins/APIDump/Hooks/OnChunkAvailable.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnChunkGenerated.lua b/Server/Plugins/APIDump/Hooks/OnChunkGenerated.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnChunkGenerated.lua
rename to Server/Plugins/APIDump/Hooks/OnChunkGenerated.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnChunkGenerating.lua b/Server/Plugins/APIDump/Hooks/OnChunkGenerating.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnChunkGenerating.lua
rename to Server/Plugins/APIDump/Hooks/OnChunkGenerating.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnChunkUnloaded.lua b/Server/Plugins/APIDump/Hooks/OnChunkUnloaded.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnChunkUnloaded.lua
rename to Server/Plugins/APIDump/Hooks/OnChunkUnloaded.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnChunkUnloading.lua b/Server/Plugins/APIDump/Hooks/OnChunkUnloading.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnChunkUnloading.lua
rename to Server/Plugins/APIDump/Hooks/OnChunkUnloading.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnCollectingPickup.lua b/Server/Plugins/APIDump/Hooks/OnCollectingPickup.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnCollectingPickup.lua
rename to Server/Plugins/APIDump/Hooks/OnCollectingPickup.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnCraftingNoRecipe.lua b/Server/Plugins/APIDump/Hooks/OnCraftingNoRecipe.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnCraftingNoRecipe.lua
rename to Server/Plugins/APIDump/Hooks/OnCraftingNoRecipe.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnDisconnect.lua b/Server/Plugins/APIDump/Hooks/OnDisconnect.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnDisconnect.lua
rename to Server/Plugins/APIDump/Hooks/OnDisconnect.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnEntityAddEffect.lua b/Server/Plugins/APIDump/Hooks/OnEntityAddEffect.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnEntityAddEffect.lua
rename to Server/Plugins/APIDump/Hooks/OnEntityAddEffect.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnEntityChangedWorld.lua b/Server/Plugins/APIDump/Hooks/OnEntityChangedWorld.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnEntityChangedWorld.lua
rename to Server/Plugins/APIDump/Hooks/OnEntityChangedWorld.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnEntityChangingWorld.lua b/Server/Plugins/APIDump/Hooks/OnEntityChangingWorld.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnEntityChangingWorld.lua
rename to Server/Plugins/APIDump/Hooks/OnEntityChangingWorld.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnEntityTeleport.lua b/Server/Plugins/APIDump/Hooks/OnEntityTeleport.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnEntityTeleport.lua
rename to Server/Plugins/APIDump/Hooks/OnEntityTeleport.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnExecuteCommand.lua b/Server/Plugins/APIDump/Hooks/OnExecuteCommand.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnExecuteCommand.lua
rename to Server/Plugins/APIDump/Hooks/OnExecuteCommand.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnExploded.lua b/Server/Plugins/APIDump/Hooks/OnExploded.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnExploded.lua
rename to Server/Plugins/APIDump/Hooks/OnExploded.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnExploding.lua b/Server/Plugins/APIDump/Hooks/OnExploding.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnExploding.lua
rename to Server/Plugins/APIDump/Hooks/OnExploding.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnHandshake.lua b/Server/Plugins/APIDump/Hooks/OnHandshake.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnHandshake.lua
rename to Server/Plugins/APIDump/Hooks/OnHandshake.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnHopperPullingItem.lua b/Server/Plugins/APIDump/Hooks/OnHopperPullingItem.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnHopperPullingItem.lua
rename to Server/Plugins/APIDump/Hooks/OnHopperPullingItem.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnHopperPushingItem.lua b/Server/Plugins/APIDump/Hooks/OnHopperPushingItem.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnHopperPushingItem.lua
rename to Server/Plugins/APIDump/Hooks/OnHopperPushingItem.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnKilled.lua b/Server/Plugins/APIDump/Hooks/OnKilled.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnKilled.lua
rename to Server/Plugins/APIDump/Hooks/OnKilled.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnKilling.lua b/Server/Plugins/APIDump/Hooks/OnKilling.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnKilling.lua
rename to Server/Plugins/APIDump/Hooks/OnKilling.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnLogin.lua b/Server/Plugins/APIDump/Hooks/OnLogin.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnLogin.lua
rename to Server/Plugins/APIDump/Hooks/OnLogin.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerAnimation.lua b/Server/Plugins/APIDump/Hooks/OnPlayerAnimation.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerAnimation.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerAnimation.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerBreakingBlock.lua b/Server/Plugins/APIDump/Hooks/OnPlayerBreakingBlock.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerBreakingBlock.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerBreakingBlock.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerBrokenBlock.lua b/Server/Plugins/APIDump/Hooks/OnPlayerBrokenBlock.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerBrokenBlock.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerBrokenBlock.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerDestroyed.lua b/Server/Plugins/APIDump/Hooks/OnPlayerDestroyed.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerDestroyed.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerDestroyed.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerEating.lua b/Server/Plugins/APIDump/Hooks/OnPlayerEating.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerEating.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerEating.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerFished.lua b/Server/Plugins/APIDump/Hooks/OnPlayerFished.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerFished.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerFished.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerFishing.lua b/Server/Plugins/APIDump/Hooks/OnPlayerFishing.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerFishing.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerFishing.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerFoodLevelChange.lua b/Server/Plugins/APIDump/Hooks/OnPlayerFoodLevelChange.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerFoodLevelChange.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerFoodLevelChange.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerJoined.lua b/Server/Plugins/APIDump/Hooks/OnPlayerJoined.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerJoined.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerJoined.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerLeftClick.lua b/Server/Plugins/APIDump/Hooks/OnPlayerLeftClick.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerLeftClick.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerLeftClick.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerMoving.lua b/Server/Plugins/APIDump/Hooks/OnPlayerMoving.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerMoving.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerMoving.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerPlacedBlock.lua b/Server/Plugins/APIDump/Hooks/OnPlayerPlacedBlock.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerPlacedBlock.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerPlacedBlock.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerPlacingBlock.lua b/Server/Plugins/APIDump/Hooks/OnPlayerPlacingBlock.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerPlacingBlock.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerPlacingBlock.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerRightClick.lua b/Server/Plugins/APIDump/Hooks/OnPlayerRightClick.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerRightClick.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerRightClick.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerRightClickingEntity.lua b/Server/Plugins/APIDump/Hooks/OnPlayerRightClickingEntity.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerRightClickingEntity.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerRightClickingEntity.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerShooting.lua b/Server/Plugins/APIDump/Hooks/OnPlayerShooting.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerShooting.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerShooting.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerSpawned.lua b/Server/Plugins/APIDump/Hooks/OnPlayerSpawned.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerSpawned.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerSpawned.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerTossingItem.lua b/Server/Plugins/APIDump/Hooks/OnPlayerTossingItem.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerTossingItem.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerTossingItem.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerUsedBlock.lua b/Server/Plugins/APIDump/Hooks/OnPlayerUsedBlock.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerUsedBlock.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerUsedBlock.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerUsedItem.lua b/Server/Plugins/APIDump/Hooks/OnPlayerUsedItem.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerUsedItem.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerUsedItem.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerUsingBlock.lua b/Server/Plugins/APIDump/Hooks/OnPlayerUsingBlock.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerUsingBlock.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerUsingBlock.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerUsingItem.lua b/Server/Plugins/APIDump/Hooks/OnPlayerUsingItem.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPlayerUsingItem.lua
rename to Server/Plugins/APIDump/Hooks/OnPlayerUsingItem.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPluginMessage.lua b/Server/Plugins/APIDump/Hooks/OnPluginMessage.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPluginMessage.lua
rename to Server/Plugins/APIDump/Hooks/OnPluginMessage.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPluginsLoaded.lua b/Server/Plugins/APIDump/Hooks/OnPluginsLoaded.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPluginsLoaded.lua
rename to Server/Plugins/APIDump/Hooks/OnPluginsLoaded.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPostCrafting.lua b/Server/Plugins/APIDump/Hooks/OnPostCrafting.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPostCrafting.lua
rename to Server/Plugins/APIDump/Hooks/OnPostCrafting.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnPreCrafting.lua b/Server/Plugins/APIDump/Hooks/OnPreCrafting.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnPreCrafting.lua
rename to Server/Plugins/APIDump/Hooks/OnPreCrafting.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnProjectileHitBlock.lua b/Server/Plugins/APIDump/Hooks/OnProjectileHitBlock.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnProjectileHitBlock.lua
rename to Server/Plugins/APIDump/Hooks/OnProjectileHitBlock.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnProjectileHitEntity.lua b/Server/Plugins/APIDump/Hooks/OnProjectileHitEntity.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnProjectileHitEntity.lua
rename to Server/Plugins/APIDump/Hooks/OnProjectileHitEntity.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua b/Server/Plugins/APIDump/Hooks/OnServerPing.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
rename to Server/Plugins/APIDump/Hooks/OnServerPing.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnSpawnedEntity.lua b/Server/Plugins/APIDump/Hooks/OnSpawnedEntity.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnSpawnedEntity.lua
rename to Server/Plugins/APIDump/Hooks/OnSpawnedEntity.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnSpawnedMonster.lua b/Server/Plugins/APIDump/Hooks/OnSpawnedMonster.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnSpawnedMonster.lua
rename to Server/Plugins/APIDump/Hooks/OnSpawnedMonster.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnSpawningEntity.lua b/Server/Plugins/APIDump/Hooks/OnSpawningEntity.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnSpawningEntity.lua
rename to Server/Plugins/APIDump/Hooks/OnSpawningEntity.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnSpawningMonster.lua b/Server/Plugins/APIDump/Hooks/OnSpawningMonster.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnSpawningMonster.lua
rename to Server/Plugins/APIDump/Hooks/OnSpawningMonster.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnTakeDamage.lua b/Server/Plugins/APIDump/Hooks/OnTakeDamage.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnTakeDamage.lua
rename to Server/Plugins/APIDump/Hooks/OnTakeDamage.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnTick.lua b/Server/Plugins/APIDump/Hooks/OnTick.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnTick.lua
rename to Server/Plugins/APIDump/Hooks/OnTick.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnUpdatedSign.lua b/Server/Plugins/APIDump/Hooks/OnUpdatedSign.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnUpdatedSign.lua
rename to Server/Plugins/APIDump/Hooks/OnUpdatedSign.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnUpdatingSign.lua b/Server/Plugins/APIDump/Hooks/OnUpdatingSign.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnUpdatingSign.lua
rename to Server/Plugins/APIDump/Hooks/OnUpdatingSign.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnWeatherChanged.lua b/Server/Plugins/APIDump/Hooks/OnWeatherChanged.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnWeatherChanged.lua
rename to Server/Plugins/APIDump/Hooks/OnWeatherChanged.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnWeatherChanging.lua b/Server/Plugins/APIDump/Hooks/OnWeatherChanging.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnWeatherChanging.lua
rename to Server/Plugins/APIDump/Hooks/OnWeatherChanging.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnWorldStarted.lua b/Server/Plugins/APIDump/Hooks/OnWorldStarted.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnWorldStarted.lua
rename to Server/Plugins/APIDump/Hooks/OnWorldStarted.lua
diff --git a/MCServer/Plugins/APIDump/Hooks/OnWorldTick.lua b/Server/Plugins/APIDump/Hooks/OnWorldTick.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/Hooks/OnWorldTick.lua
rename to Server/Plugins/APIDump/Hooks/OnWorldTick.lua
diff --git a/MCServer/Plugins/APIDump/InfoFile.html b/Server/Plugins/APIDump/InfoFile.html
similarity index 100%
rename from MCServer/Plugins/APIDump/InfoFile.html
rename to Server/Plugins/APIDump/InfoFile.html
diff --git a/MCServer/Plugins/APIDump/LICENSE-prettify.txt b/Server/Plugins/APIDump/LICENSE-prettify.txt
similarity index 100%
rename from MCServer/Plugins/APIDump/LICENSE-prettify.txt
rename to Server/Plugins/APIDump/LICENSE-prettify.txt
diff --git a/MCServer/Plugins/APIDump/SettingUpDecoda.html b/Server/Plugins/APIDump/SettingUpDecoda.html
similarity index 100%
rename from MCServer/Plugins/APIDump/SettingUpDecoda.html
rename to Server/Plugins/APIDump/SettingUpDecoda.html
diff --git a/MCServer/Plugins/APIDump/SettingUpZeroBrane.html b/Server/Plugins/APIDump/SettingUpZeroBrane.html
similarity index 100%
rename from MCServer/Plugins/APIDump/SettingUpZeroBrane.html
rename to Server/Plugins/APIDump/SettingUpZeroBrane.html
diff --git a/MCServer/Plugins/APIDump/Static/.gitignore b/Server/Plugins/APIDump/Static/.gitignore
similarity index 100%
rename from MCServer/Plugins/APIDump/Static/.gitignore
rename to Server/Plugins/APIDump/Static/.gitignore
diff --git a/MCServer/Plugins/APIDump/Static/decoda_debug_settings.png b/Server/Plugins/APIDump/Static/decoda_debug_settings.png
similarity index 100%
rename from MCServer/Plugins/APIDump/Static/decoda_debug_settings.png
rename to Server/Plugins/APIDump/Static/decoda_debug_settings.png
diff --git a/MCServer/Plugins/APIDump/Static/decoda_logo.png b/Server/Plugins/APIDump/Static/decoda_logo.png
similarity index 100%
rename from MCServer/Plugins/APIDump/Static/decoda_logo.png
rename to Server/Plugins/APIDump/Static/decoda_logo.png
diff --git a/MCServer/Plugins/APIDump/Static/decoda_workspace.png b/Server/Plugins/APIDump/Static/decoda_workspace.png
similarity index 100%
rename from MCServer/Plugins/APIDump/Static/decoda_workspace.png
rename to Server/Plugins/APIDump/Static/decoda_workspace.png
diff --git a/MCServer/Plugins/APIDump/Static/zbs_logo.png b/Server/Plugins/APIDump/Static/zbs_logo.png
similarity index 100%
rename from MCServer/Plugins/APIDump/Static/zbs_logo.png
rename to Server/Plugins/APIDump/Static/zbs_logo.png
diff --git a/MCServer/Plugins/APIDump/Static/zbs_workspace.png b/Server/Plugins/APIDump/Static/zbs_workspace.png
similarity index 100%
rename from MCServer/Plugins/APIDump/Static/zbs_workspace.png
rename to Server/Plugins/APIDump/Static/zbs_workspace.png
diff --git a/MCServer/Plugins/APIDump/UsingChunkStays.html b/Server/Plugins/APIDump/UsingChunkStays.html
similarity index 100%
rename from MCServer/Plugins/APIDump/UsingChunkStays.html
rename to Server/Plugins/APIDump/UsingChunkStays.html
diff --git a/MCServer/Plugins/APIDump/WebWorldThreads.html b/Server/Plugins/APIDump/WebWorldThreads.html
similarity index 100%
rename from MCServer/Plugins/APIDump/WebWorldThreads.html
rename to Server/Plugins/APIDump/WebWorldThreads.html
diff --git a/MCServer/Plugins/APIDump/Writing-a-Cuberite-plugin.html b/Server/Plugins/APIDump/Writing-a-Cuberite-plugin.html
similarity index 100%
rename from MCServer/Plugins/APIDump/Writing-a-Cuberite-plugin.html
rename to Server/Plugins/APIDump/Writing-a-Cuberite-plugin.html
diff --git a/MCServer/Plugins/APIDump/lang-lua.js b/Server/Plugins/APIDump/lang-lua.js
similarity index 100%
rename from MCServer/Plugins/APIDump/lang-lua.js
rename to Server/Plugins/APIDump/lang-lua.js
diff --git a/MCServer/Plugins/APIDump/main.css b/Server/Plugins/APIDump/main.css
similarity index 100%
rename from MCServer/Plugins/APIDump/main.css
rename to Server/Plugins/APIDump/main.css
diff --git a/MCServer/Plugins/APIDump/main_APIDump.lua b/Server/Plugins/APIDump/main_APIDump.lua
similarity index 100%
rename from MCServer/Plugins/APIDump/main_APIDump.lua
rename to Server/Plugins/APIDump/main_APIDump.lua
diff --git a/MCServer/Plugins/APIDump/prettify.css b/Server/Plugins/APIDump/prettify.css
similarity index 100%
rename from MCServer/Plugins/APIDump/prettify.css
rename to Server/Plugins/APIDump/prettify.css
diff --git a/MCServer/Plugins/APIDump/prettify.js b/Server/Plugins/APIDump/prettify.js
similarity index 100%
rename from MCServer/Plugins/APIDump/prettify.js
rename to Server/Plugins/APIDump/prettify.js
diff --git a/MCServer/Plugins/ChatLog b/Server/Plugins/ChatLog
similarity index 100%
rename from MCServer/Plugins/ChatLog
rename to Server/Plugins/ChatLog
diff --git a/MCServer/Plugins/ChunkWorx b/Server/Plugins/ChunkWorx
similarity index 100%
rename from MCServer/Plugins/ChunkWorx
rename to Server/Plugins/ChunkWorx
diff --git a/MCServer/Plugins/Core b/Server/Plugins/Core
similarity index 100%
rename from MCServer/Plugins/Core
rename to Server/Plugins/Core
diff --git a/MCServer/Plugins/Debuggers/Debuggers.deproj b/Server/Plugins/Debuggers/Debuggers.deproj
similarity index 100%
rename from MCServer/Plugins/Debuggers/Debuggers.deproj
rename to Server/Plugins/Debuggers/Debuggers.deproj
diff --git a/MCServer/Plugins/Debuggers/Debuggers.lua b/Server/Plugins/Debuggers/Debuggers.lua
similarity index 100%
rename from MCServer/Plugins/Debuggers/Debuggers.lua
rename to Server/Plugins/Debuggers/Debuggers.lua
diff --git a/MCServer/Plugins/Debuggers/Info.lua b/Server/Plugins/Debuggers/Info.lua
similarity index 100%
rename from MCServer/Plugins/Debuggers/Info.lua
rename to Server/Plugins/Debuggers/Info.lua
diff --git a/MCServer/Plugins/DiamondMover/DiamondMover.lua b/Server/Plugins/DiamondMover/DiamondMover.lua
similarity index 100%
rename from MCServer/Plugins/DiamondMover/DiamondMover.lua
rename to Server/Plugins/DiamondMover/DiamondMover.lua
diff --git a/MCServer/Plugins/DumpInfo/Init.lua b/Server/Plugins/DumpInfo/Init.lua
similarity index 100%
rename from MCServer/Plugins/DumpInfo/Init.lua
rename to Server/Plugins/DumpInfo/Init.lua
diff --git a/MCServer/Plugins/Handy b/Server/Plugins/Handy
similarity index 100%
rename from MCServer/Plugins/Handy
rename to Server/Plugins/Handy
diff --git a/MCServer/Plugins/HookNotify/HookNotify.lua b/Server/Plugins/HookNotify/HookNotify.lua
similarity index 100%
rename from MCServer/Plugins/HookNotify/HookNotify.lua
rename to Server/Plugins/HookNotify/HookNotify.lua
diff --git a/MCServer/Plugins/InfoDump.deproj b/Server/Plugins/InfoDump.deproj
similarity index 100%
rename from MCServer/Plugins/InfoDump.deproj
rename to Server/Plugins/InfoDump.deproj
diff --git a/MCServer/Plugins/InfoDump.lua b/Server/Plugins/InfoDump.lua
similarity index 100%
rename from MCServer/Plugins/InfoDump.lua
rename to Server/Plugins/InfoDump.lua
diff --git a/MCServer/Plugins/InfoReg.lua b/Server/Plugins/InfoReg.lua
similarity index 100%
rename from MCServer/Plugins/InfoReg.lua
rename to Server/Plugins/InfoReg.lua
diff --git a/MCServer/Plugins/MagicCarpet b/Server/Plugins/MagicCarpet
similarity index 100%
rename from MCServer/Plugins/MagicCarpet
rename to Server/Plugins/MagicCarpet
diff --git a/MCServer/Plugins/NetworkTest/Info.lua b/Server/Plugins/NetworkTest/Info.lua
similarity index 100%
rename from MCServer/Plugins/NetworkTest/Info.lua
rename to Server/Plugins/NetworkTest/Info.lua
diff --git a/MCServer/Plugins/NetworkTest/NetworkTest.lua b/Server/Plugins/NetworkTest/NetworkTest.lua
similarity index 100%
rename from MCServer/Plugins/NetworkTest/NetworkTest.lua
rename to Server/Plugins/NetworkTest/NetworkTest.lua
diff --git a/MCServer/Plugins/NetworkTest/splashes.txt b/Server/Plugins/NetworkTest/splashes.txt
similarity index 100%
rename from MCServer/Plugins/NetworkTest/splashes.txt
rename to Server/Plugins/NetworkTest/splashes.txt
diff --git a/MCServer/Plugins/ProtectionAreas b/Server/Plugins/ProtectionAreas
similarity index 100%
rename from MCServer/Plugins/ProtectionAreas
rename to Server/Plugins/ProtectionAreas
diff --git a/MCServer/Plugins/TestLuaRocks/TestLuaRocks.lua b/Server/Plugins/TestLuaRocks/TestLuaRocks.lua
similarity index 100%
rename from MCServer/Plugins/TestLuaRocks/TestLuaRocks.lua
rename to Server/Plugins/TestLuaRocks/TestLuaRocks.lua
diff --git a/MCServer/Plugins/TransAPI b/Server/Plugins/TransAPI
similarity index 100%
rename from MCServer/Plugins/TransAPI
rename to Server/Plugins/TransAPI
diff --git a/MCServer/Prefabs/Villages/AlchemistVillage.cubeset b/Server/Prefabs/Villages/AlchemistVillage.cubeset
similarity index 100%
rename from MCServer/Prefabs/Villages/AlchemistVillage.cubeset
rename to Server/Prefabs/Villages/AlchemistVillage.cubeset
diff --git a/MCServer/Prefabs/Villages/JapaneseVillage.cubeset b/Server/Prefabs/Villages/JapaneseVillage.cubeset
similarity index 100%
rename from MCServer/Prefabs/Villages/JapaneseVillage.cubeset
rename to Server/Prefabs/Villages/JapaneseVillage.cubeset
diff --git a/MCServer/Prefabs/Villages/PlainsVillage.cubeset b/Server/Prefabs/Villages/PlainsVillage.cubeset
similarity index 100%
rename from MCServer/Prefabs/Villages/PlainsVillage.cubeset
rename to Server/Prefabs/Villages/PlainsVillage.cubeset
diff --git a/MCServer/Prefabs/Villages/SandFlatRoofVillage.cubeset b/Server/Prefabs/Villages/SandFlatRoofVillage.cubeset
similarity index 100%
rename from MCServer/Prefabs/Villages/SandFlatRoofVillage.cubeset
rename to Server/Prefabs/Villages/SandFlatRoofVillage.cubeset
diff --git a/MCServer/Prefabs/Villages/SandVillage.cubeset b/Server/Prefabs/Villages/SandVillage.cubeset
similarity index 100%
rename from MCServer/Prefabs/Villages/SandVillage.cubeset
rename to Server/Prefabs/Villages/SandVillage.cubeset
diff --git a/MCServer/README.txt b/Server/README.txt
similarity index 100%
rename from MCServer/README.txt
rename to Server/README.txt
diff --git a/MCServer/crafting.txt b/Server/crafting.txt
similarity index 100%
rename from MCServer/crafting.txt
rename to Server/crafting.txt
diff --git a/Server/delete_windows_service.cmd b/Server/delete_windows_service.cmd
new file mode 100644
index 000000000..14a55edfc
--- /dev/null
+++ b/Server/delete_windows_service.cmd
@@ -0,0 +1,4 @@
+@echo off
+set SERVICENAME="Cuberite"
+
+sc delete %SERVICENAME%
diff --git a/Server/favicon.png b/Server/favicon.png
new file mode 100644
index 000000000..61d201abf
Binary files /dev/null and b/Server/favicon.png differ
diff --git a/MCServer/furnace.txt b/Server/furnace.txt
similarity index 100%
rename from MCServer/furnace.txt
rename to Server/furnace.txt
diff --git a/MCServer/hg b/Server/hg
similarity index 85%
rename from MCServer/hg
rename to Server/hg
index 93593de8d..f79dce8e8 100755
--- a/MCServer/hg
+++ b/Server/hg
@@ -4,4 +4,4 @@
 # It expects valgrind to be normally installed and available
 # Note that this is for Linux only and debug-only, since it slows down MCS way too much
 
-valgrind --log-file=helgrind.log --suppressions=hg.supp --gen-suppressions=all --tool=helgrind -v ./MCServer
\ No newline at end of file
+valgrind --log-file=helgrind.log --suppressions=hg.supp --gen-suppressions=all --tool=helgrind -v ./Cuberite
diff --git a/MCServer/hg.supp b/Server/hg.supp
similarity index 100%
rename from MCServer/hg.supp
rename to Server/hg.supp
diff --git a/Server/install_windows_service.cmd b/Server/install_windows_service.cmd
new file mode 100644
index 000000000..84d69ee1a
--- /dev/null
+++ b/Server/install_windows_service.cmd
@@ -0,0 +1,7 @@
+rem Alter this if you need to install multiple instances.
+@echo off
+set SERVICENAME="Cuberite"
+
+set CURRENTDIR=%CD%
+sc create %SERVICENAME% binPath= "%CURRENTDIR%\Cuberite.exe -d" start= auto DisplayName= %SERVICENAME%
+sc description %SERVICENAME% "Minecraft server instance"
diff --git a/MCServer/items.ini b/Server/items.ini
similarity index 100%
rename from MCServer/items.ini
rename to Server/items.ini
diff --git a/MCServer/lang/items_de.ini b/Server/lang/items_de.ini
similarity index 100%
rename from MCServer/lang/items_de.ini
rename to Server/lang/items_de.ini
diff --git a/MCServer/monsters.ini b/Server/monsters.ini
similarity index 100%
rename from MCServer/monsters.ini
rename to Server/monsters.ini
diff --git a/MCServer/vg b/Server/vg
similarity index 89%
rename from MCServer/vg
rename to Server/vg
index fcc8270d0..5fc22ab68 100755
--- a/MCServer/vg
+++ b/Server/vg
@@ -4,4 +4,4 @@
 # It expects valgrind to be normally installed and available
 # Note that this is for Linux only and debug-only, since it slows down MCS way too much
 
-valgrind --log-file=valgrind.log --suppressions=vg.supp --tool=memcheck --leak-check=full --leak-resolution=high --show-reachable=yes --track-origins=yes -v ./MCServer
+valgrind --log-file=valgrind.log --suppressions=vg.supp --tool=memcheck --leak-check=full --leak-resolution=high --show-reachable=yes --track-origins=yes -v ./Cuberite
diff --git a/MCServer/vg.supp b/Server/vg.supp
similarity index 100%
rename from MCServer/vg.supp
rename to Server/vg.supp
diff --git a/MCServer/webadmin/GenerateSelfSignedHTTPSCertUsingOpenssl.cmd b/Server/webadmin/GenerateSelfSignedHTTPSCertUsingOpenssl.cmd
similarity index 100%
rename from MCServer/webadmin/GenerateSelfSignedHTTPSCertUsingOpenssl.cmd
rename to Server/webadmin/GenerateSelfSignedHTTPSCertUsingOpenssl.cmd
diff --git a/MCServer/webadmin/GenerateSelfSignedHTTPSCertUsingOpenssl.sh b/Server/webadmin/GenerateSelfSignedHTTPSCertUsingOpenssl.sh
similarity index 100%
rename from MCServer/webadmin/GenerateSelfSignedHTTPSCertUsingOpenssl.sh
rename to Server/webadmin/GenerateSelfSignedHTTPSCertUsingOpenssl.sh
diff --git a/MCServer/webadmin/files/background.gif b/Server/webadmin/files/background.gif
similarity index 100%
rename from MCServer/webadmin/files/background.gif
rename to Server/webadmin/files/background.gif
diff --git a/MCServer/webadmin/files/favicon.ico b/Server/webadmin/files/favicon.ico
similarity index 100%
rename from MCServer/webadmin/files/favicon.ico
rename to Server/webadmin/files/favicon.ico
diff --git a/MCServer/webadmin/files/guest.html b/Server/webadmin/files/guest.html
similarity index 100%
rename from MCServer/webadmin/files/guest.html
rename to Server/webadmin/files/guest.html
diff --git a/MCServer/webadmin/files/header.png b/Server/webadmin/files/header.png
similarity index 100%
rename from MCServer/webadmin/files/header.png
rename to Server/webadmin/files/header.png
diff --git a/MCServer/webadmin/files/home.gif b/Server/webadmin/files/home.gif
similarity index 100%
rename from MCServer/webadmin/files/home.gif
rename to Server/webadmin/files/home.gif
diff --git a/MCServer/webadmin/files/loading.gif b/Server/webadmin/files/loading.gif
similarity index 100%
rename from MCServer/webadmin/files/loading.gif
rename to Server/webadmin/files/loading.gif
diff --git a/MCServer/webadmin/files/log_out.png b/Server/webadmin/files/log_out.png
similarity index 100%
rename from MCServer/webadmin/files/log_out.png
rename to Server/webadmin/files/log_out.png
diff --git a/MCServer/webadmin/files/login.css b/Server/webadmin/files/login.css
similarity index 100%
rename from MCServer/webadmin/files/login.css
rename to Server/webadmin/files/login.css
diff --git a/MCServer/webadmin/files/login.gif b/Server/webadmin/files/login.gif
similarity index 100%
rename from MCServer/webadmin/files/login.gif
rename to Server/webadmin/files/login.gif
diff --git a/MCServer/webadmin/files/logo.png b/Server/webadmin/files/logo.png
similarity index 100%
rename from MCServer/webadmin/files/logo.png
rename to Server/webadmin/files/logo.png
diff --git a/MCServer/webadmin/files/logo_login.png b/Server/webadmin/files/logo_login.png
similarity index 100%
rename from MCServer/webadmin/files/logo_login.png
rename to Server/webadmin/files/logo_login.png
diff --git a/MCServer/webadmin/files/mc-logo.png b/Server/webadmin/files/mc-logo.png
similarity index 100%
rename from MCServer/webadmin/files/mc-logo.png
rename to Server/webadmin/files/mc-logo.png
diff --git a/MCServer/webadmin/files/pmfolder.gif b/Server/webadmin/files/pmfolder.gif
similarity index 100%
rename from MCServer/webadmin/files/pmfolder.gif
rename to Server/webadmin/files/pmfolder.gif
diff --git a/MCServer/webadmin/files/style.css b/Server/webadmin/files/style.css
similarity index 100%
rename from MCServer/webadmin/files/style.css
rename to Server/webadmin/files/style.css
diff --git a/MCServer/webadmin/files/sub_pmfolder.gif b/Server/webadmin/files/sub_pmfolder.gif
similarity index 100%
rename from MCServer/webadmin/files/sub_pmfolder.gif
rename to Server/webadmin/files/sub_pmfolder.gif
diff --git a/MCServer/webadmin/files/tcat.png b/Server/webadmin/files/tcat.png
similarity index 100%
rename from MCServer/webadmin/files/tcat.png
rename to Server/webadmin/files/tcat.png
diff --git a/MCServer/webadmin/files/thead.png b/Server/webadmin/files/thead.png
similarity index 100%
rename from MCServer/webadmin/files/thead.png
rename to Server/webadmin/files/thead.png
diff --git a/MCServer/webadmin/login_template.html b/Server/webadmin/login_template.html
similarity index 100%
rename from MCServer/webadmin/login_template.html
rename to Server/webadmin/login_template.html
diff --git a/MCServer/webadmin/template.html b/Server/webadmin/template.html
similarity index 100%
rename from MCServer/webadmin/template.html
rename to Server/webadmin/template.html
diff --git a/MCServer/webadmin/template.lua b/Server/webadmin/template.lua
similarity index 100%
rename from MCServer/webadmin/template.lua
rename to Server/webadmin/template.lua
diff --git a/appveyor.yml b/appveyor.yml
index b14fe30c7..d2dc73739 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,6 +9,6 @@ before_build:
 - cmake -G "Visual Studio 12" .
 - echo %TIME%
 build:
-  project: MCServer.sln
+  project: Cuberite.sln
   parallel: true
   verbosity: minimal
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 03dfc76db..a9e1a6606 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required (VERSION 2.8.2)
-project (MCServer)
+project (Cuberite)
 
 
 include_directories (SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/../lib/")
@@ -301,12 +301,12 @@ endforeach()
 FILE(WRITE "AllFiles.lst" "${ALLFILESLINES}")
 
 
-set(EXECUTABLE MCServer)
+set(EXECUTABLE Cuberite)
 
 if (MSVC)
 	get_directory_property(BINDING_OUTPUTS DIRECTORY "Bindings" DEFINITION BINDING_OUTPUTS)
 	get_directory_property(BINDING_DEPENDENCIES DIRECTORY "Bindings" DEFINITION BINDING_DEPENDENCIES)
-	
+
 	# The paths in BINDING_DEPENDENCIES are relative to the Bindings folder, convert them relative to this folder:
 	foreach (dep ${BINDING_DEPENDENCIES})
 		list (APPEND BINDINGS_DEPENDENCIES "Bindings/${dep}")
@@ -331,12 +331,12 @@ add_executable(${EXECUTABLE} ${SOURCE})
 
 
 # Output the executable into the $/MCServer folder, so that it has access to external resources:
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/MCServer)
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/Server)
 SET_TARGET_PROPERTIES(${EXECUTABLE} PROPERTIES
-	RUNTIME_OUTPUT_DIRECTORY_DEBUG          ${CMAKE_SOURCE_DIR}/MCServer
-	RUNTIME_OUTPUT_DIRECTORY_RELEASE        ${CMAKE_SOURCE_DIR}/MCServer
-	RUNTIME_OUTPUT_DIRECTORY_DEBUGPROFILE   ${CMAKE_SOURCE_DIR}/MCServer
-	RUNTIME_OUTPUT_DIRECTORY_RELEASEPROFILE ${CMAKE_SOURCE_DIR}/MCServer
+	RUNTIME_OUTPUT_DIRECTORY_DEBUG          ${CMAKE_SOURCE_DIR}/Server
+	RUNTIME_OUTPUT_DIRECTORY_RELEASE        ${CMAKE_SOURCE_DIR}/Server
+	RUNTIME_OUTPUT_DIRECTORY_DEBUGPROFILE   ${CMAKE_SOURCE_DIR}/Server
+	RUNTIME_OUTPUT_DIRECTORY_RELEASEPROFILE ${CMAKE_SOURCE_DIR}/Server
 )
 
 
diff --git a/uploadCoverage.sh b/uploadCoverage.sh
index fc17ddc2c..761a0c941 100755
--- a/uploadCoverage.sh
+++ b/uploadCoverage.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [ "$TRAVIS_MCSERVER_BUILD_TYPE" == "COVERAGE" ]
+if [ "$TRAVIS_CUBERITE_BUILD_TYPE" == "COVERAGE" ]
 	then
 	find tests -type f -name '*.gcda' -exec sh -c 'cp {} $(dirname {})/../$(basename {})' \;
 	coveralls --exclude lib --exclude Android >/dev/null