diff --git a/Minecraft.Client/CMakeLists.txt b/Minecraft.Client/CMakeLists.txt index ea7ee32a..5a8054a2 100644 --- a/Minecraft.Client/CMakeLists.txt +++ b/Minecraft.Client/CMakeLists.txt @@ -87,10 +87,12 @@ endforeach() # --- include("${CMAKE_SOURCE_DIR}/cmake/CopyAssets.cmake") set(ASSET_FOLDER_PAIRS - "${CMAKE_CURRENT_SOURCE_DIR}/music" "music" + "${CMAKE_CURRENT_SOURCE_DIR}/music" "Sounds/Music" "${CMAKE_CURRENT_SOURCE_DIR}/Common/Media" "Common/Media" "${CMAKE_CURRENT_SOURCE_DIR}/Common/res" "Common/res" - "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}Media" "${PLATFORM_NAME}Media" + "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}Media/Sound" "Sounds" + "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}Media/DLC" "Data/DLCs" + "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}Media/Tutorial" "Data/Tutorial" ) setup_asset_folder_copy(Minecraft.Client "${ASSET_FOLDER_PAIRS}") diff --git a/Minecraft.Client/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Common/Audio/SoundEngine.cpp index 6a3e3625..54edd35d 100644 --- a/Minecraft.Client/Common/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp @@ -58,32 +58,12 @@ bool SoundEngine::isStreamingWavebankReady() { return true; } void SoundEngine::playMusicTick() {}; #else - -#ifdef _WINDOWS64 -char SoundEngine::m_szSoundPath[]={"Windows64Media\\Sound\\"}; -char SoundEngine::m_szMusicPath[]={"music\\"}; -#elif defined _DURANGO -char SoundEngine::m_szSoundPath[]={"Sound\\"}; -char SoundEngine::m_szMusicPath[]={"music\\"}; -#elif defined __ORBIS__ - -#ifdef _CONTENT_PACKAGE -char SoundEngine::m_szSoundPath[]={"Sound/"}; -#elif defined _ART_BUILD -char SoundEngine::m_szSoundPath[]={"Sound/"}; -#else -// just use the host Durango folder for the sound. In the content package, we'll have moved this in the .gp4 file -char SoundEngine::m_szSoundPath[]={"Durango/Sound/"}; +char SoundEngine::m_szMiscSoundPath[]={"Sounds/Misc/%s"}; +char SoundEngine::m_szUISoundPath[]={"Sounds/UI/%s"}; +char SoundEngine::m_szMusicPath[]={"Sounds/Music/"}; #endif -char SoundEngine::m_szMusicPath[]={"music/"}; -#elif defined __PSVITA__ -char SoundEngine::m_szSoundPath[]={"PSVita/Sound/"}; -char SoundEngine::m_szMusicPath[]={"music/"}; -#elif defined __PS3__ -//extern const char* getPS3HomePath(); -char SoundEngine::m_szSoundPath[]={"PS3/Sound/"}; -char SoundEngine::m_szMusicPath[]={"music/"}; +#ifdef __PS3__ #define USE_SPURS #ifdef USE_SPURS @@ -91,7 +71,6 @@ char SoundEngine::m_szMusicPath[]={"music/"}; #else #include #endif - #endif const char *SoundEngine::m_szStreamFileA[eStream_Max]= @@ -281,9 +260,8 @@ void SoundEngine::updateMiniAudio() if (m_validListenerCount > 1) { float fClosest=10000.0f; - int iClosestListener=0; float fClosestX=0.0f,fClosestY=0.0f,fClosestZ=0.0f,fDist; - for( size_t i = 0; i < MAX_LOCAL_PLAYERS; i++ ) + for( int i = 0; i < MAX_LOCAL_PLAYERS; i++ ) { if( m_ListenerA[i].bValid ) { @@ -300,7 +278,6 @@ void SoundEngine::updateMiniAudio() fClosestX=x; fClosestY=y; fClosestZ=z; - iClosestListener=i; } } } @@ -375,7 +352,6 @@ void SoundEngine::tick(shared_ptr *players, float a) int listenerCount = 0; if( players ) { - bool bListenerPostionSet = false; for( size_t i = 0; i < MAX_LOCAL_PLAYERS; i++ ) { if( players[i] != nullptr ) @@ -408,7 +384,6 @@ void SoundEngine::tick(shared_ptr *players, float a) } } - // If there were no valid players set, make up a default listener if( listenerCount == 0 ) { @@ -438,8 +413,10 @@ void SoundEngine::tick(shared_ptr *players, float a) SoundEngine::SoundEngine() { random = new Random(); + memset(&m_engine, 0, sizeof(ma_engine)); memset(&m_engineConfig, 0, sizeof(ma_engine_config)); + m_musicStreamActive = false; m_StreamState = eMusicStreamState_Idle; m_iMusicDelay = 0; @@ -506,6 +483,7 @@ void SoundEngine::GetSoundName(char *szSoundName,int iSound) { strcpy_s(szSoundName, 256, "Minecraft/"); wstring name = wchSoundNames[iSound]; + char *SoundName = (char *)ConvertSoundPathToName(name); strcat_s(szSoundName, 256, SoundName); } @@ -518,32 +496,27 @@ void SoundEngine::GetSoundName(char *szSoundName,int iSound) ///////////////////////////////////////////// void SoundEngine::play(int iSound, float x, float y, float z, float volume, float pitch) { - U8 szSoundName[256]; - if (iSound == -1) { app.DebugPrintf(6, "PlaySound with sound of -1 !!!!!!!!!!!!!!!\n"); return; } - strcpy_s((char *)szSoundName, _countof(szSoundName), "Minecraft/"); - wstring name = wchSoundNames[iSound]; char* SoundName = (char*)ConvertSoundPathToName(name); - strcat_s((char *)szSoundName, _countof(szSoundName), SoundName); app.DebugPrintf(6, - "PlaySound - %d - %s - %s (%f %f %f, vol %f, pitch %f)\n", - iSound, SoundName, szSoundName, x, y, z, volume, pitch); + "PlaySound - %d - Sounds/Misc/%s (%f %f %f, vol %f, pitch %f)\n", + iSound, SoundName, x, y, z, volume, pitch); char basePath[256]; - sprintf_s(basePath, "Windows64Media/Sound/%s", (char*)szSoundName); + sprintf_s(basePath, m_szMiscSoundPath, SoundName); char finalPath[256]; sprintf_s(finalPath, "%s.wav", basePath); - const char* extensions[] = { ".ogg", ".wav", ".mp3" }; + const char* extensions[] = { ".ogg", ".wav" }; size_t extCount = sizeof(extensions) / sizeof(extensions[0]); bool found = false; @@ -649,30 +622,22 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, floa ///////////////////////////////////////////// void SoundEngine::playUI(int iSound, float volume, float pitch) { - U8 szSoundName[256]; wstring name; - - if (iSound >= eSFX_MAX) - { - strcpy_s((char *)szSoundName, _countof(szSoundName), "Minecraft/"); - name = wchSoundNames[iSound]; - } - else - { - strcpy_s((char *)szSoundName, _countof(szSoundName), "Minecraft/UI/"); - name = wchUISoundNames[iSound]; - } + name = wchUISoundNames[iSound]; char* SoundName = (char*)ConvertSoundPathToName(name); - strcat_s((char *)szSoundName, _countof(szSoundName), SoundName); + + app.DebugPrintf(6, + "PlaySound - %d - Sounds/UI/%s (vol %f, pitch %f)\n", + iSound, SoundName, volume, pitch); char basePath[256]; - sprintf_s(basePath, "Windows64Media/Sound/Minecraft/UI/%s", ConvertSoundPathToName(name)); + sprintf_s(basePath, m_szUISoundPath, SoundName); char finalPath[256]; sprintf_s(finalPath, "%s.wav", basePath); - const char* extensions[] = { ".ogg", ".wav", ".mp3" }; + const char* extensions[] = { ".ogg", ".wav" }; size_t count = sizeof(extensions) / sizeof(extensions[0]); bool found = false; @@ -685,7 +650,7 @@ void SoundEngine::playUI(int iSound, float volume, float pitch) break; } } - if (!found) // Toru - not found in UI folder, expand search (fixes missing portal sounds) + if (!found) { app.DebugPrintf("No sound file found for UI sound: %s\n", basePath); return; @@ -1141,7 +1106,7 @@ void SoundEngine::playMusicUpdate() m_StreamingAudioInfo.bIs3D=true; // Need to adjust to index into the cds in the game's m_szStreamFileA - strcat_s((char *)m_szStreamName, _countof(m_szStreamName), "cds/"); + strcat_s((char *)m_szStreamName, _countof(m_szStreamName), "CDs/"); strcat_s((char *)m_szStreamName, _countof(m_szStreamName), m_szStreamFileA[m_musicID - m_iStream_CD_1 + eStream_CD_1]); strcat_s((char *)m_szStreamName, _countof(m_szStreamName), ".wav"); } @@ -1153,14 +1118,11 @@ void SoundEngine::playMusicUpdate() if(app.GetBootedFromDiscPatch() && (m_musicID= m_iStream_CD_1); - const char* folder = isCD ? "cds/" : "music/"; - + const char* folder = isCD ? "CDs/" : ""; + int n = sprintf_s(reinterpret_cast(m_szStreamName), 512, "%s%s%s.wav", m_szMusicPath, folder, m_szStreamFileA[m_musicID]); - if (n > 0) { FILE* pFile = nullptr; @@ -1581,6 +1539,4 @@ char *SoundEngine::ConvertSoundPathToName(const wstring& name, bool bConvertSpac } buf[name.length()] = 0; return buf; -} - -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/Minecraft.Client/Common/Audio/SoundEngine.h b/Minecraft.Client/Common/Audio/SoundEngine.h index e866aa9d..fdbab468 100644 --- a/Minecraft.Client/Common/Audio/SoundEngine.h +++ b/Minecraft.Client/Common/Audio/SoundEngine.h @@ -174,7 +174,8 @@ private: ma_sound m_musicStream; bool m_musicStreamActive; - static char m_szSoundPath[]; + static char m_szMiscSoundPath[]; + static char m_szUISoundPath[]; static char m_szMusicPath[]; static const char *m_szStreamFileA[eStream_Max]; diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp index d6bdca65..e439d1a0 100644 --- a/Minecraft.Client/Common/Consoles_App.cpp +++ b/Minecraft.Client/Common/Consoles_App.cpp @@ -10292,7 +10292,7 @@ enum ETitleUpdateTexturePacks }; #ifdef _WINDOWS64 -wstring titleUpdateTexturePackRoot = L"Windows64\\DLC\\"; +wstring titleUpdateTexturePackRoot = L"Data/DLC"; #elif defined(__ORBIS__) wstring titleUpdateTexturePackRoot = L"/app0/orbis/CU/DLC/"; #elif defined(__PSVITA__) @@ -10362,7 +10362,7 @@ wstring CMinecraftApp::getRootPath(DWORD packId, bool allowOverride, bool bAddDa switch(packId) { case eTUTP_Halloween: - path = titleUpdateTexturePackRoot + L"Halloween Texture Pack"; + path = titleUpdateTexturePackRoot + L"Halloween"; break; }; File folder(path); diff --git a/Minecraft.Client/Common/GameRules/GameRuleManager.cpp b/Minecraft.Client/Common/GameRules/GameRuleManager.cpp index 63cbf628..9dd522e8 100644 --- a/Minecraft.Client/Common/GameRules/GameRuleManager.cpp +++ b/Minecraft.Client/Common/GameRules/GameRuleManager.cpp @@ -662,8 +662,8 @@ void GameRuleManager::loadDefaultGameRules() #else // _XBOX #ifdef _WINDOWS64 - File packedTutorialFile(L"Windows64Media\\Tutorial\\Tutorial.pck"); - if(!packedTutorialFile.exists()) packedTutorialFile = File(L"Windows64\\Tutorial\\Tutorial.pck"); + File packedTutorialFile(L"Data/Tutorial/Tutorial.pck"); + if(!packedTutorialFile.exists()) packedTutorialFile = File(L"Data/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 70828d7b..14becbb7 100644 --- a/Minecraft.Client/Common/Network/GameNetworkManager.cpp +++ b/Minecraft.Client/Common/Network/GameNetworkManager.cpp @@ -233,9 +233,9 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame #endif #else #ifdef _WINDOWS64 - wstring fileRoot = L"Windows64Media\\Tutorial\\" + param->levelGen->getBaseSavePath(); + wstring fileRoot = L"Data/Tutorial/" + param->levelGen->getBaseSavePath(); File root(fileRoot); - if(!root.exists()) fileRoot = L"Windows64\\Tutorial\\" + param->levelGen->getBaseSavePath(); + if(!root.exists()) fileRoot = L"Data/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_LoadCreateJoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadCreateJoinMenu.cpp index 716a9752..24ec11cb 100644 --- a/Minecraft.Client/Common/UI/UIScene_LoadCreateJoinMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_LoadCreateJoinMenu.cpp @@ -715,7 +715,7 @@ int UIScene_LoadCreateJoinMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam, PB { app.DebugPrintf("Save thumbnail data is nullptr, or has size 0\n"); - wstring wsName = L"Graphics\\MinecraftIcon.png"; + wstring wsName = L"Graphics/MinecraftIcon.png"; byteArray baIcon = app.getArchiveFile(wsName); pClass->m_saveDetails[pClass->m_iRequestingThumbnailId].pbThumbnailData = baIcon.data; pClass->m_saveDetails[pClass->m_iRequestingThumbnailId].dwThumbnailSize = baIcon.length; @@ -1588,7 +1588,7 @@ void UIScene_LoadCreateJoinMenu::tick() ZeroMemory(wSaveTitle, sizeof(wSaveTitle)); mbstowcs_s(nullptr, wSaveTitle, MAX_DISPLAYNAME_LENGTH, m_pSaveDetails->SaveInfoA[origIdx].UTF8SaveTitle, _TRUNCATE); - wstring filePath = wstring(L"Windows64\\GameHDD\\") + wstring(wFilename) + std::wstring(wSaveTitle) + L".ms"; + wstring filePath = wstring(L"Data/Saves/") + wstring(wFilename) + std::wstring(wSaveTitle) + L".ms"; HANDLE hFile = CreateFileW(filePath.c_str(), GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, nullptr); DWORD fileSize = 0; @@ -3300,52 +3300,6 @@ ui.NavigateToScene (ProfileManager.GetPrimaryPad(), eUIScene_FullscreenProgress, #endif //SONY_REMOTE_STORAGE_DOWNLOAD - -#ifdef _WINDOWS64 - -static bool Win64_DeleteSaveDirectory(const wchar_t* wPath) - -{ - wchar_t wSearch[MAX_PATH]; - - swprintf_s(wSearch, MAX_PATH, L"%s\\*", wPath); - - WIN32_FIND_DATAW fd; - - HANDLE hFind = FindFirstFileW(wSearch, &fd); - - if (hFind != INVALID_HANDLE_VALUE) - - { - do - - { - if (wcscmp(fd.cFileName, L".") == 0 || wcscmp(fd.cFileName, L"..") == 0) - continue; - - wchar_t wChild[MAX_PATH]; - - swprintf_s(wChild, MAX_PATH, L"%s\\%s", wPath, fd.cFileName); - - if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - - Win64_DeleteSaveDirectory(wChild); - - else - - DeleteFileW(wChild); - } - while (FindNextFileW(hFind, &fd)); - - FindClose(hFind); - } - - return RemoveDirectoryW(wPath) != 0; -} - -#endif // _WINDOWS64 - - int UIScene_LoadCreateJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result) { auto* pClass = static_cast(pParam); @@ -3360,25 +3314,14 @@ int UIScene_LoadCreateJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C pClass->m_bIgnoreInput=false; else { -#ifdef _WINDOWS64 - { - // Use m_saveDetails (sorted display order) so the correct folder is targeted - int displayIdx = pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC; - bool bSuccess = false; - if (pClass->m_saveDetails && displayIdx >= 0 && pClass->m_saveDetails[displayIdx].UTF8SaveFilename[0]) - { - std::string narrowFilename(pClass->m_saveDetails[displayIdx].UTF8SaveFilename); - std::wstring wFilename(narrowFilename.begin(), narrowFilename.end()); - - std::wstring wFolderPath = L"Windows64\\GameHDD\\" + wFilename; - bSuccess = Win64_DeleteSaveDirectory(wFolderPath.c_str()); - } - UIScene_LoadCreateJoinMenu::DeleteSaveDataReturned(reinterpret_cast(pClass->GetCallbackUniqueId()), bSuccess); - } -#else - StorageManager.DeleteSaveData(&pClass->m_pSaveDetails->SaveInfoA[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC], UIScene_LoadCreateJoinMenu::DeleteSaveDataReturned, reinterpret_cast(pClass->GetCallbackUniqueId()) - ); -#endif + int displayIdx = pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC; + + if (pClass->m_saveDetails && displayIdx >= 0 && pClass->m_saveDetails[displayIdx].UTF8SaveFilename[0]) + { + auto pSaveInfo = &pClass->m_pSaveDetails->SaveInfo[pClass->m_saveDetails[displayIdx].saveId]; + StorageManager.DeleteSaveData(pSaveInfo, UIScene_LoadCreateJoinMenu::DeleteSaveDataReturned, (LPVOID)pClass->GetCallbackUniqueId()); + } + pClass->m_controlSavesTimer.setVisible( true ); } } diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp index 039bd940..393e700f 100644 --- a/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp @@ -37,14 +37,14 @@ int UIScene_SettingsGraphicsMenu::LevelToDistance(int level) { static const int table[5] = {2,4,8,16,32}; if(level < 0) level = 0; - if(level > 5) level = 5; + if(level > 4) level = 4; return table[level]; } int UIScene_SettingsGraphicsMenu::DistanceToLevel(int dist) { static const int table[5] = {2,4,8,16,32}; - for(int i = 0; i < 6; i++){ + for(int i = 0; i < 5; i++){ if(table[i] == dist) return i; } diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Input.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Input.lib index 65202f46..f592c329 100644 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Input.lib and b/Minecraft.Client/Windows64/4JLibs/libs/4J_Input.lib differ diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Input_d.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Input_d.lib index 2134dac5..f181f2fa 100644 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Input_d.lib and b/Minecraft.Client/Windows64/4JLibs/libs/4J_Input_d.lib differ diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile.lib index 2a047236..59a85666 100644 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile.lib and b/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile.lib differ diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile_d.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile_d.lib index 742c7db0..eacc9cec 100644 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile_d.lib and b/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile_d.lib differ diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC.lib index a0c757ac..ab1012ae 100644 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC.lib and b/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC.lib differ diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC_d.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC_d.lib index 495ca4c2..b7055b39 100644 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC_d.lib and b/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC_d.lib differ diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage.lib index 75f0102f..9c9ab06e 100644 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage.lib and b/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage.lib differ diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage_d.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage_d.lib index 67287ede..c6068513 100644 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage_d.lib and b/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage_d.lib differ diff --git a/Minecraft.Client/Windows64Media/DLC/Drag the DLCs here.txt b/Minecraft.Client/Windows64Media/DLC/Drag the DLCs here.txt new file mode 100644 index 00000000..e69de29b diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave10.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave10.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave10.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave10.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave11.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave11.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave11.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave11.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave12.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave12.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave12.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave12.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave13.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave13.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave13.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave13.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave5.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave5.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave5.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave5.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave6.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave6.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave6.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave6.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave7.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave7.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave7.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave7.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave8.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave8.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave8.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave8.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave9.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave9.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/cave/cave9.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/ambient/cave/cave9.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/weather/rain1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/ambient/weather/rain1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/weather/rain1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/ambient/weather/rain1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/weather/rain2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/ambient/weather/rain2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/weather/rain2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/ambient/weather/rain2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/weather/rain3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/ambient/weather/rain3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/weather/rain3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/ambient/weather/rain3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/weather/rain4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/ambient/weather/rain4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/weather/rain4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/ambient/weather/rain4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/weather/thunder1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/ambient/weather/thunder1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/weather/thunder1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/ambient/weather/thunder1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/weather/thunder2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/ambient/weather/thunder2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/weather/thunder2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/ambient/weather/thunder2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/weather/thunder3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/ambient/weather/thunder3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/ambient/weather/thunder3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/ambient/weather/thunder3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/damage/Thorns1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/damage/Thorns1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/damage/Thorns1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/damage/Thorns1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/damage/Thorns2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/damage/Thorns2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/damage/Thorns2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/damage/Thorns2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/damage/Thorns3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/damage/Thorns3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/damage/Thorns3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/damage/Thorns3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/damage/Thorns4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/damage/Thorns4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/damage/Thorns4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/damage/Thorns4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/damage/fallbig1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/damage/fallbig1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/damage/fallbig1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/damage/fallbig1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/damage/fallbig2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/damage/fallbig2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/damage/fallbig2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/damage/fallbig2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/damage/fallsmall.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/damage/fallsmall.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/damage/fallsmall.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/damage/fallsmall.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/damage/hurtflesh1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/damage/hurtflesh1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/damage/hurtflesh1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/damage/hurtflesh1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/damage/hurtflesh2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/damage/hurtflesh2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/damage/hurtflesh2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/damage/hurtflesh2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/damage/hurtflesh3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/damage/hurtflesh3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/damage/hurtflesh3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/damage/hurtflesh3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/cloth1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/cloth1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/cloth1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/cloth1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/cloth2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/cloth2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/cloth2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/cloth2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/cloth3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/cloth3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/cloth3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/cloth3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/cloth4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/cloth4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/cloth4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/cloth4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/grass1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/grass1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/grass1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/grass1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/grass2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/grass2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/grass2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/grass2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/grass3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/grass3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/grass3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/grass3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/grass4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/grass4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/grass4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/grass4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/gravel1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/gravel1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/gravel1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/gravel1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/gravel2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/gravel2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/gravel2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/gravel2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/gravel3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/gravel3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/gravel3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/gravel3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/gravel4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/gravel4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/gravel4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/gravel4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/sand1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/sand1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/sand1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/sand1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/sand2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/sand2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/sand2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/sand2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/sand3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/sand3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/sand3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/sand3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/sand4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/sand4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/sand4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/sand4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/snow1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/snow1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/snow1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/snow1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/snow2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/snow2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/snow2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/snow2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/snow3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/snow3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/snow3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/snow3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/snow4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/snow4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/snow4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/snow4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/stone1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/stone1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/stone1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/stone1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/stone2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/stone2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/stone2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/stone2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/stone3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/stone3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/stone3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/stone3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/stone4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/stone4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/stone4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/stone4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/wood1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/wood1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/wood1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/wood1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/wood2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/wood2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/wood2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/wood2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/wood3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/wood3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/wood3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/wood3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/dig/wood4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/dig/wood4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/dig/wood4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/dig/wood4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/fire/fire.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/fire/fire.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/fire/fire.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/fire/fire.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/fire/ignite.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/fire/ignite.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/fire/ignite.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/fire/ignite.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/fireworks/blast1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/fireworks/blast1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/fireworks/blast1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/fireworks/blast1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/fireworks/blast_far1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/fireworks/blast_far1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/fireworks/blast_far1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/fireworks/blast_far1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/fireworks/largeblast1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/fireworks/largeblast1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/fireworks/largeblast1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/fireworks/largeblast1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/fireworks/largeblast_far1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/fireworks/largeblast_far1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/fireworks/largeblast_far1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/fireworks/largeblast_far1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/fireworks/launch1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/fireworks/launch1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/fireworks/launch1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/fireworks/launch1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/fireworks/twinkle1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/fireworks/twinkle1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/fireworks/twinkle1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/fireworks/twinkle1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/fireworks/twinkle_far1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/fireworks/twinkle_far1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/fireworks/twinkle_far1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/fireworks/twinkle_far1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/liquid/lava.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/liquid/lava.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/liquid/lava.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/liquid/lava.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/liquid/lavapop.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/liquid/lavapop.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/liquid/lavapop.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/liquid/lavapop.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/liquid/splash.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/liquid/splash.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/liquid/splash.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/liquid/splash.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/liquid/swim1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/liquid/swim1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/liquid/swim1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/liquid/swim1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/liquid/swim2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/liquid/swim2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/liquid/swim2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/liquid/swim2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/liquid/swim3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/liquid/swim3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/liquid/swim3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/liquid/swim3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/liquid/swim4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/liquid/swim4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/liquid/swim4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/liquid/swim4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/liquid/water.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/liquid/water.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/liquid/water.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/liquid/water.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/loops/birds_screaming_loop.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/loops/birds_screaming_loop.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/loops/birds_screaming_loop.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/loops/birds_screaming_loop.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/loops/cave_chimes.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/loops/cave_chimes.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/loops/cave_chimes.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/loops/cave_chimes.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/loops/ocean.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/loops/ocean.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/loops/ocean.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/loops/ocean.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/loops/waterfall.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/loops/waterfall.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/loops/waterfall.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/loops/waterfall.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/bat/death.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/bat/death.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/bat/death.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/bat/death.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/bat/hurt1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/bat/hurt1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/bat/hurt1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/bat/hurt1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/bat/hurt2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/bat/hurt2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/bat/hurt2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/bat/hurt2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/bat/hurt3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/bat/hurt3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/bat/hurt3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/bat/hurt3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/bat/hurt4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/bat/hurt4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/bat/hurt4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/bat/hurt4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/bat/idle1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/bat/idle1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/bat/idle1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/bat/idle1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/bat/idle2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/bat/idle2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/bat/idle2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/bat/idle2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/bat/idle3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/bat/idle3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/bat/idle3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/bat/idle3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/bat/idle4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/bat/idle4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/bat/idle4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/bat/idle4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/bat/takeoff.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/bat/takeoff.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/bat/takeoff.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/bat/takeoff.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/blaze/breathe1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/blaze/breathe1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/blaze/breathe1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/blaze/breathe1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/blaze/breathe2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/blaze/breathe2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/blaze/breathe2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/blaze/breathe2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/blaze/breathe3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/blaze/breathe3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/blaze/breathe3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/blaze/breathe3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/blaze/breathe4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/blaze/breathe4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/blaze/breathe4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/blaze/breathe4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/blaze/death.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/blaze/death.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/blaze/death.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/blaze/death.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/blaze/hit1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/blaze/hit1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/blaze/hit1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/blaze/hit1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/blaze/hit2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/blaze/hit2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/blaze/hit2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/blaze/hit2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/blaze/hit3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/blaze/hit3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/blaze/hit3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/blaze/hit3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/blaze/hit4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/blaze/hit4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/blaze/hit4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/blaze/hit4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/hiss1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/hiss1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/hiss1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/hiss1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/hiss2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/hiss2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/hiss2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/hiss2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/hiss3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/hiss3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/hiss3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/hiss3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/hit1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/hit1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/hit1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/hit1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/hit2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/hit2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/hit2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/hit2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/hit3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/hit3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/hit3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/hit3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/meow1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/meow1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/meow1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/meow1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/meow2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/meow2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/meow2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/meow2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/meow3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/meow3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/meow3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/meow3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/meow4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/meow4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/meow4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/meow4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/purr1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/purr1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/purr1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/purr1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/purr2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/purr2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/purr2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/purr2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/purr3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/purr3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/purr3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/purr3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/purreow1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/purreow1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/purreow1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/purreow1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/purreow2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/purreow2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cat/purreow2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cat/purreow2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/chicken/hurt1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/chicken/hurt1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/chicken/hurt1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/chicken/hurt1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/chicken/hurt2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/chicken/hurt2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/chicken/hurt2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/chicken/hurt2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/chicken/plop.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/chicken/plop.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/chicken/plop.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/chicken/plop.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/chicken/say1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/chicken/say1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/chicken/say1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/chicken/say1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/chicken/say2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/chicken/say2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/chicken/say2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/chicken/say2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/chicken/say3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/chicken/say3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/chicken/say3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/chicken/say3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/chicken/step1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/chicken/step1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/chicken/step1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/chicken/step1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/chicken/step2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/chicken/step2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/chicken/step2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/chicken/step2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/hurt1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/hurt1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/hurt1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/hurt1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/hurt2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/hurt2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/hurt2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/hurt2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/hurt3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/hurt3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/hurt3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/hurt3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/say1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/say1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/say1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/say1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/say2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/say2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/say2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/say2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/say3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/say3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/say3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/say3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/say4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/say4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/say4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/say4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/step1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/step1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/step1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/step1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/step2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/step2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/step2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/step2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/step3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/step3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/step3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/step3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/step4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/step4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/cow/step4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/cow/step4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/creeper/death.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/creeper/death.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/creeper/death.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/creeper/death.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/creeper/say1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/creeper/say1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/creeper/say1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/creeper/say1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/creeper/say2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/creeper/say2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/creeper/say2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/creeper/say2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/creeper/say3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/creeper/say3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/creeper/say3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/creeper/say3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/creeper/say4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/creeper/say4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/creeper/say4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/creeper/say4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/end.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/end.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/end.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/end.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/growl1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/growl1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/growl1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/growl1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/growl2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/growl2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/growl2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/growl2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/growl3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/growl3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/growl3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/growl3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/growl4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/growl4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/growl4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/growl4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/hit1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/hit1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/hit1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/hit1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/hit2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/hit2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/hit2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/hit2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/hit3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/hit3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/hit3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/hit3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/hit4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/hit4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/hit4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/hit4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/wings1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/wings1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/wings1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/wings1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/wings2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/wings2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/wings2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/wings2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/wings3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/wings3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/wings3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/wings3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/wings4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/wings4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/wings4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/wings4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/wings5.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/wings5.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/wings5.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/wings5.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/wings6.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/wings6.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/enderdragon/wings6.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/enderdragon/wings6.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/death.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/death.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/death.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/death.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/hit1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/hit1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/hit1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/hit1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/hit2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/hit2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/hit2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/hit2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/hit3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/hit3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/hit3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/hit3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/hit4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/hit4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/hit4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/hit4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/idle1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/idle1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/idle1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/idle1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/idle2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/idle2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/idle2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/idle2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/idle3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/idle3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/idle3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/idle3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/idle4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/idle4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/idle4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/idle4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/idle5.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/idle5.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/idle5.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/idle5.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/portal.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/portal.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/portal.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/portal.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/portal2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/portal2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/portal2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/portal2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/scream1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/scream1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/scream1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/scream1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/scream2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/scream2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/scream2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/scream2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/scream3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/scream3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/scream3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/scream3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/scream4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/scream4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/scream4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/scream4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/stare.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/stare.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/endermen/stare.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/endermen/stare.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/affectionate_scream.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/affectionate_scream.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/affectionate_scream.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/affectionate_scream.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/charge.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/charge.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/charge.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/charge.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/death.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/death.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/death.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/death.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/fireball4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/fireball4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/fireball4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/fireball4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/moan1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/moan1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/moan1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/moan1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/moan2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/moan2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/moan2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/moan2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/moan3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/moan3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/moan3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/moan3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/moan4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/moan4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/moan4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/moan4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/moan5.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/moan5.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/moan5.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/moan5.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/moan6.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/moan6.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/moan6.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/moan6.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/moan7.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/moan7.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/moan7.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/moan7.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/scream1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/scream1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/scream1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/scream1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/scream2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/scream2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/scream2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/scream2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/scream3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/scream3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/scream3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/scream3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/scream4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/scream4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/scream4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/scream4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/scream5.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/scream5.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/ghast/scream5.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/ghast/scream5.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/angry1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/angry1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/angry1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/angry1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/armor.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/armor.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/armor.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/armor.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/breathe1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/breathe1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/breathe1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/breathe1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/breathe2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/breathe2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/breathe2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/breathe2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/breathe3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/breathe3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/breathe3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/breathe3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/death.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/death.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/death.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/death.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/donkey/angry1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/donkey/angry1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/donkey/angry1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/donkey/angry1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/donkey/angry2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/donkey/angry2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/donkey/angry2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/donkey/angry2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/donkey/death.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/donkey/death.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/donkey/death.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/donkey/death.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/donkey/hit1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/donkey/hit1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/donkey/hit1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/donkey/hit1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/donkey/hit2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/donkey/hit2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/donkey/hit2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/donkey/hit2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/donkey/hit3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/donkey/hit3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/donkey/hit3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/donkey/hit3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/donkey/idle1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/donkey/idle1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/donkey/idle1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/donkey/idle1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/donkey/idle2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/donkey/idle2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/donkey/idle2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/donkey/idle2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/donkey/idle3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/donkey/idle3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/donkey/idle3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/donkey/idle3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/eat1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/eat1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/eat1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/eat1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/eat2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/eat2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/eat2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/eat2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/eat3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/eat3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/eat3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/eat3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/eat4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/eat4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/eat4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/eat4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/eat5.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/eat5.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/eat5.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/eat5.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/gallop1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/gallop1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/gallop1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/gallop1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/gallop2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/gallop2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/gallop2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/gallop2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/gallop3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/gallop3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/gallop3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/gallop3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/gallop4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/gallop4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/gallop4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/gallop4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/hit1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/hit1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/hit1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/hit1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/hit2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/hit2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/hit2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/hit2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/hit3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/hit3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/hit3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/hit3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/hit4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/hit4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/hit4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/hit4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/idle1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/idle1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/idle1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/idle1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/idle2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/idle2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/idle2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/idle2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/idle3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/idle3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/idle3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/idle3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/jump.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/jump.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/jump.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/jump.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/land.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/land.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/land.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/land.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/leather.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/leather.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/leather.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/leather.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/skeleton/death.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/skeleton/death.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/skeleton/death.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/skeleton/death.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/skeleton/hit1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/skeleton/hit1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/skeleton/hit1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/skeleton/hit1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/skeleton/hit2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/skeleton/hit2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/skeleton/hit2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/skeleton/hit2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/skeleton/hit3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/skeleton/hit3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/skeleton/hit3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/skeleton/hit3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/skeleton/hit4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/skeleton/hit4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/skeleton/hit4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/skeleton/hit4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/skeleton/idle1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/skeleton/idle1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/skeleton/idle1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/skeleton/idle1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/skeleton/idle2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/skeleton/idle2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/skeleton/idle2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/skeleton/idle2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/skeleton/idle3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/skeleton/idle3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/skeleton/idle3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/skeleton/idle3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/soft1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/soft1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/soft1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/soft1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/soft2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/soft2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/soft2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/soft2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/soft3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/soft3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/soft3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/soft3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/soft4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/soft4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/soft4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/soft4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/soft5.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/soft5.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/soft5.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/soft5.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/soft6.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/soft6.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/soft6.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/soft6.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/wood1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/wood1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/wood1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/wood1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/wood2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/wood2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/wood2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/wood2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/wood3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/wood3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/wood3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/wood3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/wood4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/wood4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/wood4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/wood4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/wood5.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/wood5.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/wood5.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/wood5.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/wood6.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/wood6.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/wood6.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/wood6.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/zombie/angry.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/zombie/angry.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/zombie/angry.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/zombie/angry.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/zombie/death.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/zombie/death.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/zombie/death.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/zombie/death.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/zombie/hit1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/zombie/hit1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/zombie/hit1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/zombie/hit1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/zombie/hit2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/zombie/hit2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/zombie/hit2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/zombie/hit2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/zombie/hit3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/zombie/hit3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/zombie/hit3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/zombie/hit3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/zombie/hit4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/zombie/hit4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/zombie/hit4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/zombie/hit4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/zombie/idle1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/zombie/idle1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/zombie/idle1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/zombie/idle1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/zombie/idle2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/zombie/idle2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/zombie/idle2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/zombie/idle2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/zombie/idle3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/zombie/idle3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/horse/zombie/idle3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/horse/zombie/idle3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/irongolem/death.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/irongolem/death.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/irongolem/death.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/irongolem/death.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/irongolem/hit1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/irongolem/hit1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/irongolem/hit1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/irongolem/hit1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/irongolem/hit2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/irongolem/hit2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/irongolem/hit2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/irongolem/hit2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/irongolem/hit3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/irongolem/hit3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/irongolem/hit3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/irongolem/hit3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/irongolem/hit4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/irongolem/hit4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/irongolem/hit4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/irongolem/hit4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/irongolem/throw.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/irongolem/throw.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/irongolem/throw.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/irongolem/throw.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/irongolem/walk1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/irongolem/walk1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/irongolem/walk1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/irongolem/walk1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/irongolem/walk2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/irongolem/walk2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/irongolem/walk2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/irongolem/walk2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/irongolem/walk3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/irongolem/walk3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/irongolem/walk3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/irongolem/walk3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/irongolem/walk4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/irongolem/walk4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/irongolem/walk4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/irongolem/walk4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/big1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/big1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/big1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/big1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/big2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/big2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/big2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/big2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/big3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/big3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/big3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/big3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/big4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/big4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/big4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/big4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/jump1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/jump1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/jump1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/jump1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/jump2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/jump2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/jump2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/jump2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/jump3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/jump3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/jump3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/jump3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/jump4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/jump4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/jump4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/jump4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/small1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/small1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/small1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/small1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/small2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/small2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/small2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/small2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/small3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/small3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/small3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/small3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/small4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/small4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/small4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/small4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/small5.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/small5.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/magmacube/small5.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/magmacube/small5.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/pig/death.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/pig/death.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/pig/death.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/pig/death.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/pig/say1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/pig/say1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/pig/say1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/pig/say1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/pig/say2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/pig/say2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/pig/say2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/pig/say2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/pig/say3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/pig/say3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/pig/say3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/pig/say3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/pig/step1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/pig/step1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/pig/step1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/pig/step1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/pig/step2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/pig/step2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/pig/step2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/pig/step2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/pig/step3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/pig/step3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/pig/step3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/pig/step3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/pig/step4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/pig/step4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/pig/step4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/pig/step4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/pig/step5.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/pig/step5.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/pig/step5.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/pig/step5.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/sheep/say1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/sheep/say1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/sheep/say1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/sheep/say1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/sheep/say2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/sheep/say2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/sheep/say2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/sheep/say2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/sheep/say3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/sheep/say3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/sheep/say3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/sheep/say3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/sheep/shear.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/sheep/shear.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/sheep/shear.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/sheep/shear.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/sheep/step1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/sheep/step1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/sheep/step1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/sheep/step1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/sheep/step2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/sheep/step2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/sheep/step2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/sheep/step2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/sheep/step3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/sheep/step3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/sheep/step3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/sheep/step3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/sheep/step4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/sheep/step4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/sheep/step4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/sheep/step4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/sheep/step5.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/sheep/step5.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/sheep/step5.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/sheep/step5.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/hit1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/hit1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/hit1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/hit1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/hit2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/hit2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/hit2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/hit2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/hit3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/hit3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/hit3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/hit3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/kill.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/kill.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/kill.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/kill.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/say1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/say1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/say1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/say1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/say2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/say2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/say2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/say2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/say3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/say3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/say3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/say3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/say4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/say4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/say4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/say4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/step1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/step1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/step1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/step1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/step2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/step2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/step2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/step2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/step3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/step3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/step3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/step3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/step4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/step4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/silverfish/step4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/silverfish/step4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/death.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/death.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/death.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/death.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/hurt1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/hurt1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/hurt1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/hurt1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/hurt2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/hurt2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/hurt2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/hurt2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/hurt3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/hurt3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/hurt3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/hurt3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/hurt4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/hurt4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/hurt4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/hurt4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/say1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/say1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/say1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/say1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/say2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/say2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/say2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/say2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/say3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/say3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/say3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/say3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/step1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/step1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/step1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/step1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/step2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/step2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/step2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/step2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/step3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/step3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/step3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/step3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/step4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/step4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/skeleton/step4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/skeleton/step4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/attack1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/attack1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/attack1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/attack1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/attack2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/attack2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/attack2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/attack2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/big1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/big1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/big1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/big1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/big2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/big2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/big2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/big2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/big3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/big3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/big3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/big3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/big4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/big4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/big4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/big4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/small1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/small1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/small1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/small1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/small2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/small2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/small2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/small2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/small3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/small3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/small3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/small3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/small4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/small4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/small4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/small4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/small5.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/small5.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/slime/small5.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/slime/small5.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/spider/death.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/spider/death.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/spider/death.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/spider/death.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/spider/say1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/spider/say1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/spider/say1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/spider/say1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/spider/say2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/spider/say2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/spider/say2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/spider/say2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/spider/say3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/spider/say3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/spider/say3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/spider/say3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/spider/say4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/spider/say4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/spider/say4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/spider/say4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/spider/step1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/spider/step1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/spider/step1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/spider/step1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/spider/step2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/spider/step2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/spider/step2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/spider/step2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/spider/step3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/spider/step3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/spider/step3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/spider/step3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/spider/step4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/spider/step4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/spider/step4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/spider/step4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/death.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/death.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/death.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/death.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/haggle1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/haggle1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/haggle1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/haggle1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/haggle2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/haggle2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/haggle2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/haggle2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/haggle3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/haggle3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/haggle3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/haggle3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/hit1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/hit1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/hit1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/hit1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/hit2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/hit2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/hit2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/hit2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/hit3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/hit3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/hit3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/hit3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/hit4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/hit4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/hit4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/hit4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/idle1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/idle1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/idle1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/idle1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/idle2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/idle2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/idle2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/idle2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/idle3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/idle3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/idle3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/idle3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/no1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/no1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/no1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/no1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/no2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/no2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/no2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/no2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/no3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/no3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/no3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/no3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/yes1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/yes1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/yes1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/yes1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/yes2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/yes2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/yes2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/yes2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/yes3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/yes3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/villager/yes3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/villager/yes3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/ambient1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/ambient1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/ambient1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/ambient1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/ambient2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/ambient2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/ambient2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/ambient2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/ambient3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/ambient3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/ambient3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/ambient3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/ambient4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/ambient4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/ambient4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/ambient4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/ambient5.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/ambient5.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/ambient5.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/ambient5.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/death1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/death1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/death1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/death1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/death2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/death2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/death2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/death2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/death3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/death3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/death3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/death3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/hurt1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/hurt1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/hurt1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/hurt1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/hurt2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/hurt2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/hurt2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/hurt2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/hurt3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/hurt3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/witch/hurt3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/witch/hurt3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/bark1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/bark1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/bark1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/bark1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/bark2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/bark2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/bark2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/bark2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/bark3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/bark3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/bark3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/bark3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/death.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/death.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/death.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/death.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/growl1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/growl1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/growl1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/growl1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/growl2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/growl2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/growl2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/growl2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/growl3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/growl3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/growl3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/growl3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/howl1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/howl1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/howl1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/howl1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/howl2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/howl2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/howl2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/howl2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/hurt1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/hurt1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/hurt1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/hurt1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/hurt2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/hurt2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/hurt2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/hurt2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/hurt3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/hurt3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/hurt3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/hurt3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/panting.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/panting.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/panting.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/panting.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/shake.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/shake.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/shake.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/shake.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/step1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/step1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/step1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/step1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/step2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/step2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/step2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/step2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/step3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/step3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/step3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/step3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/step4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/step4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/step4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/step4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/step5.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/step5.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/step5.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/step5.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/whine.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/whine.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/wolf/whine.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/wolf/whine.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/death.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/death.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/death.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/death.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/hurt1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/hurt1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/hurt1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/hurt1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/hurt2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/hurt2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/hurt2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/hurt2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/infect.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/infect.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/infect.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/infect.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/metal1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/metal1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/metal1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/metal1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/metal2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/metal2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/metal2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/metal2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/metal3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/metal3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/metal3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/metal3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/remedy.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/remedy.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/remedy.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/remedy.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/say1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/say1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/say1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/say1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/say2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/say2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/say2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/say2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/say3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/say3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/say3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/say3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/step1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/step1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/step1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/step1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/step2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/step2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/step2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/step2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/step3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/step3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/step3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/step3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/step4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/step4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/step4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/step4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/step5.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/step5.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/step5.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/step5.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/unfect.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/unfect.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/unfect.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/unfect.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/wood1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/wood1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/wood1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/wood1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/wood2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/wood2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/wood2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/wood2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/wood3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/wood3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/wood3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/wood3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/wood4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/wood4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/wood4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/wood4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/woodbreak.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/woodbreak.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombie/woodbreak.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombie/woodbreak.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpig1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpig1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpig1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpig1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpig2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpig2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpig2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpig2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpig3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpig3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpig3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpig3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpig4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpig4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpig4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpig4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpigangry1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpigangry1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpigangry1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpigangry1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpigangry2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpigangry2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpigangry2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpigangry2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpigangry3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpigangry3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpigangry3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpigangry3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpigangry4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpigangry4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpigangry4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpigangry4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpigdeath.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpigdeath.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpigdeath.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpigdeath.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpighurt1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpighurt1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpighurt1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpighurt1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpighurt2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpighurt2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/mob/zombiepig/zpighurt2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/mob/zombiepig/zpighurt2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/note/bass.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/note/bass.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/note/bass.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/note/bass.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/note/bassattack.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/note/bassattack.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/note/bassattack.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/note/bassattack.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/note/bd.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/note/bd.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/note/bd.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/note/bd.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/note/btn_Back.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/note/btn_Back.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/note/btn_Back.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/note/btn_Back.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/note/harp.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/note/harp.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/note/harp.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/note/harp.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/note/hat.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/note/hat.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/note/hat.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/note/hat.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/note/pling.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/note/pling.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/note/pling.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/note/pling.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/note/snare.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/note/snare.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/note/snare.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/note/snare.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/portal/portal.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/portal/portal.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/portal/portal.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/portal/portal.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/portal/travel.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/portal/travel.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/portal/travel.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/portal/travel.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/portal/trigger.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/portal/trigger.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/portal/trigger.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/portal/trigger.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/anvil_break.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/anvil_break.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/anvil_break.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/anvil_break.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/anvil_land.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/anvil_land.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/anvil_land.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/anvil_land.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/anvil_use.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/anvil_use.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/anvil_use.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/anvil_use.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/bow.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/bow.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/bow.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/bow.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/bowhit1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/bowhit1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/bowhit1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/bowhit1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/bowhit2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/bowhit2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/bowhit2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/bowhit2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/bowhit3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/bowhit3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/bowhit3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/bowhit3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/bowhit4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/bowhit4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/bowhit4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/bowhit4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/break.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/break.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/break.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/break.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/breath.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/breath.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/breath.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/breath.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/burp.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/burp.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/burp.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/burp.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/chestclosed.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/chestclosed.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/chestclosed.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/chestclosed.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/chestopen.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/chestopen.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/chestopen.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/chestopen.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/click.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/click.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/click.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/click.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/door_close.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/door_close.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/door_close.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/door_close.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/door_open.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/door_open.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/door_open.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/door_open.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/drink.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/drink.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/drink.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/drink.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/drr.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/drr.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/drr.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/drr.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/eat1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/eat1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/eat1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/eat1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/eat2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/eat2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/eat2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/eat2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/eat3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/eat3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/eat3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/eat3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/explode1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/explode1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/explode1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/explode1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/explode2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/explode2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/explode2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/explode2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/explode3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/explode3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/explode3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/explode3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/explode4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/explode4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/explode4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/explode4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/fizz.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/fizz.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/fizz.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/fizz.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/fuse.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/fuse.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/fuse.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/fuse.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/glass1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/glass1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/glass1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/glass1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/glass2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/glass2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/glass2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/glass2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/glass3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/glass3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/glass3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/glass3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/hurt.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/hurt.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/hurt.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/hurt.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/levelup.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/levelup.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/levelup.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/levelup.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/orb.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/orb.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/orb.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/orb.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/pop.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/pop.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/pop.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/pop.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/splash.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/splash.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/splash.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/splash.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/random/wood_click.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/random/wood_click.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/random/wood_click.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/random/wood_click.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/cloth1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/cloth1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/cloth1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/cloth1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/cloth2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/cloth2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/cloth2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/cloth2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/cloth3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/cloth3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/cloth3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/cloth3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/cloth4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/cloth4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/cloth4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/cloth4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/grass1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/grass1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/grass1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/grass1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/grass2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/grass2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/grass2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/grass2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/grass3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/grass3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/grass3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/grass3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/grass4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/grass4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/grass4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/grass4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/grass5.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/grass5.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/grass5.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/grass5.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/grass6.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/grass6.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/grass6.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/grass6.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/gravel1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/gravel1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/gravel1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/gravel1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/gravel2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/gravel2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/gravel2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/gravel2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/gravel3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/gravel3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/gravel3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/gravel3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/gravel4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/gravel4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/gravel4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/gravel4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/ladder1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/ladder1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/ladder1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/ladder1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/ladder2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/ladder2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/ladder2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/ladder2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/ladder3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/ladder3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/ladder3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/ladder3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/ladder4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/ladder4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/ladder4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/ladder4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/ladder5.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/ladder5.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/ladder5.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/ladder5.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/sand1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/sand1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/sand1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/sand1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/sand2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/sand2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/sand2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/sand2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/sand3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/sand3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/sand3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/sand3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/sand4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/sand4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/sand4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/sand4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/sand5.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/sand5.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/sand5.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/sand5.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/snow1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/snow1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/snow1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/snow1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/snow2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/snow2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/snow2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/snow2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/snow3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/snow3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/snow3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/snow3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/snow4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/snow4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/snow4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/snow4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/stone1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/stone1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/stone1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/stone1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/stone2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/stone2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/stone2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/stone2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/stone3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/stone3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/stone3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/stone3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/stone4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/stone4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/stone4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/stone4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/stone5.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/stone5.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/stone5.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/stone5.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/stone6.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/stone6.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/stone6.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/stone6.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/wood1.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/wood1.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/wood1.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/wood1.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/wood2.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/wood2.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/wood2.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/wood2.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/wood3.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/wood3.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/wood3.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/wood3.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/wood4.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/wood4.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/wood4.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/wood4.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/wood5.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/wood5.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/wood5.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/wood5.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/step/wood6.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/step/wood6.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/step/wood6.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/step/wood6.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/tile/piston/in.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/tile/piston/in.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/tile/piston/in.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/tile/piston/in.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/tile/piston/out.ogg b/Minecraft.Client/Windows64Media/Sound/Misc/tile/piston/out.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/tile/piston/out.ogg rename to Minecraft.Client/Windows64Media/Sound/Misc/tile/piston/out.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/UI/back.ogg b/Minecraft.Client/Windows64Media/Sound/UI/back.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/UI/back.ogg rename to Minecraft.Client/Windows64Media/Sound/UI/back.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/UI/craft.ogg b/Minecraft.Client/Windows64Media/Sound/UI/craft.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/UI/craft.ogg rename to Minecraft.Client/Windows64Media/Sound/UI/craft.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/UI/craftfail.ogg b/Minecraft.Client/Windows64Media/Sound/UI/craftfail.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/UI/craftfail.ogg rename to Minecraft.Client/Windows64Media/Sound/UI/craftfail.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/UI/focus.ogg b/Minecraft.Client/Windows64Media/Sound/UI/focus.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/UI/focus.ogg rename to Minecraft.Client/Windows64Media/Sound/UI/focus.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/UI/press.ogg b/Minecraft.Client/Windows64Media/Sound/UI/press.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/UI/press.ogg rename to Minecraft.Client/Windows64Media/Sound/UI/press.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/UI/scroll.ogg b/Minecraft.Client/Windows64Media/Sound/UI/scroll.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/UI/scroll.ogg rename to Minecraft.Client/Windows64Media/Sound/UI/scroll.ogg diff --git a/Minecraft.Client/Windows64Media/Sound/Minecraft/UI/scrollfocus.ogg b/Minecraft.Client/Windows64Media/Sound/UI/scrollfocus.ogg similarity index 100% rename from Minecraft.Client/Windows64Media/Sound/Minecraft/UI/scrollfocus.ogg rename to Minecraft.Client/Windows64Media/Sound/UI/scrollfocus.ogg diff --git a/Minecraft.Server/WorldManager.cpp b/Minecraft.Server/WorldManager.cpp index a18641aa..57b27f86 100644 --- a/Minecraft.Server/WorldManager.cpp +++ b/Minecraft.Server/WorldManager.cpp @@ -5,7 +5,7 @@ #include "Minecraft.h" #include "MinecraftServer.h" #include "ServerLogger.h" -#include "Common\\StringUtils.h" +#include "Common\StringUtils.h" #include #include @@ -143,13 +143,13 @@ static bool EnsureDirectoryExists(const std::wstring &directoryPath, bool *outCr static bool EnsureGameHddRootExists() { bool windows64Created = false; - if (!EnsureDirectoryExists(L"Windows64", &windows64Created)) + if (!EnsureDirectoryExists(L"Data", &windows64Created)) { return false; } bool gameHddCreated = false; - if (!EnsureDirectoryExists(L"Windows64\\GameHDD", &gameHddCreated)) + if (!EnsureDirectoryExists(L"Data/Saves", &gameHddCreated)) { return false; } diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake index 8e1e0ae5..4cf5a254 100644 --- a/cmake/Utils.cmake +++ b/cmake/Utils.cmake @@ -2,7 +2,7 @@ function(add_gamehdd_target TARGET_NAME) add_custom_target(EnsureGameHDD_${TARGET_NAME} ALL COMMAND ${CMAKE_COMMAND} - -E make_directory "$/Windows64/GameHDD" + -E make_directory "$/Data/Saves" COMMENT "Ensuring GameHDD directory exists..." VERBATIM ) diff --git a/docker/dedicated-server/entrypoint.sh b/docker/dedicated-server/entrypoint.sh index 0eece274..79498f27 100644 --- a/docker/dedicated-server/entrypoint.sh +++ b/docker/dedicated-server/entrypoint.sh @@ -104,17 +104,17 @@ fi mkdir -p "${PERSIST_DIR}" # created because it is not implemented on the server side -mkdir -p "${PERSIST_DIR}/GameHDD" +mkdir -p "${PERSIST_DIR}/Saves" ensure_persist_file "${PERSIST_DIR}/server.properties" "server.properties" "" ensure_persist_file "${PERSIST_DIR}/banned-players.json" "banned-players.json" "[]\n" ensure_persist_file "${PERSIST_DIR}/banned-ips.json" "banned-ips.json" "[]\n" # differs from the structure, but it’s reorganized into a more manageable structure to the host side -if [ -e "Windows64/GameHDD" ] && [ ! -L "Windows64/GameHDD" ]; then - rm -rf "Windows64/GameHDD" +if [ -e "Data/Saves" ] && [ ! -L "Data/Saves" ]; then + rm -rf "Data/Saves" fi -ln -sfn "${PERSIST_DIR}/GameHDD" "Windows64/GameHDD" +ln -sfn "${PERSIST_DIR}/Saves" "Data/Saves" # for compatibility with other images if command -v wine64 >/dev/null 2>&1; then