diff --git a/libnyquist.vcxproj/libnyquist.vcxproj b/libnyquist.vcxproj/libnyquist.vcxproj
deleted file mode 100644
index 89238f5..0000000
--- a/libnyquist.vcxproj/libnyquist.vcxproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\src\AudioDecoder.cpp" />
-    <ClCompile Include="$(ProjectDir)..\src\Common.cpp" />
-    <ClCompile Include="$(ProjectDir)..\src\FlacDecoder.cpp" />
-    <ClCompile Include="$(ProjectDir)..\src\OpusDecoder.cpp" />
-    <ClCompile Include="$(ProjectDir)..\src\WavDecoder.cpp" />
-    <ClCompile Include="$(ProjectDir)..\src\AudioDevice.cpp" />
-    <ClCompile Include="$(ProjectDir)..\src\WavPackDecoder.cpp" />
-    <ClCompile Include="$(ProjectDir)..\src\CafDecoder.cpp" />
-    <ClCompile Include="..\src\FlacDependencies.c" />
-    <ClCompile Include="$(ProjectDir)..\src\OpusDependencies.c" />
-    <ClCompile Include="$(ProjectDir)..\src\VorbisDecoder.cpp" />
-    <ClCompile Include="$(ProjectDir)..\src\VorbisDependencies.c" />
-    <ClCompile Include="$(ProjectDir)..\src\WavEncoder.cpp" />
-    <ClCompile Include="$(ProjectDir)..\src\RiffUtils.cpp" />
-    <ClCompile Include="$(ProjectDir)..\third_party\opus\celt\celt_decoder.c" />
-    <ClCompile Include="$(ProjectDir)..\third_party\opus\celt\celt_encoder.c" />
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\bits.c" />
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\extra1.c" />
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\extra2.c" />
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\float.c" />
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\metadata.c" />
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\pack.c" />
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\tags.c" />
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\unpack.c" />
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\unpack3.c" />
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\words.c" />
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\wputils.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\AudioDecoder.h" />
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\FlacDecoder.h" />
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\OpusDecoder.h" />
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\PostProcess.h" />
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\WavDecoder.h" />
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\AudioDevice.h" />
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\Common.h" />
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\Dither.h" />
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\RingBuffer.h" />
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\WavPackDecoder.h" />
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\CafDecoder.h" />
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\VorbisDecoder.h" />
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\WavEncoder.h" />
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\RiffUtils.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}</ProjectGuid>
-    <RootNamespace>libaudiodata</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;D_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNING;WIN32;_WIN32;USE_ALLOCA;OPUS_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\third_party\;$(ProjectDir)..\include\libnyquist\;$(ProjectDir)..\third_party\libvorbis\include;$(ProjectDir)..\third_party\libogg\include;$(ProjectDir)..\third_party\wavpack\include;$(ProjectDir)..\third_party\flac\src\include;$(ProjectDir)..\third_party\opus\celt;$(ProjectDir)..\third_party\opus\libopus\include;$(ProjectDir)..\third_party\opus\libopus\src;$(ProjectDir)..\third_party\opus\opusfile\include;$(ProjectDir)..\third_party\opus\opusfile\src;$(ProjectDir)..\third_party\opus\opusfile\src\include;$(ProjectDir)..\third_party\opus\silk;$(ProjectDir)..\third_party\opus\silk\float;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;D_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNING;WIN32;_WIN32;USE_ALLOCA;OPUS_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\third_party\;$(ProjectDir)..\include\libnyquist\;$(ProjectDir)..\third_party\libvorbis\include;$(ProjectDir)..\third_party\libogg\include;$(ProjectDir)..\third_party\wavpack\include;$(ProjectDir)..\third_party\flac\src\include;$(ProjectDir)..\third_party\opus\celt;$(ProjectDir)..\third_party\opus\libopus\include;$(ProjectDir)..\third_party\opus\libopus\src;$(ProjectDir)..\third_party\opus\opusfile\include;$(ProjectDir)..\third_party\opus\opusfile\src;$(ProjectDir)..\third_party\opus\opusfile\src\include;$(ProjectDir)..\third_party\opus\silk;$(ProjectDir)..\third_party\opus\silk\float;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;D_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNING;WIN32;_WIN32;USE_ALLOCA;OPUS_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\third_party\;$(ProjectDir)..\include\libnyquist\;$(ProjectDir)..\third_party\libvorbis\include;$(ProjectDir)..\third_party\libogg\include;$(ProjectDir)..\third_party\wavpack\include;$(ProjectDir)..\third_party\flac\src\include;$(ProjectDir)..\third_party\opus\celt;$(ProjectDir)..\third_party\opus\libopus\include;$(ProjectDir)..\third_party\opus\libopus\src;$(ProjectDir)..\third_party\opus\opusfile\include;$(ProjectDir)..\third_party\opus\opusfile\src;$(ProjectDir)..\third_party\opus\opusfile\src\include;$(ProjectDir)..\third_party\opus\silk;$(ProjectDir)..\third_party\opus\silk\float;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;D_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNING;WIN32;_WIN32;USE_ALLOCA;OPUS_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\third_party\;$(ProjectDir)..\include\libnyquist\;$(ProjectDir)..\third_party\libvorbis\include;$(ProjectDir)..\third_party\libogg\include;$(ProjectDir)..\third_party\wavpack\include;$(ProjectDir)..\third_party\flac\src\include;$(ProjectDir)..\third_party\opus\celt;$(ProjectDir)..\third_party\opus\libopus\include;$(ProjectDir)..\third_party\opus\libopus\src;$(ProjectDir)..\third_party\opus\opusfile\include;$(ProjectDir)..\third_party\opus\opusfile\src;$(ProjectDir)..\third_party\opus\opusfile\src\include;$(ProjectDir)..\third_party\opus\silk;$(ProjectDir)..\third_party\opus\silk\float;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/libnyquist.vcxproj/libnyquist.vcxproj.filters b/libnyquist.vcxproj/libnyquist.vcxproj.filters
deleted file mode 100644
index c1df4ee..0000000
--- a/libnyquist.vcxproj/libnyquist.vcxproj.filters
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="$(ProjectDir)..\third_party\opus\celt\celt_encoder.c">
-      <Filter>third_party\celt</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\third_party\opus\celt\celt_decoder.c">
-      <Filter>third_party\celt</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\bits.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\extra1.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\extra2.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\float.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\pack.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\tags.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\unpack.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\unpack3.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\words.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\wputils.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\third_party\wavpack\src\metadata.c">
-      <Filter>third_party\wavpack</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\src\VorbisDependencies.c">
-      <Filter>src\deps</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\src\OpusDependencies.c">
-      <Filter>src\deps</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\src\AudioDecoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\src\CafDecoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\src\AudioDevice.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\src\FlacDecoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\src\VorbisDecoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\src\WavDecoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\src\WavPackDecoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\src\WavEncoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\src\OpusDecoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\src\Common.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ProjectDir)..\src\RiffUtils.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\FlacDependencies.c">
-      <Filter>src\deps</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\OpusDecoder.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\AudioDecoder.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\AudioDevice.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\CafDecoder.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\Common.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\FlacDecoder.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\VorbisDecoder.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\WavDecoder.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\WavEncoder.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\WavPackDecoder.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\RingBuffer.h">
-      <Filter>include\util</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\PostProcess.h">
-      <Filter>include\util</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\Dither.h">
-      <Filter>include\util</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\include\libnyquist\RiffUtils.h">
-      <Filter>include\util</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="include">
-      <UniqueIdentifier>{f4ea8340-b8ea-4a42-bafb-6cb461e7a2f3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src">
-      <UniqueIdentifier>{a18b19d5-5cd3-49fc-beec-ed17d8e81d6b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party">
-      <UniqueIdentifier>{33572766-230e-4a7f-8c06-885c4780c1d1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\wavpack">
-      <UniqueIdentifier>{d40a1038-d11f-45dc-820b-e32743336269}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\celt">
-      <UniqueIdentifier>{d38860a7-b4e5-4a1e-99a5-c4eac7e1c013}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="include\util">
-      <UniqueIdentifier>{f27e7823-c56c-4e03-af63-2ef0b1e83cbd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\deps">
-      <UniqueIdentifier>{d839471f-71d1-471e-95e0-c33af9bb64bc}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libnyquist.vcxproj/libnyquist.sln b/libnyquist.vcxproj/v120/libnyquist.sln
similarity index 100%
rename from libnyquist.vcxproj/libnyquist.sln
rename to libnyquist.vcxproj/v120/libnyquist.sln
diff --git a/libnyquist.vcxproj/v120/libnyquist.vcxproj b/libnyquist.vcxproj/v120/libnyquist.vcxproj
new file mode 100644
index 0000000..8cbde7a
--- /dev/null
+++ b/libnyquist.vcxproj/v120/libnyquist.vcxproj
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(ProjectDir)..\..\src\AudioDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\src\Common.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\src\FlacDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\src\OpusDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\src\WavDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\src\AudioDevice.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\src\WavPackDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\src\CafDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\src\FlacDependencies.c" />
+    <ClCompile Include="$(ProjectDir)..\..\src\OpusDependencies.c" />
+    <ClCompile Include="$(ProjectDir)..\..\src\VorbisDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\src\VorbisDependencies.c" />
+    <ClCompile Include="$(ProjectDir)..\..\src\WavEncoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\src\RiffUtils.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\opus\celt\celt_decoder.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\opus\celt\celt_encoder.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\bits.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\extra1.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\extra2.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\float.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\metadata.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\pack.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\tags.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\unpack.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\unpack3.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\words.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\wputils.c" />
+    <ClCompile Include="..\..\src\MusepackDecoder.cpp" />
+    <ClCompile Include="..\..\src\MusepackDependencies.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\AudioDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\FlacDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\OpusDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\PostProcess.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\AudioDevice.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\Common.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\Dither.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\RingBuffer.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavPackDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\CafDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\VorbisDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavEncoder.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\RiffUtils.h" />
+    <ClInclude Include="..\..\include\libnyquist\MusepackDecoder.h" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}</ProjectGuid>
+    <RootNamespace>libaudiodata</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;D_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNING;WIN32;_WIN32;USE_ALLOCA;OPUS_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\;$(ProjectDir)..\..\include\libnyquist\;$(ProjectDir)..\..\third_party\libvorbis\include;$(ProjectDir)..\..\third_party\libogg\include;$(ProjectDir)..\..\third_party\wavpack\include;$(ProjectDir)..\..\third_party\flac\src\include;$(ProjectDir)..\..\third_party\opus\celt;$(ProjectDir)..\..\third_party\opus\libopus\include;$(ProjectDir)..\..\third_party\opus\libopus\src;$(ProjectDir)..\..\third_party\opus\opusfile\include;$(ProjectDir)..\..\third_party\opus\opusfile\src;$(ProjectDir)..\..\third_party\opus\opusfile\src\include;$(ProjectDir)..\..\third_party\opus\silk;$(ProjectDir)..\..\third_party\opus\silk\float;$(ProjectDir)..\..\third_party\musepack\include;$(ProjectDir)..\..\third_party\musepack\libmpcdec;$(ProjectDir)..\..\third_party\musepack\libmpcenc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;D_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNING;WIN32;_WIN32;USE_ALLOCA;OPUS_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\;$(ProjectDir)..\..\include\libnyquist\;$(ProjectDir)..\..\third_party\libvorbis\include;$(ProjectDir)..\..\third_party\libogg\include;$(ProjectDir)..\..\third_party\wavpack\include;$(ProjectDir)..\..\third_party\flac\src\include;$(ProjectDir)..\..\third_party\opus\celt;$(ProjectDir)..\..\third_party\opus\libopus\include;$(ProjectDir)..\..\third_party\opus\libopus\src;$(ProjectDir)..\..\third_party\opus\opusfile\include;$(ProjectDir)..\..\third_party\opus\opusfile\src;$(ProjectDir)..\..\third_party\opus\opusfile\src\include;$(ProjectDir)..\..\third_party\opus\silk;$(ProjectDir)..\..\third_party\opus\silk\float;$(ProjectDir)..\..\third_party\musepack\include;$(ProjectDir)..\..\third_party\musepack\libmpcdec;$(ProjectDir)..\..\third_party\musepack\libmpcenc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;D_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNING;WIN32;_WIN32;USE_ALLOCA;OPUS_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\;$(ProjectDir)..\..\include\libnyquist\;$(ProjectDir)..\..\third_party\libvorbis\include;$(ProjectDir)..\..\third_party\libogg\include;$(ProjectDir)..\..\third_party\wavpack\include;$(ProjectDir)..\..\third_party\flac\src\include;$(ProjectDir)..\..\third_party\opus\celt;$(ProjectDir)..\..\third_party\opus\libopus\include;$(ProjectDir)..\..\third_party\opus\libopus\src;$(ProjectDir)..\..\third_party\opus\opusfile\include;$(ProjectDir)..\..\third_party\opus\opusfile\src;$(ProjectDir)..\..\third_party\opus\opusfile\src\include;$(ProjectDir)..\..\third_party\opus\silk;$(ProjectDir)..\..\third_party\opus\silk\float;$(ProjectDir)..\..\third_party\musepack\include;$(ProjectDir)..\..\third_party\musepack\libmpcdec;$(ProjectDir)..\..\third_party\musepack\libmpcenc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;D_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNING;WIN32;_WIN32;USE_ALLOCA;OPUS_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\;$(ProjectDir)..\..\include\libnyquist\;$(ProjectDir)..\..\third_party\libvorbis\include;$(ProjectDir)..\..\third_party\libogg\include;$(ProjectDir)..\..\third_party\wavpack\include;$(ProjectDir)..\..\third_party\flac\src\include;$(ProjectDir)..\..\third_party\opus\celt;$(ProjectDir)..\..\third_party\opus\libopus\include;$(ProjectDir)..\..\third_party\opus\libopus\src;$(ProjectDir)..\..\third_party\opus\opusfile\include;$(ProjectDir)..\..\third_party\opus\opusfile\src;$(ProjectDir)..\..\third_party\opus\opusfile\src\include;$(ProjectDir)..\..\third_party\opus\silk;$(ProjectDir)..\..\third_party\opus\silk\float;$(ProjectDir)..\..\third_party\musepack\include;$(ProjectDir)..\..\third_party\musepack\libmpcdec;$(ProjectDir)..\..\third_party\musepack\libmpcenc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libnyquist.vcxproj/v120/libnyquist.vcxproj.filters b/libnyquist.vcxproj/v120/libnyquist.vcxproj.filters
new file mode 100644
index 0000000..e585ee7
--- /dev/null
+++ b/libnyquist.vcxproj/v120/libnyquist.vcxproj.filters
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\opus\celt\celt_encoder.c">
+      <Filter>third_party\celt</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\opus\celt\celt_decoder.c">
+      <Filter>third_party\celt</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\bits.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\extra1.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\extra2.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\float.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\pack.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\tags.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\unpack.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\unpack3.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\words.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\wputils.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\metadata.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\VorbisDependencies.c">
+      <Filter>src\deps</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\OpusDependencies.c">
+      <Filter>src\deps</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\AudioDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\CafDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\AudioDevice.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\FlacDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\VorbisDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\WavDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\WavPackDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\WavEncoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\OpusDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\Common.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\RiffUtils.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\FlacDependencies.c">
+      <Filter>src\deps</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\MusepackDependencies.c">
+      <Filter>src\deps</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\MusepackDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\OpusDecoder.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\AudioDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\AudioDevice.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\CafDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\Common.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\FlacDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\VorbisDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavEncoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavPackDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\RingBuffer.h">
+      <Filter>include\util</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\PostProcess.h">
+      <Filter>include\util</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\Dither.h">
+      <Filter>include\util</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\RiffUtils.h">
+      <Filter>include\util</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\libnyquist\MusepackDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="include">
+      <UniqueIdentifier>{f4ea8340-b8ea-4a42-bafb-6cb461e7a2f3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src">
+      <UniqueIdentifier>{a18b19d5-5cd3-49fc-beec-ed17d8e81d6b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="third_party">
+      <UniqueIdentifier>{33572766-230e-4a7f-8c06-885c4780c1d1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="third_party\wavpack">
+      <UniqueIdentifier>{d40a1038-d11f-45dc-820b-e32743336269}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="third_party\celt">
+      <UniqueIdentifier>{d38860a7-b4e5-4a1e-99a5-c4eac7e1c013}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\util">
+      <UniqueIdentifier>{f27e7823-c56c-4e03-af63-2ef0b1e83cbd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\deps">
+      <UniqueIdentifier>{d839471f-71d1-471e-95e0-c33af9bb64bc}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/libnyquist.vcxproj/v140/libnyquist.sln b/libnyquist.vcxproj/v140/libnyquist.sln
new file mode 100644
index 0000000..f811bbe
--- /dev/null
+++ b/libnyquist.vcxproj/v140/libnyquist.sln
@@ -0,0 +1,28 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30723.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnyquist", "libnyquist.vcxproj", "{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Debug|Win32.Build.0 = Debug|Win32
+		{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Debug|x64.ActiveCfg = Debug|x64
+		{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Debug|x64.Build.0 = Debug|x64
+		{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Release|Win32.ActiveCfg = Release|Win32
+		{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Release|Win32.Build.0 = Release|Win32
+		{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Release|x64.ActiveCfg = Release|x64
+		{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/libnyquist.vcxproj/v140/libnyquist.vcxproj b/libnyquist.vcxproj/v140/libnyquist.vcxproj
new file mode 100644
index 0000000..6456b7f
--- /dev/null
+++ b/libnyquist.vcxproj/v140/libnyquist.vcxproj
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(ProjectDir)..\..\src\AudioDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\src\Common.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\src\FlacDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\src\OpusDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\src\WavDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\src\AudioDevice.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\src\WavPackDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\src\CafDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\src\FlacDependencies.c" />
+    <ClCompile Include="$(ProjectDir)..\..\src\OpusDependencies.c" />
+    <ClCompile Include="$(ProjectDir)..\..\src\VorbisDecoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\src\VorbisDependencies.c" />
+    <ClCompile Include="$(ProjectDir)..\..\src\WavEncoder.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\src\RiffUtils.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\opus\celt\celt_decoder.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\opus\celt\celt_encoder.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\bits.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\extra1.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\extra2.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\float.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\metadata.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\pack.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\tags.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\unpack.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\unpack3.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\words.c" />
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\wputils.c" />
+    <ClCompile Include="..\..\src\MusepackDecoder.cpp" />
+    <ClCompile Include="..\..\src\MusepackDependencies.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\AudioDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\FlacDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\OpusDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\PostProcess.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\AudioDevice.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\Common.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\Dither.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\RingBuffer.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavPackDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\CafDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\VorbisDecoder.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavEncoder.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\RiffUtils.h" />
+    <ClInclude Include="..\..\include\libnyquist\MusepackDecoder.h" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}</ProjectGuid>
+    <RootNamespace>libaudiodata</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;D_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNING;WIN32;_WIN32;USE_ALLOCA;OPUS_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\;$(ProjectDir)..\..\include\libnyquist\;$(ProjectDir)..\..\third_party\libvorbis\include;$(ProjectDir)..\..\third_party\libogg\include;$(ProjectDir)..\..\third_party\wavpack\include;$(ProjectDir)..\..\third_party\flac\src\include;$(ProjectDir)..\..\third_party\opus\celt;$(ProjectDir)..\..\third_party\opus\libopus\include;$(ProjectDir)..\..\third_party\opus\libopus\src;$(ProjectDir)..\..\third_party\opus\opusfile\include;$(ProjectDir)..\..\third_party\opus\opusfile\src;$(ProjectDir)..\..\third_party\opus\opusfile\src\include;$(ProjectDir)..\..\third_party\opus\silk;$(ProjectDir)..\..\third_party\opus\silk\float;$(ProjectDir)..\..\third_party\musepack\include;$(ProjectDir)..\..\third_party\musepack\libmpcenc;$(ProjectDir)..\..\third_party\musepack\libmpcdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;D_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNING;WIN32;_WIN32;USE_ALLOCA;OPUS_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\;$(ProjectDir)..\..\include\libnyquist\;$(ProjectDir)..\..\third_party\libvorbis\include;$(ProjectDir)..\..\third_party\libogg\include;$(ProjectDir)..\..\third_party\wavpack\include;$(ProjectDir)..\..\third_party\flac\src\include;$(ProjectDir)..\..\third_party\opus\celt;$(ProjectDir)..\..\third_party\opus\libopus\include;$(ProjectDir)..\..\third_party\opus\libopus\src;$(ProjectDir)..\..\third_party\opus\opusfile\include;$(ProjectDir)..\..\third_party\opus\opusfile\src;$(ProjectDir)..\..\third_party\opus\opusfile\src\include;$(ProjectDir)..\..\third_party\opus\silk;$(ProjectDir)..\..\third_party\opus\silk\float;$(ProjectDir)..\..\third_party\musepack\include;$(ProjectDir)..\..\third_party\musepack\libmpcenc;$(ProjectDir)..\..\third_party\musepack\libmpcdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;D_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNING;WIN32;_WIN32;USE_ALLOCA;OPUS_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\;$(ProjectDir)..\..\include\libnyquist\;$(ProjectDir)..\..\third_party\libvorbis\include;$(ProjectDir)..\..\third_party\libogg\include;$(ProjectDir)..\..\third_party\wavpack\include;$(ProjectDir)..\..\third_party\flac\src\include;$(ProjectDir)..\..\third_party\opus\celt;$(ProjectDir)..\..\third_party\opus\libopus\include;$(ProjectDir)..\..\third_party\opus\libopus\src;$(ProjectDir)..\..\third_party\opus\opusfile\include;$(ProjectDir)..\..\third_party\opus\opusfile\src;$(ProjectDir)..\..\third_party\opus\opusfile\src\include;$(ProjectDir)..\..\third_party\opus\silk;$(ProjectDir)..\..\third_party\opus\silk\float;$(ProjectDir)..\..\third_party\musepack\include;$(ProjectDir)..\..\third_party\musepack\libmpcenc;$(ProjectDir)..\..\third_party\musepack\libmpcdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;D_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNING;WIN32;_WIN32;USE_ALLOCA;OPUS_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\;$(ProjectDir)..\..\include\libnyquist\;$(ProjectDir)..\..\third_party\libvorbis\include;$(ProjectDir)..\..\third_party\libogg\include;$(ProjectDir)..\..\third_party\wavpack\include;$(ProjectDir)..\..\third_party\flac\src\include;$(ProjectDir)..\..\third_party\opus\celt;$(ProjectDir)..\..\third_party\opus\libopus\include;$(ProjectDir)..\..\third_party\opus\libopus\src;$(ProjectDir)..\..\third_party\opus\opusfile\include;$(ProjectDir)..\..\third_party\opus\opusfile\src;$(ProjectDir)..\..\third_party\opus\opusfile\src\include;$(ProjectDir)..\..\third_party\opus\silk;$(ProjectDir)..\..\third_party\opus\silk\float;$(ProjectDir)..\..\third_party\musepack\include;$(ProjectDir)..\..\third_party\musepack\libmpcenc;$(ProjectDir)..\..\third_party\musepack\libmpcdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libnyquist.vcxproj/v140/libnyquist.vcxproj.filters b/libnyquist.vcxproj/v140/libnyquist.vcxproj.filters
new file mode 100644
index 0000000..e585ee7
--- /dev/null
+++ b/libnyquist.vcxproj/v140/libnyquist.vcxproj.filters
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\opus\celt\celt_encoder.c">
+      <Filter>third_party\celt</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\opus\celt\celt_decoder.c">
+      <Filter>third_party\celt</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\bits.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\extra1.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\extra2.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\float.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\pack.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\tags.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\unpack.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\unpack3.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\words.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\wputils.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\third_party\wavpack\src\metadata.c">
+      <Filter>third_party\wavpack</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\VorbisDependencies.c">
+      <Filter>src\deps</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\OpusDependencies.c">
+      <Filter>src\deps</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\AudioDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\CafDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\AudioDevice.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\FlacDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\VorbisDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\WavDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\WavPackDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\WavEncoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\OpusDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\Common.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\RiffUtils.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(ProjectDir)..\..\src\FlacDependencies.c">
+      <Filter>src\deps</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\MusepackDependencies.c">
+      <Filter>src\deps</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\MusepackDecoder.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\OpusDecoder.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\AudioDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\AudioDevice.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\CafDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\Common.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\FlacDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\VorbisDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavEncoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\WavPackDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\RingBuffer.h">
+      <Filter>include\util</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\PostProcess.h">
+      <Filter>include\util</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\Dither.h">
+      <Filter>include\util</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\RiffUtils.h">
+      <Filter>include\util</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\libnyquist\MusepackDecoder.h">
+      <Filter>include</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="include">
+      <UniqueIdentifier>{f4ea8340-b8ea-4a42-bafb-6cb461e7a2f3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src">
+      <UniqueIdentifier>{a18b19d5-5cd3-49fc-beec-ed17d8e81d6b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="third_party">
+      <UniqueIdentifier>{33572766-230e-4a7f-8c06-885c4780c1d1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="third_party\wavpack">
+      <UniqueIdentifier>{d40a1038-d11f-45dc-820b-e32743336269}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="third_party\celt">
+      <UniqueIdentifier>{d38860a7-b4e5-4a1e-99a5-c4eac7e1c013}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\util">
+      <UniqueIdentifier>{f27e7823-c56c-4e03-af63-2ef0b1e83cbd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\deps">
+      <UniqueIdentifier>{d839471f-71d1-471e-95e0-c33af9bb64bc}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
\ No newline at end of file