diff --git a/.hgignore b/.hgignore
index 7c0b5fe..a10ed24 100644
--- a/.hgignore
+++ b/.hgignore
@@ -18,10 +18,10 @@ doc/html
 *.rej
 cov-int
 *~
-re:^x64/Debug/
-re:^x64/Release/
-re:^Release/
-re:^Debug/
+x64/Debug/
+x64/Release/
+Release/
+Debug/
 build
 build_*
 UpgradeLog*
diff --git a/dotnet/rubberband-dll.vcxproj b/dotnet/rubberband-dll.vcxproj
index c641bcf..fbe8b31 100644
--- a/dotnet/rubberband-dll.vcxproj
+++ b/dotnet/rubberband-dll.vcxproj
@@ -22,32 +22,33 @@
     <ProjectGuid>{32C11C5C-3D27-4E57-B72C-161A48AAA95E}</ProjectGuid>
     <RootNamespace>rubberbanddll</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -151,7 +152,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;RUBBERBANDDLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)rubberband;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\rubberband;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/otherbuilds/rubberband-library.vcxproj b/dotnet/rubberband-library.vcxproj
similarity index 66%
rename from otherbuilds/rubberband-library.vcxproj
rename to dotnet/rubberband-library.vcxproj
index 823f714..4aa1ce8 100644
--- a/otherbuilds/rubberband-library.vcxproj
+++ b/dotnet/rubberband-library.vcxproj
@@ -22,23 +22,24 @@
     <ProjectGuid>{020CEB11-EF4E-400E-971D-A35DB69D7CF9}</ProjectGuid>
     <RootNamespace>rubberband-library</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -63,6 +64,7 @@
     <OutDir>Debug\</OutDir>
     <IntDir>Debug\</IntDir>
     <EnableManagedIncrementalBuild>true</EnableManagedIncrementalBuild>
