diff --git a/BuildScripts/postbuild.ps1 b/BuildScripts/postbuild.ps1
index 0171f822d..7d56e1c5a 100644
--- a/BuildScripts/postbuild.ps1
+++ b/BuildScripts/postbuild.ps1
@@ -6,11 +6,7 @@ param(
 Write-Host "Post-build script started. Output Directory: $OutDir, Project Directory: $ProjectDir"
 
 $directories = @(
-    "Common\Media",
-    "Common\res",
-    "Common\Trial",
-    "Common\Tutorial",
-    "Windows64Media"
+    "Windows64\GameHDD",
 )
 
 foreach ($dir in $directories) {
diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp
index d9b240de7..98a0a661e 100644
--- a/Minecraft.Client/Common/Consoles_App.cpp
+++ b/Minecraft.Client/Common/Consoles_App.cpp
@@ -10054,7 +10054,7 @@ enum ETitleUpdateTexturePacks
 };
 
 #ifdef _WINDOWS64
-wstring titleUpdateTexturePackRoot = L"Windows64\\DLC\\";
+wstring titleUpdateTexturePackRoot = L"Assets\\Win64\\DLC\\";
 #elif defined(__ORBIS__)
 wstring titleUpdateTexturePackRoot = L"/app0/orbis/CU/DLC/";
 #elif defined(__PSVITA__)
diff --git a/Minecraft.Client/Common/GameRules/GameRuleManager.cpp b/Minecraft.Client/Common/GameRules/GameRuleManager.cpp
index 82f33c90f..97e773ca4 100644
--- a/Minecraft.Client/Common/GameRules/GameRuleManager.cpp
+++ b/Minecraft.Client/Common/GameRules/GameRuleManager.cpp
@@ -663,7 +663,7 @@ void GameRuleManager::loadDefaultGameRules()
 
 #ifdef _WINDOWS64
 	File packedTutorialFile(L"Assets\\Win64\\Tutorial\\Tutorial.pck");
-	if(!packedTutorialFile.exists()) packedTutorialFile = File(L"Windows64\\Tutorial\\Tutorial.pck");
+	if(!packedTutorialFile.exists()) packedTutorialFile = File(L"Assets\\Win64\\Tutorial\\Tutorial.pck");
 #elif defined(__ORBIS__)
 	File packedTutorialFile(L"/app0/orbis/Tutorial/Tutorial.pck");
 #elif defined(__PSVITA__)
diff --git a/Minecraft.Client/Common/Network/GameNetworkManager.cpp b/Minecraft.Client/Common/Network/GameNetworkManager.cpp
index 030affd7f..0557c70f9 100644
--- a/Minecraft.Client/Common/Network/GameNetworkManager.cpp
+++ b/Minecraft.Client/Common/Network/GameNetworkManager.cpp
@@ -232,7 +232,7 @@ bool	CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
 #ifdef _WINDOWS64
 						wstring fileRoot = L"Assets\\Win64\\Tutorial\\" + param->levelGen->getBaseSavePath();
 						File root(fileRoot);
-						if(!root.exists()) fileRoot = L"Windows64\\Tutorial\\" + param->levelGen->getBaseSavePath();
+						if(!root.exists()) fileRoot = L"Assets\\Win64\\Tutorial\\" + param->levelGen->getBaseSavePath();
 #elif defined(__ORBIS__)
 						wstring fileRoot = L"/app0/orbis/Tutorial/" + param->levelGen->getBaseSavePath();
 #elif defined(__PSVITA__)
diff --git a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
index 55ab8b587..2a5fecdc5 100644
--- a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
@@ -774,7 +774,7 @@ void UIScene_LoadOrJoinMenu::tick()
                         wchar_t wFilename[MAX_SAVEFILENAME_LENGTH];
                         ZeroMemory(wFilename, sizeof(wFilename));
                         mbstowcs(wFilename, m_pSaveDetails->SaveInfoA[origIdx].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1);
-                        wstring filePath = wstring(L"Saves\\") + wstring(wFilename) + wstring(L"\\saveData.ms");
+                        wstring filePath = wstring(L"Windows64\\GameHDD\\") + wstring(wFilename) + wstring(L"\\saveData.ms");
                         wstring levelName = ReadLevelNameFromSaveFile(filePath);
                         if (!levelName.empty())
                         {
@@ -1016,9 +1016,9 @@ void UIScene_LoadOrJoinMenu::GetSaveInfo()
 
         uiSaveC = 0;
 #ifdef _XBOX
-        File savesDir(L"GAME:\\Saves");
+        File savesDir(L"GAME:\\GameHDD\\");
 #else
-        File savesDir(L"Saves");
+        File savesDir(L"Windows64\\GameHDD\\");
 #endif
         if( savesDir.exists() )
         {
@@ -1432,7 +1432,7 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,boo
                 // Build the sidecar path: Windows64\GameHDD\{folder}\worldname.txt
                 wchar_t wFilename[MAX_SAVEFILENAME_LENGTH] = {};
                 mbstowcs(wFilename, pClass->m_saveDetails[listPos].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1);
-                wstring sidecarPath = wstring(L"Saves\\") + wstring(wFilename) + wstring(L"\\worldname.txt");
+                wstring sidecarPath = wstring(L"Windows64\\GameHDD\\") + wstring(wFilename) + wstring(L"\\worldname.txt");
 
                 FILE *fw = nullptr;
                 if (_wfopen_s(&fw, sidecarPath.c_str(), L"w") == 0 && fw)
@@ -2424,7 +2424,7 @@ int UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JSt
                     wchar_t wFilename[MAX_SAVEFILENAME_LENGTH] = {};
                     mbstowcs_s(nullptr, wFilename, MAX_SAVEFILENAME_LENGTH, pClass->m_saveDetails[displayIdx].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1);
                     wchar_t wFolderPath[MAX_PATH] = {};
-                    swprintf_s(wFolderPath, MAX_PATH, L"Saves\\%s", wFilename);
+                    swprintf_s(wFolderPath, MAX_PATH, L"Windows64\\GameHDD\\%s", wFilename);
                     bSuccess = Win64_DeleteSaveDirectory(wFolderPath);
                 }
                 UIScene_LoadOrJoinMenu::DeleteSaveDataReturned((LPVOID)pClass->GetCallbackUniqueId(), bSuccess);