diff --git a/Minecraft.Client/Minecraft.Client.vcxproj b/Minecraft.Client/Minecraft.Client.vcxproj
index 8e54bc42..a6aeac2e 100644
--- a/Minecraft.Client/Minecraft.Client.vcxproj
+++ b/Minecraft.Client/Minecraft.Client.vcxproj
@@ -1304,7 +1304,12 @@ if not exist "$(TargetDir)\savedata" mkdir "$(TargetDir)\savedata"</Command>
     <PostBuildEvent>
       <Message>Copying sound assets to output directory</Message>
       <Command>xcopy /q /y /i /s /e "$(ProjectDir)Durango\Sound" "$(OutDir)Durango\Sound"
-xcopy /q /y /i /s /e "$(ProjectDir)music" "$(OutDir)music"</Command>
+xcopy /q /y /i /s /e "$(ProjectDir)music" "$(OutDir)music"
+xcopy /q /y /i /s /e "$(ProjectDir)Windows64\GameHDD" "$(OutDir)Windows64\GameHDD"
+xcopy /q /y /i /s /e "$(ProjectDir)Common\Media" "$(OutDir)Common\Media"
+xcopy /q /y /i /s /e "$(ProjectDir)Common\res" "$(OutDir)Common\res"
+xcopy /q /y /i /s /e "$(ProjectDir)Common\Trial" "$(OutDir)Common\Trial"
+xcopy /q /y /i /s /e "$(ProjectDir)Common\Tutorial" "$(OutDir)Common\Tutorial"</Command>
     </PostBuildEvent>
     <ImageXex>
       <ConfigurationFile>$(ProjectDir)xbox\xex-dev.xml</ConfigurationFile>
@@ -1437,7 +1442,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
     <PostBuildEvent>
       <Message>Copying sound assets to output directory</Message>
       <Command>xcopy /q /y /i /s /e "$(ProjectDir)Durango\Sound" "$(OutDir)Durango\Sound"
-xcopy /q /y /i /s /e "$(ProjectDir)music" "$(OutDir)music"</Command>
+xcopy /q /y /i /s /e "$(ProjectDir)music" "$(OutDir)music"
+xcopy /q /y /i /s /e "$(ProjectDir)Windows64\GameHDD" "$(OutDir)Windows64\GameHDD"
+xcopy /q /y /i /s /e "$(ProjectDir)Common\Media" "$(OutDir)Common\Media"
+xcopy /q /y /i /s /e "$(ProjectDir)Common\res" "$(OutDir)Common\res"
+xcopy /q /y /i /s /e "$(ProjectDir)Common\Trial" "$(OutDir)Common\Trial"
+xcopy /q /y /i /s /e "$(ProjectDir)Common\Tutorial" "$(OutDir)Common\Tutorial"</Command>
     </PostBuildEvent>
     <ImageXex>
       <ConfigurationFile>$(ProjectDir)xbox\xex-dev.xml</ConfigurationFile>
diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
index 42fb2d44..931e7f17 100644
--- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
+++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
@@ -716,26 +716,6 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	UNREFERENCED_PARAMETER(hPrevInstance);
 	UNREFERENCED_PARAMETER(lpCmdLine);
 
-
-	WCHAR exePath[MAX_PATH] = { 0 };
-	GetModuleFileNameW(NULL, exePath, MAX_PATH);
-	WCHAR* lastSlash = wcsrchr(exePath, L'\\');
-	if (lastSlash) {
-		*lastSlash = L'\0';
-
-		WCHAR devCheckPath[MAX_PATH] = { 0 };
-		swprintf_s(devCheckPath, MAX_PATH, L"%s\\..\\..\\Minecraft.Client\\Minecraft.Client.vcxproj", exePath);
-
-		if (GetFileAttributesW(devCheckPath) != INVALID_FILE_ATTRIBUTES) {
-			WCHAR projectPath[MAX_PATH] = { 0 };
-			swprintf_s(projectPath, MAX_PATH, L"%s\\..\\..\\Minecraft.Client", exePath);
-			SetCurrentDirectoryW(projectPath);
-		}
-		else {
-			SetCurrentDirectoryW(exePath);
-		}
-	}
-
 	// Declare DPI awareness so GetSystemMetrics returns physical pixels
 	SetProcessDPIAware();
 	g_iScreenWidth = GetSystemMetrics(SM_CXSCREEN);