diff --git a/build/visualstudio/config-build.xml b/build/msbuild/config-build.xml
similarity index 100%
rename from build/visualstudio/config-build.xml
rename to build/msbuild/config-build.xml
diff --git a/build/visualstudio/Lol.Core.Config.props b/build/msbuild/lol.config.props
similarity index 52%
rename from build/visualstudio/Lol.Core.Config.props
rename to build/msbuild/lol.config.props
index c3ab6c29..79584054 100644
--- a/build/visualstudio/Lol.Core.Config.props
+++ b/build/msbuild/lol.config.props
@@ -1,34 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!--
+     - Import settings that can be overridden by the user
+   -->
   <Import Project="config-build.xml" />
+
+  <!--
+     - Import defaults settings from Visual Studio
+   -->
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+
+  <!--
+     - Default settings for Debug configurations
+   -->
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
+
+  <!--
+     - Default settings for Release configurations
+   -->
   <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
+
+  <!--
+     - Default settings for any configuration
+   -->
   <PropertyGroup Label="Configuration">
     <CharacterSet>MultiByte</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
     <ExceptionHandling>false</ExceptionHandling>
     <FloatingPointModel>Fast</FloatingPointModel>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Platform)'=='Win32' and '$(SolutionName)'=='Lol (vs2013)'" Label="Configuration">
-    <PlatformToolset>v120</PlatformToolset>
+
+  <!--
+     - Select the platform toolset depending on the platform
+   -->
+  <PropertyGroup Condition="'$(Platform)'=='Win32'" Label="Configuration">
+    <PlatformToolset Condition="'$(SolutionName)'=='Lol (vs2013)'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(SolutionName)'=='Lol (vs2014)'">v140</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Platform)'=='Win32' and '$(SolutionName)'=='Lol (vs2014)'" Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Platform)'=='x64' and '$(SolutionName)'=='Lol (vs2013)'" Label="Configuration">
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Platform)'=='x64' and '$(SolutionName)'=='Lol (vs2014)'" Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+  <PropertyGroup Condition="'$(Platform)'=='x64'" Label="Configuration">
+    <PlatformToolset Condition="'$(SolutionName)'=='Lol (vs2013)'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(SolutionName)'=='Lol (vs2014)'">v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)'=='PS3'" Label="Configuration">
     <PlatformToolset>SNC</PlatformToolset>
   </PropertyGroup>
+
+  <!--
+     - Import final settings from Visual Studio
+   -->
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
 </Project>
