diff --git a/build/VS2005/zstd/zstd.vcproj b/build/VS2005/zstd/zstd.vcproj
deleted file mode 100644
index 46cabbf6e..000000000
--- a/build/VS2005/zstd/zstd.vcproj
+++ /dev/null
@@ -1,548 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="zstd"
-	ProjectGUID="{1A2AB08E-5CE7-4C5B-BE55-458157C14051}"
-	RootNamespace="zstd"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			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="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\dictBuilder;$(SolutionDir)..\..\lib\compress"
-				PreprocessorDefinitions="ZSTD_MULTITHREAD=1;ZSTD_LEGACY_SUPPORT=4;WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="setargv.obj"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\dictBuilder;$(SolutionDir)..\..\lib\compress"
-				PreprocessorDefinitions="ZSTD_MULTITHREAD=1;ZSTD_LEGACY_SUPPORT=4;WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="setargv.obj"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\dictBuilder;$(SolutionDir)..\..\lib\compress"
-				PreprocessorDefinitions="ZSTD_MULTITHREAD=1;ZSTD_LEGACY_SUPPORT=4;WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="setargv.obj"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\dictBuilder;$(SolutionDir)..\..\lib\compress"
-				PreprocessorDefinitions="ZSTD_MULTITHREAD=1;ZSTD_LEGACY_SUPPORT=4;WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="setargv.obj"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\programs\bench.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\programs\datagen.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\programs\dibio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\dictBuilder\cover.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\dictBuilder\divsufsort.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\common\entropy_common.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\common\error_private.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\programs\fileio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\compress\fse_compress.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\common\fse_decompress.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\compress\huf_compress.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\decompress\huf_decompress.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\common\xxhash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\dictBuilder\zdict.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\common\zstd_common.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\compress\zstd_compress.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\compress\zstdmt_compress.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\decompress\zstd_decompress.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\legacy\zstd_v01.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\legacy\zstd_v02.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\legacy\zstd_v03.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\legacy\zstd_v04.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\legacy\zstd_v05.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\legacy\zstd_v06.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\legacy\zstd_v07.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\programs\zstdcli.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\..\lib\common\bitstream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\dictBuilder\divsufsort.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\common\error_private.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\common\zstd_errors.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\common\fse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\common\fse_static.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\common\huf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\common\huf_static.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\common\mem.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\common\xxhash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\dictBuilder\zdict.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\dictBuilder\zdict_static.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\zstd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\common\zstd_internal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\legacy\zstd_legacy.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\compress\zstd_opt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\common\zstd_static.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\legacy\zstd_v01.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\legacy\zstd_v02.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\legacy\zstd_v03.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\legacy\zstd_v04.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\legacy\zstd_v05.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\legacy\zstd_v06.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\legacy\zstd_v07.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lib\compress\zstdmt_compress.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/VS2005/fullbench/fullbench.vcproj b/contrib/VS2005/fullbench/fullbench.vcproj
similarity index 100%
rename from build/VS2005/fullbench/fullbench.vcproj
rename to contrib/VS2005/fullbench/fullbench.vcproj
diff --git a/build/VS2005/fuzzer/fuzzer.vcproj b/contrib/VS2005/fuzzer/fuzzer.vcproj
similarity index 100%
rename from build/VS2005/fuzzer/fuzzer.vcproj
rename to contrib/VS2005/fuzzer/fuzzer.vcproj
diff --git a/build/VS2005/zstd.sln b/contrib/VS2005/zstd.sln
similarity index 100%
rename from build/VS2005/zstd.sln
rename to contrib/VS2005/zstd.sln
diff --git a/build/VS2005/zstdlib/zstdlib.vcproj b/contrib/VS2005/zstdlib/zstdlib.vcproj
similarity index 100%
rename from build/VS2005/zstdlib/zstdlib.vcproj
rename to contrib/VS2005/zstdlib/zstdlib.vcproj