diff --git a/CUE.NET.nuspec b/CUE.NET.nuspec
index 92fb2d1..6a7d937 100644
--- a/CUE.NET.nuspec
+++ b/CUE.NET.nuspec
@@ -16,8 +16,8 @@
     </metadata>
     <files>
         <file src="bin\CUE.NET.dll" target="lib\net46\CUE.NET.dll" />
-        <file src="bin\CUESDK.x64_2013.dll" target="build\net46\" />
-        <file src="bin\CUESDK.x86_2013.dll" target="build\net46\" />
+        <file src="bin\x64\" target="build\net46\libs\x64" />
+        <file src="bin\x86\" target="build\net46\libs\x86" />
         <file src="CUE.NET.targets" target="build\net46\CUE.NET.targets" />
     </files>
 </package>
\ No newline at end of file
diff --git a/CUE.NET.sln b/CUE.NET.sln
index 32b1de0..0bc3832 100644
--- a/CUE.NET.sln
+++ b/CUE.NET.sln
@@ -17,9 +17,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{D69EF6D8-68FF-4C56-B5CB-253971B1DF91}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "x86", "x86", "{0525D895-E706-4920-8733-DABD9194BFB1}"
 	ProjectSection(SolutionItems) = preProject
-		libs\CUESDK.x64_2013.dll = libs\CUESDK.x64_2013.dll
-		libs\CUESDK.x86_2013.dll = libs\CUESDK.x86_2013.dll
+		libs\x86\CUESDK_2013.dll = libs\x86\CUESDK_2013.dll
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "x64", "x64", "{2F99124B-FAED-432D-B797-45566D373411}"
+	ProjectSection(SolutionItems) = preProject
+		libs\x64\CUESDK_2013.dll = libs\x64\CUESDK_2013.dll
 	EndProjectSection
 EndProject
 Global
@@ -53,5 +59,7 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{7FD88256-5E14-4D7C-862B-7BC2CD04081A} = {1F52DDC9-E9D0-4A7B-8E78-930528203EE6}
 		{D69EF6D8-68FF-4C56-B5CB-253971B1DF91} = {FF50AF6A-D2AC-4772-B013-C10D127DBE29}
+		{0525D895-E706-4920-8733-DABD9194BFB1} = {D69EF6D8-68FF-4C56-B5CB-253971B1DF91}
+		{2F99124B-FAED-432D-B797-45566D373411} = {D69EF6D8-68FF-4C56-B5CB-253971B1DF91}
 	EndGlobalSection
 EndGlobal
diff --git a/CUE.NET.targets b/CUE.NET.targets
index 3afe0bc..0b0f74f 100644
--- a/CUE.NET.targets
+++ b/CUE.NET.targets
@@ -14,10 +14,7 @@
   <ItemGroup>
     <CueNETSDKFiles Condition="'$(MSBuildThisFileDirectory)' != '' And
                                    HasTrailingSlash('$(MSBuildThisFileDirectory)')"
-                        Include="$(MSBuildThisFileDirectory)\libs\*.dll" />
-    <CueNETSDKFiles Condition="'$(MSBuildThisFileDirectory)' != '' And
-                                   HasTrailingSlash('$(MSBuildThisFileDirectory)')"
-                        Include="$(MSBuildThisFileDirectory)\*.dll" />
+                        Include="$(MSBuildThisFileDirectory)libs\**\*.dll" />
   </ItemGroup>
 
   <!--
diff --git a/libs/CUESDK.x64_2013.dll b/libs/CUESDK.x64_2013.dll
deleted file mode 100644
index 64fbe92..0000000
Binary files a/libs/CUESDK.x64_2013.dll and /dev/null differ
diff --git a/libs/CUESDK.x86_2013.dll b/libs/CUESDK.x86_2013.dll
deleted file mode 100644
index c2dbf62..0000000
Binary files a/libs/CUESDK.x86_2013.dll and /dev/null differ