diff --git a/build/visualstudio/Lol.Core.Rules.props b/build/msbuild/lol.rules.props
similarity index 100%
rename from build/visualstudio/Lol.Core.Rules.props
rename to build/msbuild/lol.rules.props
diff --git a/build/visualstudio/Lol.Core.Vars.props b/build/msbuild/lol.vars.props
similarity index 98%
rename from build/visualstudio/Lol.Core.Vars.props
rename to build/msbuild/lol.vars.props
index a1e607a5..5a69ae94 100644
--- a/build/visualstudio/Lol.Core.Vars.props
+++ b/build/msbuild/lol.vars.props
@@ -13,7 +13,7 @@
     <SdlImageDir>$(ExternalDir)\sdl-image-2.0.0</SdlImageDir>
     <SdlMixerDir>$(ExternalDir)\sdl-mixer-2.0.0</SdlMixerDir>
     <SdlIncludes>$(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include</SdlIncludes>
-    <SdlLibs Condition="'$(Platform)'=='Win32'">$(SdlDir)\lib\i686-w64-msvc;$(SdlImageDir)\lib\i686-w64-msvc;$(SdlMixerDir)\lib\i686-w64-msvc</SdlLibs>
+    <SdlLibs Condition="'$(Platform)'=='Win32'">$(SdlDir)\lib\i686-w64-mingw32;$(SdlImageDir)\lib\i686-w64-msvc;$(SdlMixerDir)\lib\i686-w64-msvc</SdlLibs>
     <SdlLibs Condition="'$(Platform)'=='x64'">$(SdlDir)\lib\x86_64-msvc;$(SdlImageDir)\lib\x86_64-msvc;$(SdlMixerDir)\lib\x86_64-msvc</SdlLibs>
     <SdlDeps Condition="'$(Platform)'=='Win32'">SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_mixer.lib</SdlDeps>
     <SdlDeps Condition="'$(Platform)'=='x64'">SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_mixer.lib</SdlDeps>
diff --git a/build/visualstudio/Lol.Fx.props b/build/msbuild/lolfx.props
similarity index 100%
rename from build/visualstudio/Lol.Fx.props
rename to build/msbuild/lolfx.props
diff --git a/build/visualstudio/Lol.Fx.targets b/build/msbuild/lolfx.targets
similarity index 100%
rename from build/visualstudio/Lol.Fx.targets
rename to build/msbuild/lolfx.targets
diff --git a/build/visualstudio/Lol.Fx.xml b/build/msbuild/lolfx.xml
similarity index 100%
rename from build/visualstudio/Lol.Fx.xml
rename to build/msbuild/lolfx.xml
diff --git a/demos/test/benchsuite.vcxproj b/demos/test/benchsuite.vcxproj
index 5dce14da..2f118804 100644
--- a/demos/test/benchsuite.vcxproj
+++ b/demos/test/benchsuite.vcxproj
@@ -65,19 +65,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
diff --git a/demos/test/btphystest.vcxproj b/demos/test/btphystest.vcxproj
index 9e1b7fbd..cc1213e8 100644
--- a/demos/test/btphystest.vcxproj
+++ b/demos/test/btphystest.vcxproj
@@ -83,19 +83,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
diff --git a/demos/test/meshviewer.vcxproj b/demos/test/meshviewer.vcxproj
index f682bc62..51f0d5b2 100644
--- a/demos/test/meshviewer.vcxproj
+++ b/demos/test/meshviewer.vcxproj
@@ -115,19 +115,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
diff --git a/demos/test/nacl_phystest.vcxproj b/demos/test/nacl_phystest.vcxproj
index 091a5d97..ebe26bfb 100644
--- a/demos/test/nacl_phystest.vcxproj
+++ b/demos/test/nacl_phystest.vcxproj
@@ -69,19 +69,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/demos/tutorial/01_triangle.vcxproj b/demos/tutorial/01_triangle.vcxproj
index 2a02d317..52b6c0be 100644
--- a/demos/tutorial/01_triangle.vcxproj
+++ b/demos/tutorial/01_triangle.vcxproj
@@ -64,19 +64,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
diff --git a/demos/tutorial/02_cube.vcxproj b/demos/tutorial/02_cube.vcxproj
index ca02120b..385e283d 100644
--- a/demos/tutorial/02_cube.vcxproj
+++ b/demos/tutorial/02_cube.vcxproj
@@ -64,19 +64,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
diff --git a/demos/tutorial/03_noise.vcxproj b/demos/tutorial/03_noise.vcxproj
index fc3b8262..e2b28af0 100644
--- a/demos/tutorial/03_noise.vcxproj
+++ b/demos/tutorial/03_noise.vcxproj
@@ -64,19 +64,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
diff --git a/demos/tutorial/04_texture.vcxproj b/demos/tutorial/04_texture.vcxproj
index 04dea3f9..e085becc 100644
--- a/demos/tutorial/04_texture.vcxproj
+++ b/demos/tutorial/04_texture.vcxproj
@@ -64,19 +64,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
diff --git a/demos/tutorial/05_easymesh.vcxproj b/demos/tutorial/05_easymesh.vcxproj
index d0447b1e..dec76371 100644
--- a/demos/tutorial/05_easymesh.vcxproj
+++ b/demos/tutorial/05_easymesh.vcxproj
@@ -61,19 +61,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
diff --git a/demos/tutorial/06_sprite.vcxproj b/demos/tutorial/06_sprite.vcxproj
index a703a7cc..74f747c8 100644
--- a/demos/tutorial/06_sprite.vcxproj
+++ b/demos/tutorial/06_sprite.vcxproj
@@ -61,19 +61,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/demos/tutorial/07_input.vcxproj b/demos/tutorial/07_input.vcxproj
index b458bdf6..f50a2b69 100644
--- a/demos/tutorial/07_input.vcxproj
+++ b/demos/tutorial/07_input.vcxproj
@@ -64,19 +64,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
diff --git a/demos/tutorial/08_fbo.vcxproj b/demos/tutorial/08_fbo.vcxproj
index 4a08503b..08c1f1bd 100644
--- a/demos/tutorial/08_fbo.vcxproj
+++ b/demos/tutorial/08_fbo.vcxproj
@@ -64,19 +64,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
diff --git a/demos/tutorial/11_fractal.vcxproj b/demos/tutorial/11_fractal.vcxproj
index 7b044a20..6fb27632 100644
--- a/demos/tutorial/11_fractal.vcxproj
+++ b/demos/tutorial/11_fractal.vcxproj
@@ -64,19 +64,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
diff --git a/demos/tutorial/12_voronoi.vcxproj b/demos/tutorial/12_voronoi.vcxproj
index 846bea87..6db93a93 100644
--- a/demos/tutorial/12_voronoi.vcxproj
+++ b/demos/tutorial/12_voronoi.vcxproj
@@ -68,19 +68,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
diff --git a/src/bullet/lolbullet.vcxproj b/src/bullet/lolbullet.vcxproj
index 7abad01b..c4d67aaa 100644
--- a/src/bullet/lolbullet.vcxproj
+++ b/src/bullet/lolbullet.vcxproj
@@ -47,7 +47,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <PropertyGroup Label="Configuration">
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -60,10 +60,10 @@
   </PropertyGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -463,6 +463,6 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
diff --git a/src/lolcore.vcxproj b/src/lolcore.vcxproj
index b4c5710a..b1263986 100644
--- a/src/lolcore.vcxproj
+++ b/src/lolcore.vcxproj
@@ -47,7 +47,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
@@ -88,14 +88,14 @@
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions);LOL_INPUT_V2</PreprocessorDefinitions>
@@ -453,6 +453,6 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
diff --git a/src/lua/lollua.vcxproj b/src/lua/lollua.vcxproj
index eb096a1b..d3d3fa74 100644
--- a/src/lua/lollua.vcxproj
+++ b/src/lua/lollua.vcxproj
@@ -47,7 +47,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <PropertyGroup Label="Configuration">
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -60,10 +60,10 @@
   </PropertyGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>LUA_ANSI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -132,6 +132,6 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
