diff --git a/VC2008/GenerateBindings.cmd b/VC2008/GenerateBindings.cmd
index 1ee0f3bf0..e247d7f4f 100644
--- a/VC2008/GenerateBindings.cmd
+++ b/VC2008/GenerateBindings.cmd
@@ -1,3 +1,3 @@
 set ALLTOLUA_WAIT=N
-cd ..\src
+cd ..\src\Bindings
 AllToLua.bat
\ No newline at end of file
diff --git a/VC2013/GenerateBindings.cmd b/VC2013/GenerateBindings.cmd
index 1ee0f3bf0..e247d7f4f 100644
--- a/VC2013/GenerateBindings.cmd
+++ b/VC2013/GenerateBindings.cmd
@@ -1,3 +1,3 @@
 set ALLTOLUA_WAIT=N
-cd ..\src
+cd ..\src\Bindings
 AllToLua.bat
\ No newline at end of file
diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj
index 07e1ffb4a..56fbdc165 100644
--- a/VC2013/MCServer.vcxproj
+++ b/VC2013/MCServer.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug profiled|Win32">
@@ -367,15 +367,15 @@
     </CustomBuild>
     <ClInclude Include="..\src\Bindings.h" />
     <ClInclude Include="..\src\LuaFunctions.h" />
-    <ClInclude Include="..\src\LuaState.h" />
-    <ClInclude Include="..\src\LuaWindow.h" />
-    <ClInclude Include="..\src\ManualBindings.h" />
-    <ClInclude Include="..\src\Plugin.h" />
-    <ClInclude Include="..\src\PluginLua.h" />
-    <ClInclude Include="..\src\PluginManager.h" />
+    <ClInclude Include="..\src\Bindings\LuaState.h" />
+    <ClInclude Include="..\src\Bindings\LuaWindow.h" />
+    <ClInclude Include="..\src\Bindings\ManualBindings.h" />
+    <ClInclude Include="..\src\Bindings\Plugin.h" />
+    <ClInclude Include="..\src\Bindings\PluginLua.h" />
+    <ClInclude Include="..\src\Bindings\PluginManager.h" />
     <ClInclude Include="..\src\tolua++.h" />
     <ClInclude Include="..\src\tolua_base.h" />
-    <ClInclude Include="..\src\WebPlugin.h" />
+    <ClInclude Include="..\src\Bindings\WebPlugin.h" />
     <ClInclude Include="..\lib\inifile\iniFile.h" />
     <ClInclude Include="..\lib\md5\md5.h" />
     <ClInclude Include="..\src\WorldStorage\FastNBT.h" />
@@ -808,7 +808,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release profiled|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\src\Bindings.cpp">
+    <ClCompile Include="..\src\Bindings\Bindings.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">
       </PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_LuaStatic|Win32'">
@@ -820,13 +820,13 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\src\LuaState.cpp" />
-    <ClCompile Include="..\src\LuaWindow.cpp" />
-    <ClCompile Include="..\src\ManualBindings.cpp" />
-    <ClCompile Include="..\src\Plugin.cpp" />
-    <ClCompile Include="..\src\PluginLua.cpp" />
-    <ClCompile Include="..\src\PluginManager.cpp" />
-    <ClCompile Include="..\src\WebPlugin.cpp" />
+    <ClCompile Include="..\src\Bindings\LuaState.cpp" />
+    <ClCompile Include="..\src\Bindings\LuaWindow.cpp" />
+    <ClCompile Include="..\src\Bindings\ManualBindings.cpp" />
+    <ClCompile Include="..\src\Bindings\Plugin.cpp" />
+    <ClCompile Include="..\src\Bindings\PluginLua.cpp" />
+    <ClCompile Include="..\src\Bindings\PluginManager.cpp" />
+    <ClCompile Include="..\src\Bindings\WebPlugin.cpp" />
     <ClCompile Include="..\lib\inifile\iniFile.cpp" />
     <ClCompile Include="..\lib\md5\md5.cpp">
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>