+    <SourcePath>$(SourcePath)</SourcePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <EnableManagedIncrementalBuild>true</EnableManagedIncrementalBuild>
@@ -74,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;.\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>__MSVC__;WIN32;_DEBUG;_LIB;NOMINMAX;_USE_MATH_DEFINES;USE_KISSFFT;USE_SPEEX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -88,7 +90,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;.\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>__MSVC__;WIN32;_DEBUG;_LIB;NOMINMAX;_USE_MATH_DEFINES;USE_KISSFFT;USE_SPEEX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -106,7 +108,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>.;.\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>__MSVC__;WIN32;NDEBUG;_LIB;NOMINMAX;_USE_MATH_DEFINES;USE_KISSFFT;NO_TIMING;USE_SPEEX;NO_THREAD_CHECKS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -124,7 +126,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>.;.\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>__MSVC__;WIN32;NDEBUG;_LIB;NOMINMAX;_USE_MATH_DEFINES;USE_KISSFFT;NO_TIMING;USE_SPEEX;NO_THREAD_CHECKS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -137,57 +139,57 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="rubberband\rubberband-c.h" />
-    <ClInclude Include="rubberband\RubberBandStretcher.h" />
-    <ClInclude Include="src\audiocurves\CompoundAudioCurve.h" />
-    <ClInclude Include="src\audiocurves\ConstantAudioCurve.h" />
-    <ClInclude Include="src\audiocurves\HighFrequencyAudioCurve.h" />
-    <ClInclude Include="src\audiocurves\PercussiveAudioCurve.h" />
-    <ClInclude Include="src\audiocurves\SilentAudioCurve.h" />
-    <ClInclude Include="src\audiocurves\SpectralDifferenceAudioCurve.h" />
-    <ClInclude Include="src\base\Profiler.h" />
-    <ClInclude Include="src\base\RingBuffer.h" />
-    <ClInclude Include="src\base\Scavenger.h" />
-    <ClInclude Include="src\dsp\AudioCurveCalculator.h" />
-    <ClInclude Include="src\dsp\FFT.h" />
-    <ClInclude Include="src\dsp\MovingMedian.h" />
-    <ClInclude Include="src\dsp\Resampler.h" />
-    <ClInclude Include="src\dsp\SampleFilter.h" />
-    <ClInclude Include="src\dsp\SincWindow.h" />
-    <ClInclude Include="src\dsp\Window.h" />
-    <ClInclude Include="src\float_cast\float_cast.h" />
-    <ClInclude Include="src\speex\speex_resampler.h" />
-    <ClInclude Include="src\StretchCalculator.h" />
-    <ClInclude Include="src\StretcherChannelData.h" />
-    <ClInclude Include="src\StretcherImpl.h" />
-    <ClInclude Include="src\system\Allocators.h" />
-    <ClInclude Include="src\system\sysutils.h" />
-    <ClInclude Include="src\system\Thread.h" />
-    <ClInclude Include="src\system\VectorOps.h" />
+    <ClInclude Include="..\rubberband\rubberband-c.h" />
+    <ClInclude Include="..\rubberband\RubberBandStretcher.h" />
+    <ClInclude Include="..\src\audiocurves\CompoundAudioCurve.h" />
+    <ClInclude Include="..\src\audiocurves\ConstantAudioCurve.h" />
+    <ClInclude Include="..\src\audiocurves\HighFrequencyAudioCurve.h" />
+    <ClInclude Include="..\src\audiocurves\PercussiveAudioCurve.h" />
+    <ClInclude Include="..\src\audiocurves\SilentAudioCurve.h" />
+    <ClInclude Include="..\src\audiocurves\SpectralDifferenceAudioCurve.h" />
+    <ClInclude Include="..\src\base\Profiler.h" />
+    <ClInclude Include="..\src\base\RingBuffer.h" />
+    <ClInclude Include="..\src\base\Scavenger.h" />
+    <ClInclude Include="..\src\dsp\AudioCurveCalculator.h" />
+    <ClInclude Include="..\src\dsp\FFT.h" />
+    <ClInclude Include="..\src\dsp\MovingMedian.h" />
+    <ClInclude Include="..\src\dsp\Resampler.h" />
+    <ClInclude Include="..\src\dsp\SampleFilter.h" />
+    <ClInclude Include="..\src\dsp\SincWindow.h" />
+    <ClInclude Include="..\src\dsp\Window.h" />
+    <ClInclude Include="..\src\float_cast\float_cast.h" />
+    <ClInclude Include="..\src\speex\speex_resampler.h" />
+    <ClInclude Include="..\src\StretchCalculator.h" />
+    <ClInclude Include="..\src\StretcherChannelData.h" />
+    <ClInclude Include="..\src\StretcherImpl.h" />
+    <ClInclude Include="..\src\system\Allocators.h" />
+    <ClInclude Include="..\src\system\sysutils.h" />
+    <ClInclude Include="..\src\system\Thread.h" />
+    <ClInclude Include="..\src\system\VectorOps.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\audiocurves\CompoundAudioCurve.cpp" />
-    <ClCompile Include="src\audiocurves\ConstantAudioCurve.cpp" />
-    <ClCompile Include="src\audiocurves\HighFrequencyAudioCurve.cpp" />
-    <ClCompile Include="src\audiocurves\PercussiveAudioCurve.cpp" />
-    <ClCompile Include="src\audiocurves\SilentAudioCurve.cpp" />
-    <ClCompile Include="src\audiocurves\SpectralDifferenceAudioCurve.cpp" />
-    <ClCompile Include="src\base\Profiler.cpp" />
-    <ClCompile Include="src\dsp\AudioCurveCalculator.cpp" />
-    <ClCompile Include="src\dsp\FFT.cpp" />
-    <ClCompile Include="src\dsp\Resampler.cpp" />
-    <ClCompile Include="src\kissfft\kiss_fft.c" />
-    <ClCompile Include="src\kissfft\kiss_fftr.c" />
-    <ClCompile Include="src\rubberband-c.cpp" />
-    <ClCompile Include="src\RubberBandStretcher.cpp" />
-    <ClCompile Include="src\speex\resample.c" />
-    <ClCompile Include="src\StretchCalculator.cpp" />
-    <ClCompile Include="src\StretcherChannelData.cpp" />
-    <ClCompile Include="src\StretcherImpl.cpp" />
-    <ClCompile Include="src\StretcherProcess.cpp" />
-    <ClCompile Include="src\system\Allocators.cpp" />
-    <ClCompile Include="src\system\sysutils.cpp" />
-    <ClCompile Include="src\system\Thread.cpp" />
+    <ClCompile Include="..\src\audiocurves\CompoundAudioCurve.cpp" />
+    <ClCompile Include="..\src\audiocurves\ConstantAudioCurve.cpp" />
+    <ClCompile Include="..\src\audiocurves\HighFrequencyAudioCurve.cpp" />
+    <ClCompile Include="..\src\audiocurves\PercussiveAudioCurve.cpp" />
+    <ClCompile Include="..\src\audiocurves\SilentAudioCurve.cpp" />
+    <ClCompile Include="..\src\audiocurves\SpectralDifferenceAudioCurve.cpp" />
+    <ClCompile Include="..\src\base\Profiler.cpp" />
+    <ClCompile Include="..\src\dsp\AudioCurveCalculator.cpp" />
+    <ClCompile Include="..\src\dsp\FFT.cpp" />
+    <ClCompile Include="..\src\dsp\Resampler.cpp" />
+    <ClCompile Include="..\src\kissfft\kiss_fft.c" />
+    <ClCompile Include="..\src\kissfft\kiss_fftr.c" />
+    <ClCompile Include="..\src\rubberband-c.cpp" />
+    <ClCompile Include="..\src\RubberBandStretcher.cpp" />
+    <ClCompile Include="..\src\speex\resample.c" />
+    <ClCompile Include="..\src\StretchCalculator.cpp" />
+    <ClCompile Include="..\src\StretcherChannelData.cpp" />
+    <ClCompile Include="..\src\StretcherImpl.cpp" />
+    <ClCompile Include="..\src\StretcherProcess.cpp" />
+    <ClCompile Include="..\src\system\Allocators.cpp" />
+    <ClCompile Include="..\src\system\sysutils.cpp" />
+    <ClCompile Include="..\src\system\Thread.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/rubberband.sln b/dotnet/rubberband.sln
similarity index 75%
rename from rubberband.sln
rename to dotnet/rubberband.sln
index eeb002f..52d3187 100644
--- a/rubberband.sln
+++ b/dotnet/rubberband.sln
@@ -1,15 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31005.135
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rubberband-library", "rubberband-library.vcxproj", "{020CEB11-EF4E-400E-971D-A35DB69D7CF9}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rubberband-program", "rubberband-program.vcxproj", "{06838307-FEAA-4DB0-8E08-AF19698E9C40}"
-	ProjectSection(ProjectDependencies) = postProject
-		{020CEB11-EF4E-400E-971D-A35DB69D7CF9} = {020CEB11-EF4E-400E-971D-A35DB69D7CF9}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rubberband-dll", "rubberband-dll.vcxproj", "{32C11C5C-3D27-4E57-B72C-161A48AAA95E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{020CEB11-EF4E-400E-971D-A35DB69D7CF9} = {020CEB11-EF4E-400E-971D-A35DB69D7CF9}
@@ -30,32 +25,26 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Debug|Any CPU.Build.0 = Debug|x64
 		{020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Debug|x64.ActiveCfg = Debug|x64
 		{020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Debug|x64.Build.0 = Debug|x64
 		{020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Debug|x86.ActiveCfg = Debug|Win32
 		{020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Debug|x86.Build.0 = Debug|Win32
 		{020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Release|Any CPU.ActiveCfg = Release|Win32
+		{020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Release|Any CPU.Build.0 = Release|Win32
 		{020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Release|x64.ActiveCfg = Release|x64
 		{020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Release|x64.Build.0 = Release|x64
 		{020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Release|x86.ActiveCfg = Release|Win32
 		{020CEB11-EF4E-400E-971D-A35DB69D7CF9}.Release|x86.Build.0 = Release|Win32
-		{06838307-FEAA-4DB0-8E08-AF19698E9C40}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{06838307-FEAA-4DB0-8E08-AF19698E9C40}.Debug|x64.ActiveCfg = Debug|x64
-		{06838307-FEAA-4DB0-8E08-AF19698E9C40}.Debug|x64.Build.0 = Debug|x64
-		{06838307-FEAA-4DB0-8E08-AF19698E9C40}.Debug|x86.ActiveCfg = Debug|Win32
-		{06838307-FEAA-4DB0-8E08-AF19698E9C40}.Debug|x86.Build.0 = Debug|Win32
-		{06838307-FEAA-4DB0-8E08-AF19698E9C40}.Release|Any CPU.ActiveCfg = Release|Win32
-		{06838307-FEAA-4DB0-8E08-AF19698E9C40}.Release|x64.ActiveCfg = Release|x64
-		{06838307-FEAA-4DB0-8E08-AF19698E9C40}.Release|x64.Build.0 = Release|x64
-		{06838307-FEAA-4DB0-8E08-AF19698E9C40}.Release|x86.ActiveCfg = Release|Win32
-		{06838307-FEAA-4DB0-8E08-AF19698E9C40}.Release|x86.Build.0 = Release|Win32
-		{32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Debug|Any CPU.Build.0 = Debug|x64
 		{32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Debug|x64.ActiveCfg = Debug|x64
 		{32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Debug|x64.Build.0 = Debug|x64
 		{32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Debug|x86.ActiveCfg = Debug|Win32
 		{32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Debug|x86.Build.0 = Debug|Win32
 		{32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Release|Any CPU.ActiveCfg = Release|Win32
+		{32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Release|Any CPU.Build.0 = Release|Win32
 		{32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Release|x64.ActiveCfg = Release|x64
 		{32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Release|x64.Build.0 = Release|x64
 		{32C11C5C-3D27-4E57-B72C-161A48AAA95E}.Release|x86.ActiveCfg = Release|Win32
@@ -76,4 +65,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {3CFE825B-BD44-4909-B002-AFE8DA45D614}
+	EndGlobalSection
 EndGlobal