diff --git a/MCServer_high_detail_debug.cmd b/Install/MCServer_high_detail_debug.cmd
similarity index 100%
rename from MCServer_high_detail_debug.cmd
rename to Install/MCServer_high_detail_debug.cmd
diff --git a/MCServer_medium_detail_debug.cmd b/Install/MCServer_medium_detail_debug.cmd
similarity index 100%
rename from MCServer_medium_detail_debug.cmd
rename to Install/MCServer_medium_detail_debug.cmd
diff --git a/MersenneTwister-LICENSE.txt b/Install/MersenneTwister-LICENSE.txt
similarity index 100%
rename from MersenneTwister-LICENSE.txt
rename to Install/MersenneTwister-LICENSE.txt
diff --git a/Install/Zip2008.list b/Install/Zip2008.list
index edc3950c4..369d282b8 100644
--- a/Install/Zip2008.list
+++ b/Install/Zip2008.list
@@ -1,17 +1,16 @@
-MCServer.exe
+..\MCServer\MCServer.exe
+..\MCServer\Plugins
+..\MCServer\webadmin
+..\MCServer\crafting.txt
+..\MCServer\furnace.txt
+..\MCServer\items.ini
+..\MCServer\monsters.ini
 MCServer*debug.cmd
-Plugins
-webadmin
-crafting.txt
 banned.example.ini
-furnace.txt
 groups.example.ini
-items.ini
 Lua-LICENSE.txt
 MersenneTwister-LICENSE.txt
-monsters.ini
 settings.example.ini
-terrain.ini
 users.example.ini
 webadmin.example.ini
 whitelist.example.ini
\ No newline at end of file
diff --git a/Install/Zip2008_PDBs.list b/Install/Zip2008_PDBs.list
index 35ffc5919..568858cbb 100644
--- a/Install/Zip2008_PDBs.list
+++ b/Install/Zip2008_PDBs.list
@@ -4,5 +4,4 @@ VC2008\Release\Lua\*.pdb
 VC2008\Release\ToLua\*.pdb
 VC2008\Release\webserver\*.pdb
 VC2008\Release\zlib*.pdb
-source\Bindings.*
-
+source\Bindings.*
\ No newline at end of file
diff --git a/MCServer/banned.example.ini b/Install/banned.example.ini
similarity index 100%
rename from MCServer/banned.example.ini
rename to Install/banned.example.ini
diff --git a/MCServer/groups.example.ini b/Install/groups.example.ini
similarity index 100%
rename from MCServer/groups.example.ini
rename to Install/groups.example.ini
diff --git a/MCServer/settings.example.ini b/Install/settings.example.ini
similarity index 100%
rename from MCServer/settings.example.ini
rename to Install/settings.example.ini
diff --git a/MCServer/users.example.ini b/Install/users.example.ini
similarity index 100%
rename from MCServer/users.example.ini
rename to Install/users.example.ini
diff --git a/MCServer/webadmin.example.ini b/Install/webadmin.example.ini
similarity index 100%
rename from MCServer/webadmin.example.ini
rename to Install/webadmin.example.ini
diff --git a/MCServer/whitelist.example.ini b/Install/whitelist.example.ini
similarity index 100%
rename from MCServer/whitelist.example.ini
rename to Install/whitelist.example.ini
diff --git a/Nightbuild2008.cmd b/Nightbuild2008.cmd
index 61a622941..6e55ecc50 100644
--- a/Nightbuild2008.cmd
+++ b/Nightbuild2008.cmd
@@ -28,6 +28,9 @@ if %subwcrev%a == a set subwcrev=subwcrev
 echo Performing nightbuild of MC-Server
 
 
+
+
+
 set DONOTPAUSE=y
 
 :: Update the sources to the latest revision:
@@ -50,7 +53,7 @@ echo WCREV = %WCREV%
  
 
 :: Test if the version is already present
-if exist MCServer_Win_%WCREV%.7z (
+if exist Install\MCServer_Win_%WCREV%.7z (
 	echo Latest version already present, bailing out
 	goto end
 )
@@ -58,6 +61,8 @@ if exist MCServer_Win_%WCREV%.7z (
 
 
 :: Update Bindings.cpp
+del source\Bindings.cpp
+del source\Bindings.h
 echo Updating Lua bindings
 set ALLTOLUA_WAIT=N
 cd source
@@ -78,15 +83,18 @@ if errorlevel 1 goto haderror
 
 
 
+
 :: Use 7-zip to compress the resulting files into a single file:
 :: Note: the output filename here must be the same as in the upload_win.ftp.template script
-copy VC2008\Release\MCServer.exe MCServer.exe
-%zip% a -mx9 -y MCServer_Win_%WCREV%.7z -scsWIN @Install\Zip2008.list
+copy MCServer\MCServer.exe Install\MCServer.exe
+cd Install
+%zip% a -mx9 -y MCServer_Win_%WCREV%.7z -scsWIN @Zip2008.list
 if errorlevel 1 goto haderror
+cd ..
 
 :: Also pack PDBs into a separate archive:
 :: Note: the output filename here must be the same as in the upload_win.ftp.template script
-%zip% a -mx9 -y MCServer_Win_%WCREV%_PDBs.7z -scsWIN @Install\Zip2008_PDBs.list
+%zip% a -mx9 -y Install\MCServer_Win_%WCREV%_PDBs.7z -scsWIN @Install\Zip2008_PDBs.list
 if errorlevel 1 goto haderror