diff --git a/Assets/OpenTK.dll.config b/Assets/dll/OpenTK.dll.config
similarity index 100%
rename from Assets/OpenTK.dll.config
rename to Assets/dll/OpenTK.dll.config
diff --git a/Dist/Package.sh b/Dist/Package.sh
index 34921861e9..a19a15854a 100755
--- a/Dist/Package.sh
+++ b/Dist/Package.sh
@@ -3,5 +3,4 @@ set -e
 cd "$(dirname "$0")/.."
 rm -fr "packaged_output" && mkdir -p "packaged_output"
 find "output" -type f \( -wholename "output/EmuHawk.exe" -o -wholename "output/DiscoHawk.exe" -o -wholename "output/*.config" -o -wholename "output/defctrl.json" -o -wholename "output/EmuHawkMono.sh" -o -wholename "output/dll/*" -o -wholename "output/shaders/*" -o -wholename "output/gamedb/*" -o -wholename "output/Tools/*" -o -wholename "output/NES/Palettes/*" -o -wholename "output/Lua/*" -o -wholename "output/Gameboy/Palettes/*" \) -not -name "*.pdb" -not -name "*.lib" -not -name "*.pgd" -not -name "*.ipdb" -not -name "*.iobj" -not -name "*.exp" -not -wholename "output/dll/libsneshawk-64*.exe" -not -name "*.ilk" -not -wholename "output/dll/gpgx.elf" -not -wholename "output/dll/miniclient.*" -exec install -D -m644 -T "{}" "packaged_{}" \;
-for f in output/*.dll; do cp "$f" "packaged_output/dll"; done && for f in output/*.dll.config; do cp "$f" "packaged_output/dll"; done # the Batch script does this; IMO this should be done in MSBuild
 find "packaged_output" -type f -name "*.sh" -exec chmod +x {} \; # installed with -m644 but needs to be 755
diff --git a/Dist/QuickTestBuildAndPackage.bat b/Dist/QuickTestBuildAndPackage.bat
index e071323654..6732db5080 100644
--- a/Dist/QuickTestBuildAndPackage.bat
+++ b/Dist/QuickTestBuildAndPackage.bat
@@ -25,13 +25,6 @@ cd ..\output
 rem slimdx has a way of not making it into the output directory, so this is a good time to make sure
 copy ..\..\SlimDx.dll
 
-rem at the present we support moving all these dlls into the dll subdirectory
-rem that might be troublesome some day..... if it does get troublesome, then we'll have to 
-rem explicitly list the OK ones here as individual copies. until then....
-
-copy *.dll dll
-copy *.dll.config dll
-
 rem Now, we're about to zip and then unzip. Why, you ask? Because that's just the way this evolved.
 ..\dist\zip.exe -X -r ..\Dist\%NAME% EmuHawk.exe EmuHawk.exe.config DiscoHawk.exe DiscoHawk.exe.config defctrl.json EmuHawkMono.sh dll shaders gamedb Tools NES\Palettes Lua Gameboy\Palettes -x *.pdb -x *.lib -x *.pgd -x *.ipdb -x *.iobj -x *.exp -x dll\libsneshawk-64*.exe -x *.ilk -x dll\gpgx.elf -x dll\miniclient.* 
 
diff --git a/src/MainSlnExecutable.props b/src/MainSlnExecutable.props
index 3dc806a722..9bd0a7505a 100644
--- a/src/MainSlnExecutable.props
+++ b/src/MainSlnExecutable.props
@@ -1,6 +1,5 @@
 <Project>
 	<PropertyGroup>
-		<OutputPath>$(ProjectDir)../../output</OutputPath>
 		<TargetName>$(MSBuildProjectName.Substring($([MSBuild]::Add($(MSBuildProjectName.LastIndexOf('.')), 1))))</TargetName>
 	</PropertyGroup>
 	<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -9,4 +8,8 @@
 	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
 		<OutputType>WinExe</OutputType>
 	</PropertyGroup>
+	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
+		<Move SourceFiles="$(OutputPath)$(TargetName).exe" DestinationFiles="$(OutputPath)../$(TargetName).exe" />
+		<Move SourceFiles="$(OutputPath)$(TargetName).exe.config" DestinationFiles="$(OutputPath)../$(TargetName).exe.config" />
+	</Target>
 </Project>