diff --git a/examples/libnyquist-examples.vcxproj/v120/libnyquist-examples.sln b/examples/libnyquist-examples.vcxproj/v120/libnyquist-examples.sln
index 85671f0..18f720d 100644
--- a/examples/libnyquist-examples.vcxproj/v120/libnyquist-examples.sln
+++ b/examples/libnyquist-examples.vcxproj/v120/libnyquist-examples.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 12.0.30723.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnyquist-examples", "libnyquist-examples.vcxproj", "{C0C0C270-FB9E-4EEB-8F22-180BB2FA800B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnyquist", "..\..\libnyquist.vcxproj\v120\libnyquist.vcxproj", "{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnyquist", "..\..\..\libnyquist.vcxproj\v120\libnyquist.vcxproj", "{0EEC3739-F60A-4B90-8B75-9E1AFF28106A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/examples/libnyquist-examples.vcxproj/v120/libnyquist-examples.vcxproj b/examples/libnyquist-examples.vcxproj/v120/libnyquist-examples.vcxproj
index eca88a0..8353cba 100644
--- a/examples/libnyquist-examples.vcxproj/v120/libnyquist-examples.vcxproj
+++ b/examples/libnyquist-examples.vcxproj/v120/libnyquist-examples.vcxproj
@@ -44,7 +44,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)../../include;$(SolutionDir)../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../../include;$(SolutionDir)../../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>__WINDOWS_DS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -58,7 +58,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)../../include;$(SolutionDir)../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)../../../include;$(SolutionDir)../../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>__WINDOWS_DS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -68,14 +68,14 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\third_party\rtaudio\RtAudio.cpp" />
-    <ClCompile Include="..\src\Main.cpp" />
+    <ClCompile Include="..\..\..\third_party\rtaudio\RtAudio.cpp" />
+    <ClCompile Include="..\..\src\Main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\third_party\rtaudio\RtAudio.h" />
+    <ClInclude Include="..\..\..\third_party\rtaudio\RtAudio.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\libnyquist.vcxproj\v120\libnyquist.vcxproj">
+    <ProjectReference Include="..\..\..\libnyquist.vcxproj\v120\libnyquist.vcxproj">
       <Project>{0eec3739-f60a-4b90-8b75-9e1aff28106a}</Project>
       <Private>false</Private>
       <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
diff --git a/examples/libnyquist-examples.vcxproj/v120/libnyquist-examples.vcxproj.filters b/examples/libnyquist-examples.vcxproj/v120/libnyquist-examples.vcxproj.filters
index 6580e30..8e6e979 100644
--- a/examples/libnyquist-examples.vcxproj/v120/libnyquist-examples.vcxproj.filters
+++ b/examples/libnyquist-examples.vcxproj/v120/libnyquist-examples.vcxproj.filters
@@ -11,15 +11,15 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\Main.cpp">
+    <ClCompile Include="..\..\src\Main.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\rtaudio\RtAudio.cpp">
+    <ClCompile Include="..\..\..\third_party\rtaudio\RtAudio.cpp">
       <Filter>third_party</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\third_party\rtaudio\RtAudio.h">
+    <ClInclude Include="..\..\..\third_party\rtaudio\RtAudio.h">
       <Filter>third_party</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/libnyquist.vcxproj/v120/libnyquist.vcxproj b/libnyquist.vcxproj/v120/libnyquist.vcxproj
index fed0004..e1852c8 100644
--- a/libnyquist.vcxproj/v120/libnyquist.vcxproj
+++ b/libnyquist.vcxproj/v120/libnyquist.vcxproj
@@ -33,25 +33,9 @@
     <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" />
-    <ClCompile Include="..\..\third_party\musepack\libmpcdec\mpc_bits_reader.c" />
-    <ClCompile Include="..\..\third_party\musepack\libmpcdec\mpc_decoder.c" />
-    <ClCompile Include="..\..\third_party\musepack\libmpcdec\mpc_demux.c" />
-    <ClCompile Include="..\..\third_party\musepack\libmpcdec\mpc_reader.c" />
+    <ClCompile Include="..\..\src\WavPackDependencies.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(ProjectDir)..\..\include\libnyquist\AudioDecoder.h" />
diff --git a/libnyquist.vcxproj/v120/libnyquist.vcxproj.filters b/libnyquist.vcxproj/v120/libnyquist.vcxproj.filters
index 4df6450..17d66a7 100644
--- a/libnyquist.vcxproj/v120/libnyquist.vcxproj.filters
+++ b/libnyquist.vcxproj/v120/libnyquist.vcxproj.filters
@@ -1,45 +1,6 @@
 <?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>
@@ -88,17 +49,8 @@
     <ClCompile Include="..\..\src\MusepackDecoder.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\musepack\libmpcdec\mpc_reader.c">
-      <Filter>third_party\mpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\third_party\musepack\libmpcdec\mpc_bits_reader.c">
-      <Filter>third_party\mpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\third_party\musepack\libmpcdec\mpc_decoder.c">
-      <Filter>third_party\mpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\third_party\musepack\libmpcdec\mpc_demux.c">
-      <Filter>third_party\mpc</Filter>
+    <ClCompile Include="..\..\src\WavPackDependencies.c">
+      <Filter>src\deps</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -161,20 +113,11 @@
     <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>
-    <Filter Include="third_party\mpc">
-      <UniqueIdentifier>{cc5d22ad-1a3e-46cf-8f65-7d33f02629fb}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file