diff --git a/build/premake/premake4/bin/release/premake4.exe b/build/premake/premake4/bin/release/premake4.exe
index 4852ecdcfc..404914a1dd 100644
Binary files a/build/premake/premake4/bin/release/premake4.exe and b/build/premake/premake4/bin/release/premake4.exe differ
diff --git a/build/premake/premake4/build/vs2008/Premake4.vcproj b/build/premake/premake4/build/vs2008/Premake4.vcproj
deleted file mode 100644
index ab0ce1c387..0000000000
--- a/build/premake/premake4/build/vs2008/Premake4.vcproj
+++ /dev/null
@@ -1,1043 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="Premake4"
-	ProjectGUID="{A006C50E-CB10-D93F-EF73-546A6D088BE8}"
-	RootNamespace="Premake4"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\bin\release"
-			IntermediateDirectory="obj\Release"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				AdditionalIncludeDirectories="..\..\src\host\lua-5.1.4\src"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				ProgramDataBaseFileName="$(OutDir)\premake4.pdb"
-				DebugInformationFormat="0"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"
-				AdditionalIncludeDirectories="..\..\src\host\lua-5.1.4\src"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\premake4.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="false"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				EntryPointSymbol="mainCRTStartup"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\bin\debug"
-			IntermediateDirectory="obj\Debug"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\host\lua-5.1.4\src"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				ProgramDataBaseFileName="$(OutDir)\premake4.pdb"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS"
-				AdditionalIncludeDirectories="..\..\src\host\lua-5.1.4\src"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\premake4.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ProgramDataBaseFileName="$(OutDir)\premake4.pdb"
-				SubSystem="1"
-				EntryPointSymbol="mainCRTStartup"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="tests"
-			Filter=""
-			>
-			<Filter
-				Name="folder"
-				Filter=""
-				>
-				<File
-					RelativePath="..\..\tests\folder\ok.lua"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="actions"
-				Filter=""
-				>
-				<Filter
-					Name="vstudio"
-					Filter=""
-					>
-					<File
-						RelativePath="..\..\tests\actions\vstudio\test_vs2005_csproj.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\tests\actions\vstudio\test_vs2010_flags.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\tests\actions\vstudio\test_vs2010_vcxproj.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\tests\actions\vstudio\test_vs2010_links.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\tests\actions\vstudio\test_vs200x_vcproj.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\tests\actions\vstudio\test_vs200x_vcproj_linker.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\tests\actions\vstudio\test_vs2010_filters.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\tests\actions\vstudio\test_vs2010_project_kinds.lua"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="xcode"
-					Filter=""
-					>
-					<File
-						RelativePath="..\..\tests\actions\xcode\test_xcode_common.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\tests\actions\xcode\test_xcode_dependencies.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\tests\actions\xcode\test_xcode_project.lua"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="make"
-					Filter=""
-					>
-					<File
-						RelativePath="..\..\tests\actions\make\test_make_pch.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\tests\actions\make\test_make_escaping.lua"
-						>
-					</File>
-				</Filter>
-				<File
-					RelativePath="..\..\tests\actions\test_clean.lua"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="base"
-				Filter=""
-				>
-				<File
-					RelativePath="..\..\tests\base\test_tree.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\tests\base\test_config.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\tests\base\test_table.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\tests\base\test_baking.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\tests\base\test_os.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\tests\base\test_path.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\tests\base\test_action.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\tests\base\test_api.lua"
-					>
-				</File>
-			</Filter>
-			<File
-				RelativePath="..\..\tests\premake4.lua"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tests\test_gmake_cpp.lua"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tests\test_vs2005_sln.lua"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tests\test_targets.lua"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tests\test_gmake_cs.lua"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tests\testfx.lua"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tests\test_vs2010_sln.lua"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tests\test_dofile.lua"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tests\test_vs2002_sln.lua"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tests\pepperfish_profiler.lua"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tests\test_gcc.lua"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tests\test_premake.lua"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tests\test_string.lua"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tests\test_vs2008_sln.lua"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tests\test_keywords.lua"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tests\test_platforms.lua"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tests\test_project.lua"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tests\test_stress.lua"
-				>
-			</File>
-			<File
-				RelativePath="..\..\tests\test_vs2003_sln.lua"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="src"
-			Filter=""
-			>
-			<Filter
-				Name="actions"
-				Filter=""
-				>
-				<Filter
-					Name="example"
-					Filter=""
-					>
-					<File
-						RelativePath="..\..\src\actions\example\example_project.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\example\_example.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\example\example_solution.lua"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="vstudio"
-					Filter=""
-					>
-					<File
-						RelativePath="..\..\src\actions\vstudio\vs200x_vcproj.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\vstudio\vs2002_csproj_user.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\vstudio\_vstudio.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\vstudio\vs2003_solution.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\vstudio\vs2010_vcxproxj.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\vstudio\vs_generic_solution.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\vstudio\vs2002_solution.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\vstudio\vs2002_csproj.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\vstudio\vs2005_csproj_user.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\vstudio\vs2005_csproj.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\vstudio\vs2005_solution.lua"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="codeblocks"
-					Filter=""
-					>
-					<File
-						RelativePath="..\..\src\actions\codeblocks\codeblocks_workspace.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\codeblocks\_codeblocks.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\codeblocks\codeblocks_cbp.lua"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="xcode"
-					Filter=""
-					>
-					<File
-						RelativePath="..\..\src\actions\xcode\xcode_project.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\xcode\_xcode.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\xcode\xcode_common.lua"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="make"
-					Filter=""
-					>
-					<File
-						RelativePath="..\..\src\actions\make\make_csharp.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\make\make_solution.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\make\_make.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\make\make_cpp.lua"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="codelite"
-					Filter=""
-					>
-					<File
-						RelativePath="..\..\src\actions\codelite\codelite_workspace.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\codelite\codelite_project.lua"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\actions\codelite\_codelite.lua"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="clean"
-					Filter=""
-					>
-					<File
-						RelativePath="..\..\src\actions\clean\_clean.lua"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="tools"
-				Filter=""
-				>
-				<File
-					RelativePath="..\..\src\tools\msc.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\tools\gcc.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\tools\dotnet.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\tools\ow.lua"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="base"
-				Filter=""
-				>
-				<File
-					RelativePath="..\..\src\base\table.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\base\help.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\base\validate.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\base\os.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\base\configs.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\base\action.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\base\string.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\base\premake.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\base\solution.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\base\tree.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\base\cmdline.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\base\path.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\base\api.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\base\option.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\base\globals.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\base\io.lua"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\base\project.lua"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="host"
-				Filter=""
-				>
-				<Filter
-					Name="lua-5.1.4"
-					Filter=""
-					>
-					<Filter
-						Name="src"
-						Filter=""
-						>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lundump.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lopcodes.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lua.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lparser.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\ldebug.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lgc.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lvm.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lcode.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lstring.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\llimits.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\llex.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lfunc.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lobject.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\ltm.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lstate.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lauxlib.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lapi.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lualib.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\luaconf.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lmem.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lzio.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\ldo.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\ltable.h"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\liolib.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\ltm.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\linit.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\loadlib.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lgc.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lstate.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\llex.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lstrlib.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lmem.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lopcodes.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\ldump.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lmathlib.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\ldo.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\ltablib.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lparser.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lfunc.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lobject.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\ldebug.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\ldblib.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lauxlib.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lzio.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\loslib.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lcode.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lapi.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\ltable.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lbaselib.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lvm.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lstring.c"
-							>
-						</File>
-						<File
-							RelativePath="..\..\src\host\lua-5.1.4\src\lundump.c"
-							>
-						</File>
-					</Filter>
-				</Filter>
-				<File
-					RelativePath="..\..\src\host\premake.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\host\os_getcwd.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\host\os_getversion.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\host\path_isabsolute.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\host\os_isdir.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\host\os_rmdir.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\host\os_chdir.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\host\os_uuid.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\host\os_isfile.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\host\os_match.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\host\os_pathsearch.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\host\os_copyfile.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\host\os_mkdir.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\host\premake.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\host\string_endswith.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\host\scripts.c"
-					>
-				</File>
-			</Filter>
-			<File
-				RelativePath="..\..\src\_premake_main.lua"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\_manifest.lua"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="scripts"
-			Filter=""
-			>
-			<File
-				RelativePath="..\..\scripts\embed.lua"
-				>
-			</File>
-			<File
-				RelativePath="..\..\scripts\release.lua"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="samples"
-			Filter=""
-			>
-			<Filter
-				Name="project"
-				Filter=""
-				>
-				<Filter
-					Name="CsSharedLib"
-					Filter=""
-					>
-					<File
-						RelativePath="..\..\samples\project\CsSharedLib\premake4.lua"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="CppWindowedApp"
-					Filter=""
-					>
-					<File
-						RelativePath="..\..\samples\project\CppWindowedApp\premake4.lua"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="CppStaticLib"
-					Filter=""
-					>
-					<File
-						RelativePath="..\..\samples\project\CppStaticLib\premake4.lua"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="CsConsoleApp"
-					Filter=""
-					>
-					<File
-						RelativePath="..\..\samples\project\CsConsoleApp\premake4.lua"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="CppSharedLib"
-					Filter=""
-					>
-					<File
-						RelativePath="..\..\samples\project\CppSharedLib\premake4.lua"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="CppConsoleApp"
-					Filter=""
-					>
-					<File
-						RelativePath="..\..\samples\project\CppConsoleApp\premake4.lua"
-						>
-					</File>
-				</Filter>
-				<File
-					RelativePath="..\..\samples\project\premake4.lua"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<File
-			RelativePath="..\..\CHANGES.txt"
-			>
-		</File>
-		<File
-			RelativePath="..\..\LICENSE.txt"
-			>
-		</File>
-		<File
-			RelativePath="..\..\README.txt"
-			>
-		</File>
-		<File
-			RelativePath="..\..\BUILD.txt"
-			>
-		</File>
-		<File
-			RelativePath="..\..\premake4.lua"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/premake/premake4/build/vs2010/Premake4.sln b/build/premake/premake4/build/vs2010/Premake4.sln
deleted file mode 100644
index 522883434f..0000000000
--- a/build/premake/premake4/build/vs2010/Premake4.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Premake4", "Premake4.vcxproj", "{027C0818-A605-2B34-89E9-2EB33B66370B}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Release|Win32 = Release|Win32
-		Debug|Win32 = Debug|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{027C0818-A605-2B34-89E9-2EB33B66370B}.Release|Win32.ActiveCfg = Release|Win32
-		{027C0818-A605-2B34-89E9-2EB33B66370B}.Release|Win32.Build.0 = Release|Win32
-		{027C0818-A605-2B34-89E9-2EB33B66370B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{027C0818-A605-2B34-89E9-2EB33B66370B}.Debug|Win32.Build.0 = Debug|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/build/premake/premake4/build/vs2008/Premake4.sln b/build/premake/premake4/build/vs2013/Premake4.sln
similarity index 52%
rename from build/premake/premake4/build/vs2008/Premake4.sln
rename to build/premake/premake4/build/vs2013/Premake4.sln
index cfafd546c9..f0440475be 100644
--- a/build/premake/premake4/build/vs2008/Premake4.sln
+++ b/build/premake/premake4/build/vs2013/Premake4.sln
@@ -1,7 +1,7 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Premake4", "Premake4.vcproj", "{A006C50E-CB10-D93F-EF73-546A6D088BE8}"
+Microsoft Visual Studio Solution File, Format Version 13.00
+# Visual Studio 2013
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Premake4", "Premake4.vcxproj", "{C01B3660-A453-4F42-B58C-F0B862AF8C1C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -9,10 +9,10 @@ Global
 		Debug|Win32 = Debug|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A006C50E-CB10-D93F-EF73-546A6D088BE8}.Release|Win32.ActiveCfg = Release|Win32
-		{A006C50E-CB10-D93F-EF73-546A6D088BE8}.Release|Win32.Build.0 = Release|Win32
-		{A006C50E-CB10-D93F-EF73-546A6D088BE8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A006C50E-CB10-D93F-EF73-546A6D088BE8}.Debug|Win32.Build.0 = Debug|Win32
+		{C01B3660-A453-4F42-B58C-F0B862AF8C1C}.Release|Win32.ActiveCfg = Release|Win32
+		{C01B3660-A453-4F42-B58C-F0B862AF8C1C}.Release|Win32.Build.0 = Release|Win32
+		{C01B3660-A453-4F42-B58C-F0B862AF8C1C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C01B3660-A453-4F42-B58C-F0B862AF8C1C}.Debug|Win32.Build.0 = Debug|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/build/premake/premake4/build/vs2010/Premake4.vcxproj b/build/premake/premake4/build/vs2013/Premake4.vcxproj
similarity index 94%
rename from build/premake/premake4/build/vs2010/Premake4.vcxproj
rename to build/premake/premake4/build/vs2013/Premake4.vcxproj
index 964b11ec09..84b26d198f 100644
--- a/build/premake/premake4/build/vs2010/Premake4.vcxproj
+++ b/build/premake/premake4/build/vs2013/Premake4.vcxproj
@@ -11,7 +11,7 @@
 		</ProjectConfiguration>
 	</ItemGroup>
 	<PropertyGroup Label="Globals">
-		<ProjectGuid>{027C0818-A605-2B34-89E9-2EB33B66370B}</ProjectGuid>
+		<ProjectGuid>{C01B3660-A453-4F42-B58C-F0B862AF8C1C}</ProjectGuid>
 		<RootNamespace>Premake4</RootNamespace>
 		<Keyword>Win32Proj</Keyword>
 	</PropertyGroup>
@@ -20,11 +20,13 @@
 		<ConfigurationType>Application</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<UseDebugLibraries>false</UseDebugLibraries>
+		<PlatformToolset>v120_xp</PlatformToolset>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 		<ConfigurationType>Application</ConfigurationType>
 		<CharacterSet>MultiByte</CharacterSet>
 		<UseDebugLibraries>true</UseDebugLibraries>
+		<PlatformToolset>v120_xp</PlatformToolset>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 	<ImportGroup Label="ExtensionSettings">
@@ -107,228 +109,222 @@
 	</ItemDefinitionGroup>
 	<ItemGroup>
 		<ClInclude Include="..\..\src\host\premake.h" />
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lundump.h" />
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lopcodes.h" />
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lua.h" />
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lparser.h" />
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\ldebug.h" />
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lgc.h" />
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lvm.h" />
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lcode.h" />
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lstring.h" />
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\llimits.h" />
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\llex.h" />
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lfunc.h" />
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lobject.h" />
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\ltm.h" />
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lstate.h" />
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lauxlib.h" />
 		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lapi.h" />
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lualib.h" />
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\luaconf.h" />
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lmem.h" />
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lzio.h" />
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lauxlib.h" />
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lcode.h" />
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\ldebug.h" />
 		<ClInclude Include="..\..\src\host\lua-5.1.4\src\ldo.h" />
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lfunc.h" />
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lgc.h" />
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\llex.h" />
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\llimits.h" />
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lmem.h" />
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lobject.h" />
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lopcodes.h" />
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lparser.h" />
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lstate.h" />
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lstring.h" />
 		<ClInclude Include="..\..\src\host\lua-5.1.4\src\ltable.h" />
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\ltm.h" />
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lua.h" />
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\luaconf.h" />
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lualib.h" />
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lundump.h" />
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lvm.h" />
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lzio.h" />
 	</ItemGroup>
 	<ItemGroup>
+		<ClCompile Include="..\..\src\host\os_chdir.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\os_copyfile.c">
+		</ClCompile>
 		<ClCompile Include="..\..\src\host\os_getcwd.c">
 		</ClCompile>
 		<ClCompile Include="..\..\src\host\os_getversion.c">
 		</ClCompile>
-		<ClCompile Include="..\..\src\host\path_isabsolute.c">
-		</ClCompile>
 		<ClCompile Include="..\..\src\host\os_isdir.c">
 		</ClCompile>
-		<ClCompile Include="..\..\src\host\os_rmdir.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\os_chdir.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\os_uuid.c">
-		</ClCompile>
 		<ClCompile Include="..\..\src\host\os_isfile.c">
 		</ClCompile>
 		<ClCompile Include="..\..\src\host\os_match.c">
 		</ClCompile>
+		<ClCompile Include="..\..\src\host\os_mkdir.c">
+		</ClCompile>
 		<ClCompile Include="..\..\src\host\os_pathsearch.c">
 		</ClCompile>
-		<ClCompile Include="..\..\src\host\os_copyfile.c">
+		<ClCompile Include="..\..\src\host\os_rmdir.c">
 		</ClCompile>
-		<ClCompile Include="..\..\src\host\os_mkdir.c">
+		<ClCompile Include="..\..\src\host\os_uuid.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\path_isabsolute.c">
 		</ClCompile>
 		<ClCompile Include="..\..\src\host\premake.c">
 		</ClCompile>
-		<ClCompile Include="..\..\src\host\string_endswith.c">
-		</ClCompile>
 		<ClCompile Include="..\..\src\host\scripts.c">
 		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\liolib.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ltm.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\linit.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\loadlib.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lgc.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lstate.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\llex.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lstrlib.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lmem.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lopcodes.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ldump.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lmathlib.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ldo.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ltablib.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lparser.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lfunc.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lobject.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ldebug.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ldblib.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lauxlib.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lzio.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\loslib.c">
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lcode.c">
+		<ClCompile Include="..\..\src\host\string_endswith.c">
 		</ClCompile>
 		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lapi.c">
 		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ltable.c">
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lauxlib.c">
 		</ClCompile>
 		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lbaselib.c">
 		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lvm.c">
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lcode.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ldblib.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ldebug.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ldo.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ldump.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lfunc.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lgc.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\linit.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\liolib.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\llex.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lmathlib.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lmem.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\loadlib.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lobject.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lopcodes.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\loslib.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lparser.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lstate.c">
 		</ClCompile>
 		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lstring.c">
 		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lstrlib.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ltable.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ltablib.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ltm.c">
+		</ClCompile>
 		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lundump.c">
 		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lvm.c">
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lzio.c">
+		</ClCompile>
 	</ItemGroup>
 	<ItemGroup>
+		<None Include="..\..\BUILD.txt" />
 		<None Include="..\..\CHANGES.txt" />
 		<None Include="..\..\LICENSE.txt" />
 		<None Include="..\..\README.txt" />
-		<None Include="..\..\BUILD.txt" />
 		<None Include="..\..\premake4.lua" />
-		<None Include="..\..\tests\premake4.lua" />
-		<None Include="..\..\tests\test_gmake_cpp.lua" />
-		<None Include="..\..\tests\test_vs2005_sln.lua" />
-		<None Include="..\..\tests\test_targets.lua" />
-		<None Include="..\..\tests\test_gmake_cs.lua" />
-		<None Include="..\..\tests\testfx.lua" />
-		<None Include="..\..\tests\test_vs2010_sln.lua" />
-		<None Include="..\..\tests\test_dofile.lua" />
-		<None Include="..\..\tests\test_vs2002_sln.lua" />
-		<None Include="..\..\tests\pepperfish_profiler.lua" />
-		<None Include="..\..\tests\test_gcc.lua" />
-		<None Include="..\..\tests\test_premake.lua" />
-		<None Include="..\..\tests\test_string.lua" />
-		<None Include="..\..\tests\test_vs2008_sln.lua" />
-		<None Include="..\..\tests\test_keywords.lua" />
-		<None Include="..\..\tests\test_platforms.lua" />
-		<None Include="..\..\tests\test_project.lua" />
-		<None Include="..\..\tests\test_stress.lua" />
-		<None Include="..\..\tests\test_vs2003_sln.lua" />
-		<None Include="..\..\tests\folder\ok.lua" />
-		<None Include="..\..\tests\actions\test_clean.lua" />
-		<None Include="..\..\tests\actions\vstudio\test_vs2005_csproj.lua" />
-		<None Include="..\..\tests\actions\vstudio\test_vs2010_flags.lua" />
-		<None Include="..\..\tests\actions\vstudio\test_vs2010_vcxproj.lua" />
-		<None Include="..\..\tests\actions\vstudio\test_vs2010_links.lua" />
-		<None Include="..\..\tests\actions\vstudio\test_vs200x_vcproj.lua" />
-		<None Include="..\..\tests\actions\vstudio\test_vs200x_vcproj_linker.lua" />
-		<None Include="..\..\tests\actions\vstudio\test_vs2010_filters.lua" />
-		<None Include="..\..\tests\actions\vstudio\test_vs2010_project_kinds.lua" />
-		<None Include="..\..\tests\actions\xcode\test_xcode_common.lua" />
-		<None Include="..\..\tests\actions\xcode\test_xcode_dependencies.lua" />
-		<None Include="..\..\tests\actions\xcode\test_xcode_project.lua" />
-		<None Include="..\..\tests\actions\make\test_make_pch.lua" />
-		<None Include="..\..\tests\actions\make\test_make_escaping.lua" />
-		<None Include="..\..\tests\base\test_tree.lua" />
-		<None Include="..\..\tests\base\test_config.lua" />
-		<None Include="..\..\tests\base\test_table.lua" />
-		<None Include="..\..\tests\base\test_baking.lua" />
-		<None Include="..\..\tests\base\test_os.lua" />
-		<None Include="..\..\tests\base\test_path.lua" />
-		<None Include="..\..\tests\base\test_action.lua" />
-		<None Include="..\..\tests\base\test_api.lua" />
-		<None Include="..\..\src\_premake_main.lua" />
+		<None Include="..\..\scripts\embed.lua" />
+		<None Include="..\..\scripts\release.lua" />
 		<None Include="..\..\src\_manifest.lua" />
-		<None Include="..\..\src\actions\example\example_project.lua" />
-		<None Include="..\..\src\actions\example\_example.lua" />
-		<None Include="..\..\src\actions\example\example_solution.lua" />
-		<None Include="..\..\src\actions\vstudio\vs200x_vcproj.lua" />
-		<None Include="..\..\src\actions\vstudio\vs2002_csproj_user.lua" />
-		<None Include="..\..\src\actions\vstudio\_vstudio.lua" />
-		<None Include="..\..\src\actions\vstudio\vs2003_solution.lua" />
-		<None Include="..\..\src\actions\vstudio\vs2010_vcxproxj.lua" />
-		<None Include="..\..\src\actions\vstudio\vs_generic_solution.lua" />
-		<None Include="..\..\src\actions\vstudio\vs2002_solution.lua" />
-		<None Include="..\..\src\actions\vstudio\vs2002_csproj.lua" />
-		<None Include="..\..\src\actions\vstudio\vs2005_csproj_user.lua" />
-		<None Include="..\..\src\actions\vstudio\vs2005_csproj.lua" />
-		<None Include="..\..\src\actions\vstudio\vs2005_solution.lua" />
+		<None Include="..\..\src\_premake_main.lua" />
+		<None Include="..\..\src\actions\clean\_clean.lua" />
+		<None Include="..\..\src\actions\codeblocks\codeblocks_cbp.lua" />
 		<None Include="..\..\src\actions\codeblocks\codeblocks_workspace.lua" />
 		<None Include="..\..\src\actions\codeblocks\_codeblocks.lua" />
-		<None Include="..\..\src\actions\codeblocks\codeblocks_cbp.lua" />
-		<None Include="..\..\src\actions\xcode\xcode_project.lua" />
-		<None Include="..\..\src\actions\xcode\_xcode.lua" />
-		<None Include="..\..\src\actions\xcode\xcode_common.lua" />
+		<None Include="..\..\src\actions\codelite\codelite_project.lua" />
+		<None Include="..\..\src\actions\codelite\codelite_workspace.lua" />
+		<None Include="..\..\src\actions\codelite\_codelite.lua" />
+		<None Include="..\..\src\actions\example\example_project.lua" />
+		<None Include="..\..\src\actions\example\example_solution.lua" />
+		<None Include="..\..\src\actions\example\_example.lua" />
+		<None Include="..\..\src\actions\make\make_cpp.lua" />
 		<None Include="..\..\src\actions\make\make_csharp.lua" />
 		<None Include="..\..\src\actions\make\make_solution.lua" />
 		<None Include="..\..\src\actions\make\_make.lua" />
-		<None Include="..\..\src\actions\make\make_cpp.lua" />
-		<None Include="..\..\src\actions\codelite\codelite_workspace.lua" />
-		<None Include="..\..\src\actions\codelite\codelite_project.lua" />
-		<None Include="..\..\src\actions\codelite\_codelite.lua" />
-		<None Include="..\..\src\actions\clean\_clean.lua" />
-		<None Include="..\..\src\tools\msc.lua" />
-		<None Include="..\..\src\tools\gcc.lua" />
-		<None Include="..\..\src\tools\dotnet.lua" />
-		<None Include="..\..\src\tools\ow.lua" />
-		<None Include="..\..\src\base\table.lua" />
-		<None Include="..\..\src\base\help.lua" />
-		<None Include="..\..\src\base\validate.lua" />
-		<None Include="..\..\src\base\os.lua" />
-		<None Include="..\..\src\base\configs.lua" />
+		<None Include="..\..\src\actions\vstudio\vs2002_csproj.lua" />
+		<None Include="..\..\src\actions\vstudio\vs2002_csproj_user.lua" />
+		<None Include="..\..\src\actions\vstudio\vs2002_solution.lua" />
+		<None Include="..\..\src\actions\vstudio\vs2003_solution.lua" />
+		<None Include="..\..\src\actions\vstudio\vs2005_csproj.lua" />
+		<None Include="..\..\src\actions\vstudio\vs2005_csproj_user.lua" />
+		<None Include="..\..\src\actions\vstudio\vs2005_solution.lua" />
+		<None Include="..\..\src\actions\vstudio\vs200x_vcproj.lua" />
+		<None Include="..\..\src\actions\vstudio\vs2010_vcxproxj.lua" />
+		<None Include="..\..\src\actions\vstudio\vs_generic_solution.lua" />
+		<None Include="..\..\src\actions\vstudio\_vstudio.lua" />
+		<None Include="..\..\src\actions\xcode\xcode4_workspace.lua" />
+		<None Include="..\..\src\actions\xcode\xcode_common.lua" />
+		<None Include="..\..\src\actions\xcode\xcode_project.lua" />
+		<None Include="..\..\src\actions\xcode\_xcode.lua" />
 		<None Include="..\..\src\base\action.lua" />
-		<None Include="..\..\src\base\string.lua" />
-		<None Include="..\..\src\base\premake.lua" />
-		<None Include="..\..\src\base\solution.lua" />
-		<None Include="..\..\src\base\tree.lua" />
-		<None Include="..\..\src\base\cmdline.lua" />
-		<None Include="..\..\src\base\path.lua" />
 		<None Include="..\..\src\base\api.lua" />
-		<None Include="..\..\src\base\option.lua" />
+		<None Include="..\..\src\base\cmdline.lua" />
+		<None Include="..\..\src\base\configs.lua" />
 		<None Include="..\..\src\base\globals.lua" />
+		<None Include="..\..\src\base\help.lua" />
 		<None Include="..\..\src\base\io.lua" />
+		<None Include="..\..\src\base\option.lua" />
+		<None Include="..\..\src\base\os.lua" />
+		<None Include="..\..\src\base\path.lua" />
+		<None Include="..\..\src\base\premake.lua" />
 		<None Include="..\..\src\base\project.lua" />
-		<None Include="..\..\scripts\embed.lua" />
-		<None Include="..\..\scripts\release.lua" />
-		<None Include="..\..\samples\project\premake4.lua" />
-		<None Include="..\..\samples\project\CsSharedLib\premake4.lua" />
-		<None Include="..\..\samples\project\CppWindowedApp\premake4.lua" />
-		<None Include="..\..\samples\project\CppStaticLib\premake4.lua" />
-		<None Include="..\..\samples\project\CsConsoleApp\premake4.lua" />
-		<None Include="..\..\samples\project\CppSharedLib\premake4.lua" />
-		<None Include="..\..\samples\project\CppConsoleApp\premake4.lua" />
+		<None Include="..\..\src\base\solution.lua" />
+		<None Include="..\..\src\base\string.lua" />
+		<None Include="..\..\src\base\table.lua" />
+		<None Include="..\..\src\base\tree.lua" />
+		<None Include="..\..\src\base\validate.lua" />
+		<None Include="..\..\src\tools\dotnet.lua" />
+		<None Include="..\..\src\tools\gcc.lua" />
+		<None Include="..\..\src\tools\msc.lua" />
+		<None Include="..\..\src\tools\ow.lua" />
+		<None Include="..\..\tests\pepperfish_profiler.lua" />
+		<None Include="..\..\tests\premake4.lua" />
+		<None Include="..\..\tests\testfx.lua" />
+		<None Include="..\..\tests\test_dofile.lua" />
+		<None Include="..\..\tests\test_gcc.lua" />
+		<None Include="..\..\tests\test_gmake_cpp.lua" />
+		<None Include="..\..\tests\test_gmake_cs.lua" />
+		<None Include="..\..\tests\test_keywords.lua" />
+		<None Include="..\..\tests\test_platforms.lua" />
+		<None Include="..\..\tests\test_premake.lua" />
+		<None Include="..\..\tests\test_project.lua" />
+		<None Include="..\..\tests\test_stress.lua" />
+		<None Include="..\..\tests\test_string.lua" />
+		<None Include="..\..\tests\test_targets.lua" />
+		<None Include="..\..\tests\test_vs2002_sln.lua" />
+		<None Include="..\..\tests\test_vs2003_sln.lua" />
+		<None Include="..\..\tests\test_vs2005_sln.lua" />
+		<None Include="..\..\tests\test_vs2008_sln.lua" />
+		<None Include="..\..\tests\test_vs2010_sln.lua" />
+		<None Include="..\..\tests\actions\test_clean.lua" />
+		<None Include="..\..\tests\actions\make\test_make_escaping.lua" />
+		<None Include="..\..\tests\actions\make\test_make_pch.lua" />
+		<None Include="..\..\tests\actions\vstudio\test_vs2005_csproj.lua" />
+		<None Include="..\..\tests\actions\vstudio\test_vs200x_vcproj.lua" />
+		<None Include="..\..\tests\actions\vstudio\test_vs200x_vcproj_linker.lua" />
+		<None Include="..\..\tests\actions\vstudio\test_vs2010_filters.lua" />
+		<None Include="..\..\tests\actions\vstudio\test_vs2010_flags.lua" />
+		<None Include="..\..\tests\actions\vstudio\test_vs2010_links.lua" />
+		<None Include="..\..\tests\actions\vstudio\test_vs2010_project_kinds.lua" />
+		<None Include="..\..\tests\actions\vstudio\test_vs2010_vcxproj.lua" />
+		<None Include="..\..\tests\actions\xcode\test_xcode_common.lua" />
+		<None Include="..\..\tests\actions\xcode\test_xcode_dependencies.lua" />
+		<None Include="..\..\tests\actions\xcode\test_xcode_project.lua" />
+		<None Include="..\..\tests\base\test_action.lua" />
+		<None Include="..\..\tests\base\test_api.lua" />
+		<None Include="..\..\tests\base\test_baking.lua" />
+		<None Include="..\..\tests\base\test_config.lua" />
+		<None Include="..\..\tests\base\test_os.lua" />
+		<None Include="..\..\tests\base\test_path.lua" />
+		<None Include="..\..\tests\base\test_table.lua" />
+		<None Include="..\..\tests\base\test_tree.lua" />
+		<None Include="..\..\tests\folder\ok.lua" />
 	</ItemGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 	<ImportGroup Label="ExtensionTargets">
diff --git a/build/premake/premake4/build/vs2010/Premake4.vcxproj.filters b/build/premake/premake4/build/vs2013/Premake4.vcxproj.filters
similarity index 82%
rename from build/premake/premake4/build/vs2010/Premake4.vcxproj.filters
rename to build/premake/premake4/build/vs2013/Premake4.vcxproj.filters
index 7f82faddc6..c8352d3b56 100644
--- a/build/premake/premake4/build/vs2010/Premake4.vcxproj.filters
+++ b/build/premake/premake4/build/vs2013/Premake4.vcxproj.filters
@@ -2,187 +2,160 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
 		<Filter Include="src">
-			<UniqueIdentifier>{9834E201-BB85-274E-CB97-0E1DCE22F464}</UniqueIdentifier>
+			<UniqueIdentifier>{36BA0540-A6A1-114F-89F3-042F36024844}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="src\host">
-			<UniqueIdentifier>{19DBA0F3-53E2-48E0-1C48-CD198CD0206D}</UniqueIdentifier>
+			<UniqueIdentifier>{FA5D4911-18C5-E44B-97AA-94331270D873}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="src\host\lua-5.1.4">
-			<UniqueIdentifier>{8C44150A-2C6A-4C53-F31E-E8024ACECD69}</UniqueIdentifier>
+			<UniqueIdentifier>{BC8BA9DE-6170-EF4B-AA76-2273C329A3E4}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="src\host\lua-5.1.4\src">
-			<UniqueIdentifier>{D8D89DF7-95AD-3231-525B-90F8BE4E0E00}</UniqueIdentifier>
-		</Filter>
-		<Filter Include="tests">
-			<UniqueIdentifier>{70403E38-F829-95C1-9A34-9241EBDAC86B}</UniqueIdentifier>
-		</Filter>
-		<Filter Include="tests\folder">
-			<UniqueIdentifier>{1D8238AC-55BD-7574-BE7F-62963A5C6D30}</UniqueIdentifier>
-		</Filter>
-		<Filter Include="tests\actions">
-			<UniqueIdentifier>{1ED16385-1521-E82C-6877-9862575D2092}</UniqueIdentifier>
-		</Filter>
-		<Filter Include="tests\actions\vstudio">
-			<UniqueIdentifier>{7804E521-170E-2977-257F-9EDAED4A1F70}</UniqueIdentifier>
-		</Filter>
-		<Filter Include="tests\actions\xcode">
-			<UniqueIdentifier>{2572C6E9-8DDB-7EB5-7ED8-0F6C0AF38AE4}</UniqueIdentifier>
-		</Filter>
-		<Filter Include="tests\actions\make">
-			<UniqueIdentifier>{359E9E3A-11AE-F32A-801C-401A098B676F}</UniqueIdentifier>
-		</Filter>
-		<Filter Include="tests\base">
-			<UniqueIdentifier>{A529DDCA-FC5F-84EA-D1A4-76CA4F0C0FEA}</UniqueIdentifier>
-		</Filter>
-		<Filter Include="src\actions">
-			<UniqueIdentifier>{7C651E59-9327-A27F-0247-BBE76AC97FA9}</UniqueIdentifier>
-		</Filter>
-		<Filter Include="src\actions\example">
-			<UniqueIdentifier>{9CA1C7D2-7E68-FB7E-00C0-628F435C9B2C}</UniqueIdentifier>
-		</Filter>
-		<Filter Include="src\actions\vstudio">
-			<UniqueIdentifier>{C1B0F97A-57C0-9CB3-C226-2F8225403995}</UniqueIdentifier>
-		</Filter>
-		<Filter Include="src\actions\codeblocks">
-			<UniqueIdentifier>{20CF71BE-79CE-22F5-D15C-05D324195032}</UniqueIdentifier>
-		</Filter>
-		<Filter Include="src\actions\xcode">
-			<UniqueIdentifier>{DC9C7DC5-BC9B-6EF4-C751-933C857C2F5A}</UniqueIdentifier>
-		</Filter>
-		<Filter Include="src\actions\make">
-			<UniqueIdentifier>{C23EA566-EF26-2000-B3F0-AC6C33F24A0D}</UniqueIdentifier>
-		</Filter>
-		<Filter Include="src\actions\codelite">
-			<UniqueIdentifier>{D4912C33-6789-CC5E-DA49-8ED0D2C0ED96}</UniqueIdentifier>
-		</Filter>
-		<Filter Include="src\actions\clean">
-			<UniqueIdentifier>{C0E5BBE9-4BA6-200F-E0AB-98B8DD00F39A}</UniqueIdentifier>
-		</Filter>
-		<Filter Include="src\tools">
-			<UniqueIdentifier>{CBF15AE2-4604-7CB9-8D75-BB569F7D20E3}</UniqueIdentifier>
-		</Filter>
-		<Filter Include="src\base">
-			<UniqueIdentifier>{07B115D5-D7E7-2C78-870F-0CB4B216AD75}</UniqueIdentifier>
+			<UniqueIdentifier>{5C53251B-4541-0849-9C7B-807CA0D0554C}</UniqueIdentifier>
 		</Filter>
 		<Filter Include="scripts">
-			<UniqueIdentifier>{4E2AAC03-91D5-CC81-9F66-C0D57555C4D1}</UniqueIdentifier>
+			<UniqueIdentifier>{537A43E1-A784-DF44-8869-FF09689E64FB}</UniqueIdentifier>
 		</Filter>
-		<Filter Include="samples">
-			<UniqueIdentifier>{B30943DA-5A2B-E2AC-F979-63E4098C3458}</UniqueIdentifier>
+		<Filter Include="src\actions">
+			<UniqueIdentifier>{27AF517C-10D6-5C4F-A114-CCA3E2E417CD}</UniqueIdentifier>
 		</Filter>
-		<Filter Include="samples\project">
-			<UniqueIdentifier>{0FE40C59-8E44-927C-0C31-12BE0C85FE15}</UniqueIdentifier>
+		<Filter Include="src\actions\clean">
+			<UniqueIdentifier>{E36E9579-D1B5-4C4B-8597-C1BC428BE96B}</UniqueIdentifier>
 		</Filter>
-		<Filter Include="samples\project\CsSharedLib">
-			<UniqueIdentifier>{9A4C9648-E379-4F4C-D011-37584868CDBB}</UniqueIdentifier>
+		<Filter Include="src\actions\codeblocks">
+			<UniqueIdentifier>{A766B337-8045-DA44-BF73-E8C2089012DA}</UniqueIdentifier>
 		</Filter>
-		<Filter Include="samples\project\CppWindowedApp">
-			<UniqueIdentifier>{4ED539AC-EEC4-050F-7BE6-B08B60E9022F}</UniqueIdentifier>
+		<Filter Include="src\actions\codelite">
+			<UniqueIdentifier>{3F536621-36C9-3043-AF39-153814F57430}</UniqueIdentifier>
 		</Filter>
-		<Filter Include="samples\project\CppStaticLib">
-			<UniqueIdentifier>{C748DF5F-7C9E-892A-DD8D-AF239B7DECDE}</UniqueIdentifier>
+		<Filter Include="src\actions\example">
+			<UniqueIdentifier>{4EB65216-E256-C14B-BA94-2635DCED676B}</UniqueIdentifier>
 		</Filter>
-		<Filter Include="samples\project\CsConsoleApp">
-			<UniqueIdentifier>{610B0C6C-AE49-5A3B-767A-44E04F578BD3}</UniqueIdentifier>
+		<Filter Include="src\actions\make">
+			<UniqueIdentifier>{8EB2000D-3744-2A4D-AF31-24AC9660A207}</UniqueIdentifier>
 		</Filter>
-		<Filter Include="samples\project\CppSharedLib">
-			<UniqueIdentifier>{198FFD7A-98A3-27B1-AAF5-687A2B18C964}</UniqueIdentifier>
+		<Filter Include="src\actions\vstudio">
+			<UniqueIdentifier>{6682BEBB-F371-8147-BC19-9517F943B28F}</UniqueIdentifier>
 		</Filter>
-		<Filter Include="samples\project\CppConsoleApp">
-			<UniqueIdentifier>{F280199F-E96B-A837-54B4-AB8BB1E9EBF0}</UniqueIdentifier>
+		<Filter Include="src\actions\xcode">
+			<UniqueIdentifier>{B39B9E1D-A0D8-6B4A-85FD-1B1D7B280012}</UniqueIdentifier>
+		</Filter>
+		<Filter Include="src\base">
+			<UniqueIdentifier>{E8945B2E-79D8-7149-B32E-AE3DBB150E49}</UniqueIdentifier>
+		</Filter>
+		<Filter Include="src\tools">
+			<UniqueIdentifier>{390645CE-5B7D-3E42-942D-78343FD35821}</UniqueIdentifier>
+		</Filter>
+		<Filter Include="tests">
+			<UniqueIdentifier>{BC4F4D40-597C-F748-A666-2EDFA87150AD}</UniqueIdentifier>
+		</Filter>
+		<Filter Include="tests\actions">
+			<UniqueIdentifier>{0719453C-23E3-6345-B3DE-1218B5C12237}</UniqueIdentifier>
+		</Filter>
+		<Filter Include="tests\actions\make">
+			<UniqueIdentifier>{244F8DEA-E911-6948-BF29-2DB61556CA92}</UniqueIdentifier>
+		</Filter>
+		<Filter Include="tests\actions\vstudio">
+			<UniqueIdentifier>{6993107F-6A69-B84A-99D8-6F338A127BCC}</UniqueIdentifier>
+		</Filter>
+		<Filter Include="tests\actions\xcode">
+			<UniqueIdentifier>{83AA069D-DDDF-974F-B32B-F5398FB5E77A}</UniqueIdentifier>
+		</Filter>
+		<Filter Include="tests\base">
+			<UniqueIdentifier>{86F6ABC5-91A9-9949-9588-A5DA9BB558E5}</UniqueIdentifier>
+		</Filter>
+		<Filter Include="tests\folder">
+			<UniqueIdentifier>{38AB070D-9B03-9E46-8DE8-B0E5B34ACD23}</UniqueIdentifier>
 		</Filter>
 	</ItemGroup>
 	<ItemGroup>
 		<ClInclude Include="..\..\src\host\premake.h">
 			<Filter>src\host</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lundump.h">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClInclude>
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lopcodes.h">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClInclude>
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lua.h">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClInclude>
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lparser.h">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClInclude>
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\ldebug.h">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClInclude>
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lgc.h">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClInclude>
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lvm.h">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClInclude>
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lcode.h">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClInclude>
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lstring.h">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClInclude>
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\llimits.h">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClInclude>
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\llex.h">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClInclude>
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lfunc.h">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClInclude>
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lobject.h">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClInclude>
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\ltm.h">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClInclude>
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lstate.h">
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lapi.h">
 			<Filter>src\host\lua-5.1.4\src</Filter>
 		</ClInclude>
 		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lauxlib.h">
 			<Filter>src\host\lua-5.1.4\src</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lapi.h">
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lcode.h">
 			<Filter>src\host\lua-5.1.4\src</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lualib.h">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClInclude>
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\luaconf.h">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClInclude>
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lmem.h">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClInclude>
-		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lzio.h">
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\ldebug.h">
 			<Filter>src\host\lua-5.1.4\src</Filter>
 		</ClInclude>
 		<ClInclude Include="..\..\src\host\lua-5.1.4\src\ldo.h">
 			<Filter>src\host\lua-5.1.4\src</Filter>
 		</ClInclude>
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lfunc.h">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClInclude>
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lgc.h">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClInclude>
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\llex.h">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClInclude>
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\llimits.h">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClInclude>
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lmem.h">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClInclude>
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lobject.h">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClInclude>
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lopcodes.h">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClInclude>
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lparser.h">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClInclude>
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lstate.h">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClInclude>
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lstring.h">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClInclude>
 		<ClInclude Include="..\..\src\host\lua-5.1.4\src\ltable.h">
 			<Filter>src\host\lua-5.1.4\src</Filter>
 		</ClInclude>
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\ltm.h">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClInclude>
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lua.h">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClInclude>
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\luaconf.h">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClInclude>
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lualib.h">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClInclude>
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lundump.h">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClInclude>
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lvm.h">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClInclude>
+		<ClInclude Include="..\..\src\host\lua-5.1.4\src\lzio.h">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClInclude>
 	</ItemGroup>
 	<ItemGroup>
-		<ClCompile Include="..\..\src\host\os_getcwd.c">
-			<Filter>src\host</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\path_isabsolute.c">
-			<Filter>src\host</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\os_isdir.c">
-			<Filter>src\host</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\os_rmdir.c">
-			<Filter>src\host</Filter>
-		</ClCompile>
 		<ClCompile Include="..\..\src\host\os_chdir.c">
 			<Filter>src\host</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\src\host\os_uuid.c">
+		<ClCompile Include="..\..\src\host\os_copyfile.c">
+			<Filter>src\host</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\os_getcwd.c">
+			<Filter>src\host</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\os_getversion.c">
+			<Filter>src\host</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\os_isdir.c">
 			<Filter>src\host</Filter>
 		</ClCompile>
 		<ClCompile Include="..\..\src\host\os_isfile.c">
@@ -191,158 +164,305 @@
 		<ClCompile Include="..\..\src\host\os_match.c">
 			<Filter>src\host</Filter>
 		</ClCompile>
+		<ClCompile Include="..\..\src\host\os_mkdir.c">
+			<Filter>src\host</Filter>
+		</ClCompile>
 		<ClCompile Include="..\..\src\host\os_pathsearch.c">
 			<Filter>src\host</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\src\host\os_copyfile.c">
+		<ClCompile Include="..\..\src\host\os_rmdir.c">
 			<Filter>src\host</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\src\host\os_mkdir.c">
+		<ClCompile Include="..\..\src\host\os_uuid.c">
+			<Filter>src\host</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\path_isabsolute.c">
 			<Filter>src\host</Filter>
 		</ClCompile>
 		<ClCompile Include="..\..\src\host\premake.c">
 			<Filter>src\host</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\src\host\string_endswith.c">
-			<Filter>src\host</Filter>
-		</ClCompile>
 		<ClCompile Include="..\..\src\host\scripts.c">
 			<Filter>src\host</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\liolib.c">
-			<Filter>src\host\lua-5.1.4\src</Filter>
+		<ClCompile Include="..\..\src\host\string_endswith.c">
+			<Filter>src\host</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ltm.c">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\linit.c">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\loadlib.c">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lgc.c">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lstate.c">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\llex.c">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lstrlib.c">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lmem.c">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lopcodes.c">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ldump.c">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lmathlib.c">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ldo.c">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ltablib.c">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lparser.c">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lfunc.c">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lobject.c">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ldebug.c">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ldblib.c">
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lapi.c">
 			<Filter>src\host\lua-5.1.4\src</Filter>
 		</ClCompile>
 		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lauxlib.c">
 			<Filter>src\host\lua-5.1.4\src</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lzio.c">
-			<Filter>src\host\lua-5.1.4\src</Filter>
-		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\loslib.c">
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lbaselib.c">
 			<Filter>src\host\lua-5.1.4\src</Filter>
 		</ClCompile>
 		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lcode.c">
 			<Filter>src\host\lua-5.1.4\src</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lapi.c">
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ldblib.c">
 			<Filter>src\host\lua-5.1.4\src</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ltable.c">
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ldebug.c">
 			<Filter>src\host\lua-5.1.4\src</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lbaselib.c">
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ldo.c">
 			<Filter>src\host\lua-5.1.4\src</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lvm.c">
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ldump.c">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lfunc.c">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lgc.c">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\linit.c">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\liolib.c">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\llex.c">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lmathlib.c">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lmem.c">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\loadlib.c">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lobject.c">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lopcodes.c">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\loslib.c">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lparser.c">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lstate.c">
 			<Filter>src\host\lua-5.1.4\src</Filter>
 		</ClCompile>
 		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lstring.c">
 			<Filter>src\host\lua-5.1.4\src</Filter>
 		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lstrlib.c">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ltable.c">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ltablib.c">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\ltm.c">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClCompile>
 		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lundump.c">
 			<Filter>src\host\lua-5.1.4\src</Filter>
 		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lvm.c">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClCompile>
+		<ClCompile Include="..\..\src\host\lua-5.1.4\src\lzio.c">
+			<Filter>src\host\lua-5.1.4\src</Filter>
+		</ClCompile>
 	</ItemGroup>
 	<ItemGroup>
+		<None Include="..\..\BUILD.txt" />
 		<None Include="..\..\CHANGES.txt" />
 		<None Include="..\..\LICENSE.txt" />
 		<None Include="..\..\README.txt" />
-		<None Include="..\..\BUILD.txt" />
 		<None Include="..\..\premake4.lua" />
+		<None Include="..\..\scripts\embed.lua">
+			<Filter>scripts</Filter>
+		</None>
+		<None Include="..\..\scripts\release.lua">
+			<Filter>scripts</Filter>
+		</None>
+		<None Include="..\..\src\_manifest.lua">
+			<Filter>src</Filter>
+		</None>
+		<None Include="..\..\src\_premake_main.lua">
+			<Filter>src</Filter>
+		</None>
+		<None Include="..\..\src\actions\clean\_clean.lua">
+			<Filter>src\actions\clean</Filter>
+		</None>
+		<None Include="..\..\src\actions\codeblocks\codeblocks_cbp.lua">
+			<Filter>src\actions\codeblocks</Filter>
+		</None>
+		<None Include="..\..\src\actions\codeblocks\codeblocks_workspace.lua">
+			<Filter>src\actions\codeblocks</Filter>
+		</None>
+		<None Include="..\..\src\actions\codeblocks\_codeblocks.lua">
+			<Filter>src\actions\codeblocks</Filter>
+		</None>
+		<None Include="..\..\src\actions\codelite\codelite_project.lua">
+			<Filter>src\actions\codelite</Filter>
+		</None>
+		<None Include="..\..\src\actions\codelite\codelite_workspace.lua">
+			<Filter>src\actions\codelite</Filter>
+		</None>
+		<None Include="..\..\src\actions\codelite\_codelite.lua">
+			<Filter>src\actions\codelite</Filter>
+		</None>
+		<None Include="..\..\src\actions\example\example_project.lua">
+			<Filter>src\actions\example</Filter>
+		</None>
+		<None Include="..\..\src\actions\example\example_solution.lua">
+			<Filter>src\actions\example</Filter>
+		</None>
+		<None Include="..\..\src\actions\example\_example.lua">
+			<Filter>src\actions\example</Filter>
+		</None>
+		<None Include="..\..\src\actions\make\make_cpp.lua">
+			<Filter>src\actions\make</Filter>
+		</None>
+		<None Include="..\..\src\actions\make\make_csharp.lua">
+			<Filter>src\actions\make</Filter>
+		</None>
+		<None Include="..\..\src\actions\make\make_solution.lua">
+			<Filter>src\actions\make</Filter>
+		</None>
+		<None Include="..\..\src\actions\make\_make.lua">
+			<Filter>src\actions\make</Filter>
+		</None>
+		<None Include="..\..\src\actions\vstudio\vs2002_csproj.lua">
+			<Filter>src\actions\vstudio</Filter>
+		</None>
+		<None Include="..\..\src\actions\vstudio\vs2002_csproj_user.lua">
+			<Filter>src\actions\vstudio</Filter>
+		</None>
+		<None Include="..\..\src\actions\vstudio\vs2002_solution.lua">
+			<Filter>src\actions\vstudio</Filter>
+		</None>
+		<None Include="..\..\src\actions\vstudio\vs2003_solution.lua">
+			<Filter>src\actions\vstudio</Filter>
+		</None>
+		<None Include="..\..\src\actions\vstudio\vs2005_csproj.lua">
+			<Filter>src\actions\vstudio</Filter>
+		</None>
+		<None Include="..\..\src\actions\vstudio\vs2005_csproj_user.lua">
+			<Filter>src\actions\vstudio</Filter>
+		</None>
+		<None Include="..\..\src\actions\vstudio\vs2005_solution.lua">
+			<Filter>src\actions\vstudio</Filter>
+		</None>
+		<None Include="..\..\src\actions\vstudio\vs200x_vcproj.lua">
+			<Filter>src\actions\vstudio</Filter>
+		</None>
+		<None Include="..\..\src\actions\vstudio\vs2010_vcxproxj.lua">
+			<Filter>src\actions\vstudio</Filter>
+		</None>
+		<None Include="..\..\src\actions\vstudio\vs_generic_solution.lua">
+			<Filter>src\actions\vstudio</Filter>
+		</None>
+		<None Include="..\..\src\actions\vstudio\_vstudio.lua">
+			<Filter>src\actions\vstudio</Filter>
+		</None>
+		<None Include="..\..\src\actions\xcode\xcode4_workspace.lua">
+			<Filter>src\actions\xcode</Filter>
+		</None>
+		<None Include="..\..\src\actions\xcode\xcode_common.lua">
+			<Filter>src\actions\xcode</Filter>
+		</None>
+		<None Include="..\..\src\actions\xcode\xcode_project.lua">
+			<Filter>src\actions\xcode</Filter>
+		</None>
+		<None Include="..\..\src\actions\xcode\_xcode.lua">
+			<Filter>src\actions\xcode</Filter>
+		</None>
+		<None Include="..\..\src\base\action.lua">
+			<Filter>src\base</Filter>
+		</None>
+		<None Include="..\..\src\base\api.lua">
+			<Filter>src\base</Filter>
+		</None>
+		<None Include="..\..\src\base\cmdline.lua">
+			<Filter>src\base</Filter>
+		</None>
+		<None Include="..\..\src\base\configs.lua">
+			<Filter>src\base</Filter>
+		</None>
+		<None Include="..\..\src\base\globals.lua">
+			<Filter>src\base</Filter>
+		</None>
+		<None Include="..\..\src\base\help.lua">
+			<Filter>src\base</Filter>
+		</None>
+		<None Include="..\..\src\base\io.lua">
+			<Filter>src\base</Filter>
+		</None>
+		<None Include="..\..\src\base\option.lua">
+			<Filter>src\base</Filter>
+		</None>
+		<None Include="..\..\src\base\os.lua">
+			<Filter>src\base</Filter>
+		</None>
+		<None Include="..\..\src\base\path.lua">
+			<Filter>src\base</Filter>
+		</None>
+		<None Include="..\..\src\base\premake.lua">
+			<Filter>src\base</Filter>
+		</None>
+		<None Include="..\..\src\base\project.lua">
+			<Filter>src\base</Filter>
+		</None>
+		<None Include="..\..\src\base\solution.lua">
+			<Filter>src\base</Filter>
+		</None>
+		<None Include="..\..\src\base\string.lua">
+			<Filter>src\base</Filter>
+		</None>
+		<None Include="..\..\src\base\table.lua">
+			<Filter>src\base</Filter>
+		</None>
+		<None Include="..\..\src\base\tree.lua">
+			<Filter>src\base</Filter>
+		</None>
+		<None Include="..\..\src\base\validate.lua">
+			<Filter>src\base</Filter>
+		</None>
+		<None Include="..\..\src\tools\dotnet.lua">
+			<Filter>src\tools</Filter>
+		</None>
+		<None Include="..\..\src\tools\gcc.lua">
+			<Filter>src\tools</Filter>
+		</None>
+		<None Include="..\..\src\tools\msc.lua">
+			<Filter>src\tools</Filter>
+		</None>
+		<None Include="..\..\src\tools\ow.lua">
+			<Filter>src\tools</Filter>
+		</None>
+		<None Include="..\..\tests\pepperfish_profiler.lua">
+			<Filter>tests</Filter>
+		</None>
 		<None Include="..\..\tests\premake4.lua">
 			<Filter>tests</Filter>
 		</None>
-		<None Include="..\..\tests\test_gmake_cpp.lua">
-			<Filter>tests</Filter>
-		</None>
-		<None Include="..\..\tests\test_vs2005_sln.lua">
-			<Filter>tests</Filter>
-		</None>
-		<None Include="..\..\tests\test_targets.lua">
-			<Filter>tests</Filter>
-		</None>
-		<None Include="..\..\tests\test_gmake_cs.lua">
-			<Filter>tests</Filter>
-		</None>
 		<None Include="..\..\tests\testfx.lua">
 			<Filter>tests</Filter>
 		</None>
-		<None Include="..\..\tests\test_vs2010_sln.lua">
-			<Filter>tests</Filter>
-		</None>
 		<None Include="..\..\tests\test_dofile.lua">
 			<Filter>tests</Filter>
 		</None>
-		<None Include="..\..\tests\test_vs2002_sln.lua">
-			<Filter>tests</Filter>
-		</None>
-		<None Include="..\..\tests\pepperfish_profiler.lua">
-			<Filter>tests</Filter>
-		</None>
 		<None Include="..\..\tests\test_gcc.lua">
 			<Filter>tests</Filter>
 		</None>
-		<None Include="..\..\tests\test_premake.lua">
+		<None Include="..\..\tests\test_gmake_cpp.lua">
 			<Filter>tests</Filter>
 		</None>
-		<None Include="..\..\tests\test_string.lua">
-			<Filter>tests</Filter>
-		</None>
-		<None Include="..\..\tests\test_vs2008_sln.lua">
+		<None Include="..\..\tests\test_gmake_cs.lua">
 			<Filter>tests</Filter>
 		</None>
 		<None Include="..\..\tests\test_keywords.lua">
@@ -351,33 +471,48 @@
 		<None Include="..\..\tests\test_platforms.lua">
 			<Filter>tests</Filter>
 		</None>
+		<None Include="..\..\tests\test_premake.lua">
+			<Filter>tests</Filter>
+		</None>
 		<None Include="..\..\tests\test_project.lua">
 			<Filter>tests</Filter>
 		</None>
 		<None Include="..\..\tests\test_stress.lua">
 			<Filter>tests</Filter>
 		</None>
+		<None Include="..\..\tests\test_string.lua">
+			<Filter>tests</Filter>
+		</None>
+		<None Include="..\..\tests\test_targets.lua">
+			<Filter>tests</Filter>
+		</None>
+		<None Include="..\..\tests\test_vs2002_sln.lua">
+			<Filter>tests</Filter>
+		</None>
 		<None Include="..\..\tests\test_vs2003_sln.lua">
 			<Filter>tests</Filter>
 		</None>
-		<None Include="..\..\tests\folder\ok.lua">
-			<Filter>tests\folder</Filter>
+		<None Include="..\..\tests\test_vs2005_sln.lua">
+			<Filter>tests</Filter>
+		</None>
+		<None Include="..\..\tests\test_vs2008_sln.lua">
+			<Filter>tests</Filter>
+		</None>
+		<None Include="..\..\tests\test_vs2010_sln.lua">
+			<Filter>tests</Filter>
 		</None>
 		<None Include="..\..\tests\actions\test_clean.lua">
 			<Filter>tests\actions</Filter>
 		</None>
+		<None Include="..\..\tests\actions\make\test_make_escaping.lua">
+			<Filter>tests\actions\make</Filter>
+		</None>
+		<None Include="..\..\tests\actions\make\test_make_pch.lua">
+			<Filter>tests\actions\make</Filter>
+		</None>
 		<None Include="..\..\tests\actions\vstudio\test_vs2005_csproj.lua">
 			<Filter>tests\actions\vstudio</Filter>
 		</None>
-		<None Include="..\..\tests\actions\vstudio\test_vs2010_flags.lua">
-			<Filter>tests\actions\vstudio</Filter>
-		</None>
-		<None Include="..\..\tests\actions\vstudio\test_vs2010_vcxproj.lua">
-			<Filter>tests\actions\vstudio</Filter>
-		</None>
-		<None Include="..\..\tests\actions\vstudio\test_vs2010_links.lua">
-			<Filter>tests\actions\vstudio</Filter>
-		</None>
 		<None Include="..\..\tests\actions\vstudio\test_vs200x_vcproj.lua">
 			<Filter>tests\actions\vstudio</Filter>
 		</None>
@@ -387,9 +522,18 @@
 		<None Include="..\..\tests\actions\vstudio\test_vs2010_filters.lua">
 			<Filter>tests\actions\vstudio</Filter>
 		</None>
+		<None Include="..\..\tests\actions\vstudio\test_vs2010_flags.lua">
+			<Filter>tests\actions\vstudio</Filter>
+		</None>
+		<None Include="..\..\tests\actions\vstudio\test_vs2010_links.lua">
+			<Filter>tests\actions\vstudio</Filter>
+		</None>
 		<None Include="..\..\tests\actions\vstudio\test_vs2010_project_kinds.lua">
 			<Filter>tests\actions\vstudio</Filter>
 		</None>
+		<None Include="..\..\tests\actions\vstudio\test_vs2010_vcxproj.lua">
+			<Filter>tests\actions\vstudio</Filter>
+		</None>
 		<None Include="..\..\tests\actions\xcode\test_xcode_common.lua">
 			<Filter>tests\actions\xcode</Filter>
 		</None>
@@ -399,215 +543,32 @@
 		<None Include="..\..\tests\actions\xcode\test_xcode_project.lua">
 			<Filter>tests\actions\xcode</Filter>
 		</None>
-		<None Include="..\..\tests\actions\make\test_make_pch.lua">
-			<Filter>tests\actions\make</Filter>
-		</None>
-		<None Include="..\..\tests\actions\make\test_make_escaping.lua">
-			<Filter>tests\actions\make</Filter>
-		</None>
-		<None Include="..\..\tests\base\test_tree.lua">
+		<None Include="..\..\tests\base\test_action.lua">
 			<Filter>tests\base</Filter>
 		</None>
-		<None Include="..\..\tests\base\test_config.lua">
-			<Filter>tests\base</Filter>
-		</None>
-		<None Include="..\..\tests\base\test_table.lua">
+		<None Include="..\..\tests\base\test_api.lua">
 			<Filter>tests\base</Filter>
 		</None>
 		<None Include="..\..\tests\base\test_baking.lua">
 			<Filter>tests\base</Filter>
 		</None>
+		<None Include="..\..\tests\base\test_config.lua">
+			<Filter>tests\base</Filter>
+		</None>
 		<None Include="..\..\tests\base\test_os.lua">
 			<Filter>tests\base</Filter>
 		</None>
 		<None Include="..\..\tests\base\test_path.lua">
 			<Filter>tests\base</Filter>
 		</None>
-		<None Include="..\..\tests\base\test_action.lua">
+		<None Include="..\..\tests\base\test_table.lua">
 			<Filter>tests\base</Filter>
 		</None>
-		<None Include="..\..\tests\base\test_api.lua">
+		<None Include="..\..\tests\base\test_tree.lua">
 			<Filter>tests\base</Filter>
 		</None>
-		<None Include="..\..\src\_premake_main.lua">
-			<Filter>src</Filter>
-		</None>
-		<None Include="..\..\src\_manifest.lua">
-			<Filter>src</Filter>
-		</None>
-		<None Include="..\..\src\actions\example\example_project.lua">
-			<Filter>src\actions\example</Filter>
-		</None>
-		<None Include="..\..\src\actions\example\_example.lua">
-			<Filter>src\actions\example</Filter>
-		</None>
-		<None Include="..\..\src\actions\example\example_solution.lua">
-			<Filter>src\actions\example</Filter>
-		</None>
-		<None Include="..\..\src\actions\vstudio\vs200x_vcproj.lua">
-			<Filter>src\actions\vstudio</Filter>
-		</None>
-		<None Include="..\..\src\actions\vstudio\vs2002_csproj_user.lua">
-			<Filter>src\actions\vstudio</Filter>
-		</None>
-		<None Include="..\..\src\actions\vstudio\_vstudio.lua">
-			<Filter>src\actions\vstudio</Filter>
-		</None>
-		<None Include="..\..\src\actions\vstudio\vs2003_solution.lua">
-			<Filter>src\actions\vstudio</Filter>
-		</None>
-		<None Include="..\..\src\actions\vstudio\vs2010_vcxproxj.lua">
-			<Filter>src\actions\vstudio</Filter>
-		</None>
-		<None Include="..\..\src\actions\vstudio\vs_generic_solution.lua">
-			<Filter>src\actions\vstudio</Filter>
-		</None>
-		<None Include="..\..\src\actions\vstudio\vs2002_solution.lua">
-			<Filter>src\actions\vstudio</Filter>
-		</None>
-		<None Include="..\..\src\actions\vstudio\vs2002_csproj.lua">
-			<Filter>src\actions\vstudio</Filter>
-		</None>
-		<None Include="..\..\src\actions\vstudio\vs2005_csproj_user.lua">
-			<Filter>src\actions\vstudio</Filter>
-		</None>
-		<None Include="..\..\src\actions\vstudio\vs2005_csproj.lua">
-			<Filter>src\actions\vstudio</Filter>
-		</None>
-		<None Include="..\..\src\actions\vstudio\vs2005_solution.lua">
-			<Filter>src\actions\vstudio</Filter>
-		</None>
-		<None Include="..\..\src\actions\codeblocks\codeblocks_workspace.lua">
-			<Filter>src\actions\codeblocks</Filter>
-		</None>
-		<None Include="..\..\src\actions\codeblocks\_codeblocks.lua">
-			<Filter>src\actions\codeblocks</Filter>
-		</None>
-		<None Include="..\..\src\actions\codeblocks\codeblocks_cbp.lua">
-			<Filter>src\actions\codeblocks</Filter>
-		</None>
-		<None Include="..\..\src\actions\xcode\xcode_project.lua">
-			<Filter>src\actions\xcode</Filter>
-		</None>
-		<None Include="..\..\src\actions\xcode\_xcode.lua">
-			<Filter>src\actions\xcode</Filter>
-		</None>
-		<None Include="..\..\src\actions\xcode\xcode_common.lua">
-			<Filter>src\actions\xcode</Filter>
-		</None>
-		<None Include="..\..\src\actions\make\make_csharp.lua">
-			<Filter>src\actions\make</Filter>
-		</None>
-		<None Include="..\..\src\actions\make\make_solution.lua">
-			<Filter>src\actions\make</Filter>
-		</None>
-		<None Include="..\..\src\actions\make\_make.lua">
-			<Filter>src\actions\make</Filter>
-		</None>
-		<None Include="..\..\src\actions\make\make_cpp.lua">
-			<Filter>src\actions\make</Filter>
-		</None>
-		<None Include="..\..\src\actions\codelite\codelite_workspace.lua">
-			<Filter>src\actions\codelite</Filter>
-		</None>
-		<None Include="..\..\src\actions\codelite\codelite_project.lua">
-			<Filter>src\actions\codelite</Filter>
-		</None>
-		<None Include="..\..\src\actions\codelite\_codelite.lua">
-			<Filter>src\actions\codelite</Filter>
-		</None>
-		<None Include="..\..\src\actions\clean\_clean.lua">
-			<Filter>src\actions\clean</Filter>
-		</None>
-		<None Include="..\..\src\tools\msc.lua">
-			<Filter>src\tools</Filter>
-		</None>
-		<None Include="..\..\src\tools\gcc.lua">
-			<Filter>src\tools</Filter>
-		</None>
-		<None Include="..\..\src\tools\dotnet.lua">
-			<Filter>src\tools</Filter>
-		</None>
-		<None Include="..\..\src\tools\ow.lua">
-			<Filter>src\tools</Filter>
-		</None>
-		<None Include="..\..\src\base\table.lua">
-			<Filter>src\base</Filter>
-		</None>
-		<None Include="..\..\src\base\help.lua">
-			<Filter>src\base</Filter>
-		</None>
-		<None Include="..\..\src\base\validate.lua">
-			<Filter>src\base</Filter>
-		</None>
-		<None Include="..\..\src\base\os.lua">
-			<Filter>src\base</Filter>
-		</None>
-		<None Include="..\..\src\base\configs.lua">
-			<Filter>src\base</Filter>
-		</None>
-		<None Include="..\..\src\base\action.lua">
-			<Filter>src\base</Filter>
-		</None>
-		<None Include="..\..\src\base\string.lua">
-			<Filter>src\base</Filter>
-		</None>
-		<None Include="..\..\src\base\premake.lua">
-			<Filter>src\base</Filter>
-		</None>
-		<None Include="..\..\src\base\solution.lua">
-			<Filter>src\base</Filter>
-		</None>
-		<None Include="..\..\src\base\tree.lua">
-			<Filter>src\base</Filter>
-		</None>
-		<None Include="..\..\src\base\cmdline.lua">
-			<Filter>src\base</Filter>
-		</None>
-		<None Include="..\..\src\base\path.lua">
-			<Filter>src\base</Filter>
-		</None>
-		<None Include="..\..\src\base\api.lua">
-			<Filter>src\base</Filter>
-		</None>
-		<None Include="..\..\src\base\option.lua">
-			<Filter>src\base</Filter>
-		</None>
-		<None Include="..\..\src\base\globals.lua">
-			<Filter>src\base</Filter>
-		</None>
-		<None Include="..\..\src\base\io.lua">
-			<Filter>src\base</Filter>
-		</None>
-		<None Include="..\..\src\base\project.lua">
-			<Filter>src\base</Filter>
-		</None>
-		<None Include="..\..\scripts\embed.lua">
-			<Filter>scripts</Filter>
-		</None>
-		<None Include="..\..\scripts\release.lua">
-			<Filter>scripts</Filter>
-		</None>
-		<None Include="..\..\samples\project\premake4.lua">
-			<Filter>samples\project</Filter>
-		</None>
-		<None Include="..\..\samples\project\CsSharedLib\premake4.lua">
-			<Filter>samples\project\CsSharedLib</Filter>
-		</None>
-		<None Include="..\..\samples\project\CppWindowedApp\premake4.lua">
-			<Filter>samples\project\CppWindowedApp</Filter>
-		</None>
-		<None Include="..\..\samples\project\CppStaticLib\premake4.lua">
-			<Filter>samples\project\CppStaticLib</Filter>
-		</None>
-		<None Include="..\..\samples\project\CsConsoleApp\premake4.lua">
-			<Filter>samples\project\CsConsoleApp</Filter>
-		</None>
-		<None Include="..\..\samples\project\CppSharedLib\premake4.lua">
-			<Filter>samples\project\CppSharedLib</Filter>
-		</None>
-		<None Include="..\..\samples\project\CppConsoleApp\premake4.lua">
-			<Filter>samples\project\CppConsoleApp</Filter>
+		<None Include="..\..\tests\folder\ok.lua">
+			<Filter>tests\folder</Filter>
 		</None>
 	</ItemGroup>
 </Project>
diff --git a/build/premake/premake4/build/vs2010/Premake4.vcxproj.user b/build/premake/premake4/build/vs2013/Premake4.vcxproj.user
similarity index 100%
rename from build/premake/premake4/build/vs2010/Premake4.vcxproj.user
rename to build/premake/premake4/build/vs2013/Premake4.vcxproj.user