diff --git a/src/t/test-base.vcxproj b/src/t/test-base.vcxproj
index 002027a9..8b53a490 100644
--- a/src/t/test-base.vcxproj
+++ b/src/t/test-base.vcxproj
@@ -66,19 +66,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
diff --git a/src/t/test-entity.vcxproj b/src/t/test-entity.vcxproj
index 81b31c4e..cceb0d70 100644
--- a/src/t/test-entity.vcxproj
+++ b/src/t/test-entity.vcxproj
@@ -62,19 +62,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
diff --git a/src/t/test-image.vcxproj b/src/t/test-image.vcxproj
index 03a92237..7e3fc115 100644
--- a/src/t/test-image.vcxproj
+++ b/src/t/test-image.vcxproj
@@ -63,19 +63,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
diff --git a/src/t/test-math.vcxproj b/src/t/test-math.vcxproj
index 8a1fbbbc..ef06bb4f 100644
--- a/src/t/test-math.vcxproj
+++ b/src/t/test-math.vcxproj
@@ -75,19 +75,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>
diff --git a/src/t/test-sys.vcxproj b/src/t/test-sys.vcxproj
index 11a4bc6a..ab8f8415 100644
--- a/src/t/test-sys.vcxproj
+++ b/src/t/test-sys.vcxproj
@@ -62,19 +62,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.config.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+    <Import Project="$(SolutionDir)\msbuild\lol.vars.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <Import Project="$(SolutionDir)\msbuild\lol.rules.props" />
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+    <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
 </Project>