diff --git a/Engine/source/T3D/assets/assetImporter.cpp b/Engine/source/T3D/assets/assetImporter.cpp index c06803e9a..f6c3abf62 100644 --- a/Engine/source/T3D/assets/assetImporter.cpp +++ b/Engine/source/T3D/assets/assetImporter.cpp @@ -2381,11 +2381,25 @@ void AssetImporter::resolveAssetItemIssues(AssetImportObject* assetItem) } else if (activeImportConfig->DuplicateAutoResolution == String("FolderPrefix")) { - //Set trailing number String renamedAssetName = assetItem->assetName; - String owningFolder = assetItem->filePath.getDirectory(assetItem->filePath.getDirectoryCount() - 1); - renamedAssetName = owningFolder + "_" + renamedAssetName; + //Set trailing number + S32 dirIndex = assetItem->filePath.getDirectoryCount() - 1; + while (dirIndex > -1) + { + renamedAssetName = assetItem->assetName; + String owningFolder = assetItem->filePath.getDirectory(dirIndex); + + renamedAssetName = owningFolder + "_" + renamedAssetName; + + if (AssetDatabase.isDeclaredAsset(renamedAssetName)) + { + dirIndex--; + continue; + } + + break; + } //Log it's renaming dSprintf(importLogBuffer, sizeof(importLogBuffer), "Asset %s was renamed due to %s as part of the Import Configuration", assetItem->assetName.c_str(), humanReadableReason.c_str()); diff --git a/Engine/source/console/consoleFunctions.cpp b/Engine/source/console/consoleFunctions.cpp index 236b17434..88bbc14e3 100644 --- a/Engine/source/console/consoleFunctions.cpp +++ b/Engine/source/console/consoleFunctions.cpp @@ -574,6 +574,40 @@ DefineEngineFunction( stripChars, const char*, ( const char* str, const char* ch return( ret ); } +//----------------------------------------------------------------------------- +DefineEngineFunction(sanitizeString, const char*, (const char* str), , + "Sanitizes a string of common name issues, such as:\n" + "Starting with numbers, replacing spaces with _, and removing any name un-compliant characters such as .,- etc\n" + "@param str The string to sanitize.\n" + "@return A version of @a str with all occurrences of invalid characters removed.\n\n" + "@tsexample\n" + "cleanString( \"123 .-_abc\"); // Returns \"__abc\"." + "@endtsexample\n" + "@ingroup Strings") +{ + String processedString = str; + + U32 start; + U32 end; + String firstNumber = String::GetFirstNumber(processedString, start, end); + if (!firstNumber.isEmpty() && processedString.startsWith(firstNumber.c_str())) + processedString = processedString.replace(firstNumber, ""); + + processedString = processedString.replace(" ", "_"); + + U32 len = processedString.length() + 1; + char* ret = Con::getReturnBuffer(len); + dStrcpy(ret, processedString.c_str(), len); + + U32 pos = dStrcspn(ret, "-+*/%$&�=()[].?\\\"#,;!~<>|�^{}"); + while (pos < dStrlen(ret)) + { + dStrcpy(ret + pos, ret + pos + 1, len - pos); + pos = dStrcspn(ret, "-+*/%$&�=()[].?\\\"#,;!~<>|�^{}"); + } + return(ret); +} + //----------------------------------------------------------------------------- DefineEngineFunction( strlwr, const char*, ( const char* str ),, diff --git a/Engine/source/platformX86UNIX/x86UNIXFileio.cpp b/Engine/source/platformX86UNIX/x86UNIXFileio.cpp index 6cc1185c8..77419a96a 100644 --- a/Engine/source/platformX86UNIX/x86UNIXFileio.cpp +++ b/Engine/source/platformX86UNIX/x86UNIXFileio.cpp @@ -1284,7 +1284,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite) bool Platform::dumpDirectories(const char *path, Vector &directoryVector, S32 depth, bool noBasePath) { - bool retVal = recurseDumpDirectories(path, "", directoryVector, 0, depth, noBasePath); + bool retVal = recurseDumpDirectories(path, "", directoryVector, -1, depth, noBasePath); clearExcludedDirectories(); return retVal; } diff --git a/Engine/source/sfx/openal/linux/LoadOAL.linux.cpp b/Engine/source/sfx/openal/linux/LoadOAL.linux.cpp index 1ad9d5534..3b40dba51 100644 --- a/Engine/source/sfx/openal/linux/LoadOAL.linux.cpp +++ b/Engine/source/sfx/openal/linux/LoadOAL.linux.cpp @@ -40,9 +40,9 @@ ALboolean LoadOAL10Library(char *szOALFullPathName, LPOPENALFNTABLE lpOALFnTable return AL_FALSE; if (szOALFullPathName) - openal_library = dlopen(szOALFullPathName, RTLD_LAZY); + openal_library = dlopen(szOALFullPathName, RTLD_NOW); else - openal_library = dlopen("libopenal.so", RTLD_LAZY); + openal_library = dlopen("libopenal.so.1", RTLD_NOW); if (openal_library == NULL) { Con::errorf("Failed to load OpenAL shared library. Sound will not be available"); diff --git a/Engine/source/ts/loader/tsShapeLoader.cpp b/Engine/source/ts/loader/tsShapeLoader.cpp index 49567d7e9..98c1bc7e7 100644 --- a/Engine/source/ts/loader/tsShapeLoader.cpp +++ b/Engine/source/ts/loader/tsShapeLoader.cpp @@ -125,7 +125,8 @@ void TSShapeLoader::updateProgress(S32 major, const char* msg, S32 numMinor, S32 progressMsg = avar("%s (%d of %d)", msg, minor + 1, numMinor); } - Con::executef("updateTSShapeLoadProgress", Con::getFloatArg(progress), progressMsg); + if(Con::isFunction("updateTSShapeLoadProgress")) + Con::executef("updateTSShapeLoadProgress", Con::getFloatArg(progress), progressMsg); } //----------------------------------------------------------------------------- @@ -1353,4 +1354,4 @@ DefineEngineFunction( getFormatFilters, const char*, ( ),, DefineEngineFunction(isSupportedFormat, bool, (const char* extension), , "") { return TSShapeLoader::isSupportedFormat(extension); -} \ No newline at end of file +} diff --git a/Engine/source/windowManager/sdl/sdlSplashScreen.cpp b/Engine/source/windowManager/sdl/sdlSplashScreen.cpp index ffa09df8a..2b241ab82 100644 --- a/Engine/source/windowManager/sdl/sdlSplashScreen.cpp +++ b/Engine/source/windowManager/sdl/sdlSplashScreen.cpp @@ -96,6 +96,13 @@ bool Platform::displaySplashWindow( String path ) SDL_RenderCopy(gSplashRenderer, gSplashTexture, NULL, NULL); SDL_RenderPresent(gSplashRenderer); + + SDL_DestroyTexture(gSplashTexture); + gSplashTexture = nullptr; + + SDL_DestroyRenderer(gSplashRenderer); + gSplashRenderer = nullptr; + } return true; diff --git a/Templates/BaseGame/game/data/ui/UI.module b/Templates/BaseGame/game/data/UI/UI.module similarity index 100% rename from Templates/BaseGame/game/data/ui/UI.module rename to Templates/BaseGame/game/data/UI/UI.module diff --git a/Templates/BaseGame/game/data/ui/UI.tscript b/Templates/BaseGame/game/data/UI/UI.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/UI.tscript rename to Templates/BaseGame/game/data/UI/UI.tscript diff --git a/Templates/BaseGame/game/data/ui/datablocks/guiSounds.asset.taml b/Templates/BaseGame/game/data/UI/datablocks/guiSounds.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/datablocks/guiSounds.asset.taml rename to Templates/BaseGame/game/data/UI/datablocks/guiSounds.asset.taml diff --git a/Templates/BaseGame/game/data/ui/datablocks/guiSounds.tscript b/Templates/BaseGame/game/data/UI/datablocks/guiSounds.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/datablocks/guiSounds.tscript rename to Templates/BaseGame/game/data/UI/datablocks/guiSounds.tscript diff --git a/Templates/BaseGame/game/data/ui/guis/ChooseLevelDlg.asset.taml b/Templates/BaseGame/game/data/UI/guis/ChooseLevelDlg.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/ChooseLevelDlg.asset.taml rename to Templates/BaseGame/game/data/UI/guis/ChooseLevelDlg.asset.taml diff --git a/Templates/BaseGame/game/data/ui/guis/GuiMusicPlayer.asset.taml b/Templates/BaseGame/game/data/UI/guis/GuiMusicPlayer.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/GuiMusicPlayer.asset.taml rename to Templates/BaseGame/game/data/UI/guis/GuiMusicPlayer.asset.taml diff --git a/Templates/BaseGame/game/data/ui/guis/IODropdownDlg.asset.taml b/Templates/BaseGame/game/data/UI/guis/IODropdownDlg.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/IODropdownDlg.asset.taml rename to Templates/BaseGame/game/data/UI/guis/IODropdownDlg.asset.taml diff --git a/Templates/BaseGame/game/data/ui/guis/IODropdownDlg.ed.gui b/Templates/BaseGame/game/data/UI/guis/IODropdownDlg.ed.gui similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/IODropdownDlg.ed.gui rename to Templates/BaseGame/game/data/UI/guis/IODropdownDlg.ed.gui diff --git a/Templates/BaseGame/game/data/ui/guis/JoinServerMenu.asset.taml b/Templates/BaseGame/game/data/UI/guis/JoinServerMenu.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/JoinServerMenu.asset.taml rename to Templates/BaseGame/game/data/UI/guis/JoinServerMenu.asset.taml diff --git a/Templates/BaseGame/game/data/ui/guis/LoadingGui.asset.taml b/Templates/BaseGame/game/data/UI/guis/LoadingGui.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/LoadingGui.asset.taml rename to Templates/BaseGame/game/data/UI/guis/LoadingGui.asset.taml diff --git a/Templates/BaseGame/game/data/ui/guis/MainMenuGui.asset.taml b/Templates/BaseGame/game/data/UI/guis/MainMenuGui.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/MainMenuGui.asset.taml rename to Templates/BaseGame/game/data/UI/guis/MainMenuGui.asset.taml diff --git a/Templates/BaseGame/game/data/ui/guis/MessageBoxDlg.asset.taml b/Templates/BaseGame/game/data/UI/guis/MessageBoxDlg.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/MessageBoxDlg.asset.taml rename to Templates/BaseGame/game/data/UI/guis/MessageBoxDlg.asset.taml diff --git a/Templates/BaseGame/game/data/ui/guis/NetGraphProfile.asset.taml b/Templates/BaseGame/game/data/UI/guis/NetGraphProfile.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/NetGraphProfile.asset.taml rename to Templates/BaseGame/game/data/UI/guis/NetGraphProfile.asset.taml diff --git a/Templates/BaseGame/game/data/ui/guis/OptionsDlg.asset.taml b/Templates/BaseGame/game/data/UI/guis/OptionsDlg.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/OptionsDlg.asset.taml rename to Templates/BaseGame/game/data/UI/guis/OptionsDlg.asset.taml diff --git a/Templates/BaseGame/game/data/ui/guis/OptionsMenu.asset.taml b/Templates/BaseGame/game/data/UI/guis/OptionsMenu.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/OptionsMenu.asset.taml rename to Templates/BaseGame/game/data/UI/guis/OptionsMenu.asset.taml diff --git a/Templates/BaseGame/game/data/ui/guis/PauseMenu.asset.taml b/Templates/BaseGame/game/data/UI/guis/PauseMenu.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/PauseMenu.asset.taml rename to Templates/BaseGame/game/data/UI/guis/PauseMenu.asset.taml diff --git a/Templates/BaseGame/game/data/ui/guis/ProfilerGui.asset.taml b/Templates/BaseGame/game/data/UI/guis/ProfilerGui.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/ProfilerGui.asset.taml rename to Templates/BaseGame/game/data/UI/guis/ProfilerGui.asset.taml diff --git a/Templates/BaseGame/game/data/ui/guis/RecordingsDlg.gui b/Templates/BaseGame/game/data/UI/guis/RecordingsDlg.gui similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/RecordingsDlg.gui rename to Templates/BaseGame/game/data/UI/guis/RecordingsDlg.gui diff --git a/Templates/BaseGame/game/data/ui/guis/RemapConfirmDlg.asset.taml b/Templates/BaseGame/game/data/UI/guis/RemapConfirmDlg.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/RemapConfirmDlg.asset.taml rename to Templates/BaseGame/game/data/UI/guis/RemapConfirmDlg.asset.taml diff --git a/Templates/BaseGame/game/data/ui/guis/RemapDlg.asset.taml b/Templates/BaseGame/game/data/UI/guis/RemapDlg.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/RemapDlg.asset.taml rename to Templates/BaseGame/game/data/UI/guis/RemapDlg.asset.taml diff --git a/Templates/BaseGame/game/data/ui/guis/StartupGui.asset.taml b/Templates/BaseGame/game/data/UI/guis/StartupGui.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/StartupGui.asset.taml rename to Templates/BaseGame/game/data/UI/guis/StartupGui.asset.taml diff --git a/Templates/BaseGame/game/data/ui/guis/chooseLevelDlg.gui b/Templates/BaseGame/game/data/UI/guis/chooseLevelDlg.gui similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/chooseLevelDlg.gui rename to Templates/BaseGame/game/data/UI/guis/chooseLevelDlg.gui diff --git a/Templates/BaseGame/game/data/ui/guis/chooseLevelDlg.tscript b/Templates/BaseGame/game/data/UI/guis/chooseLevelDlg.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/chooseLevelDlg.tscript rename to Templates/BaseGame/game/data/UI/guis/chooseLevelDlg.tscript diff --git a/Templates/BaseGame/game/data/ui/guis/controlsMenuSetting.taml b/Templates/BaseGame/game/data/UI/guis/controlsMenuSetting.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/controlsMenuSetting.taml rename to Templates/BaseGame/game/data/UI/guis/controlsMenuSetting.taml diff --git a/Templates/BaseGame/game/data/ui/guis/guiMusicPlayer.gui b/Templates/BaseGame/game/data/UI/guis/guiMusicPlayer.gui similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/guiMusicPlayer.gui rename to Templates/BaseGame/game/data/UI/guis/guiMusicPlayer.gui diff --git a/Templates/BaseGame/game/data/ui/guis/guiMusicPlayer.tscript b/Templates/BaseGame/game/data/UI/guis/guiMusicPlayer.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/guiMusicPlayer.tscript rename to Templates/BaseGame/game/data/UI/guis/guiMusicPlayer.tscript diff --git a/Templates/BaseGame/game/data/ui/guis/joinServerMenu.gui b/Templates/BaseGame/game/data/UI/guis/joinServerMenu.gui similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/joinServerMenu.gui rename to Templates/BaseGame/game/data/UI/guis/joinServerMenu.gui diff --git a/Templates/BaseGame/game/data/ui/guis/joinServerMenu.tscript b/Templates/BaseGame/game/data/UI/guis/joinServerMenu.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/joinServerMenu.tscript rename to Templates/BaseGame/game/data/UI/guis/joinServerMenu.tscript diff --git a/Templates/BaseGame/game/data/ui/guis/loadingGui.gui b/Templates/BaseGame/game/data/UI/guis/loadingGui.gui similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/loadingGui.gui rename to Templates/BaseGame/game/data/UI/guis/loadingGui.gui diff --git a/Templates/BaseGame/game/data/ui/guis/mainMenu.gui b/Templates/BaseGame/game/data/UI/guis/mainMenu.gui similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/mainMenu.gui rename to Templates/BaseGame/game/data/UI/guis/mainMenu.gui diff --git a/Templates/BaseGame/game/data/ui/guis/mainMenu.tscript b/Templates/BaseGame/game/data/UI/guis/mainMenu.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/mainMenu.tscript rename to Templates/BaseGame/game/data/UI/guis/mainMenu.tscript diff --git a/Templates/BaseGame/game/data/ui/guis/messageBoxDlg.gui b/Templates/BaseGame/game/data/UI/guis/messageBoxDlg.gui similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/messageBoxDlg.gui rename to Templates/BaseGame/game/data/UI/guis/messageBoxDlg.gui diff --git a/Templates/BaseGame/game/data/ui/guis/netGraphGui.gui b/Templates/BaseGame/game/data/UI/guis/netGraphGui.gui similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/netGraphGui.gui rename to Templates/BaseGame/game/data/UI/guis/netGraphGui.gui diff --git a/Templates/BaseGame/game/data/ui/guis/optionsDlg.gui b/Templates/BaseGame/game/data/UI/guis/optionsDlg.gui similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/optionsDlg.gui rename to Templates/BaseGame/game/data/UI/guis/optionsDlg.gui diff --git a/Templates/BaseGame/game/data/ui/guis/optionsMenu.gui b/Templates/BaseGame/game/data/UI/guis/optionsMenu.gui similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/optionsMenu.gui rename to Templates/BaseGame/game/data/UI/guis/optionsMenu.gui diff --git a/Templates/BaseGame/game/data/ui/guis/optionsMenu.tscript b/Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/optionsMenu.tscript rename to Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript diff --git a/Templates/BaseGame/game/data/ui/guis/pauseMenu.gui b/Templates/BaseGame/game/data/UI/guis/pauseMenu.gui similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/pauseMenu.gui rename to Templates/BaseGame/game/data/UI/guis/pauseMenu.gui diff --git a/Templates/BaseGame/game/data/ui/guis/pauseMenu.tscript b/Templates/BaseGame/game/data/UI/guis/pauseMenu.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/pauseMenu.tscript rename to Templates/BaseGame/game/data/UI/guis/pauseMenu.tscript diff --git a/Templates/BaseGame/game/data/ui/guis/profiler.gui b/Templates/BaseGame/game/data/UI/guis/profiler.gui similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/profiler.gui rename to Templates/BaseGame/game/data/UI/guis/profiler.gui diff --git a/Templates/BaseGame/game/data/ui/guis/profiler.tscript b/Templates/BaseGame/game/data/UI/guis/profiler.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/profiler.tscript rename to Templates/BaseGame/game/data/UI/guis/profiler.tscript diff --git a/Templates/BaseGame/game/data/ui/guis/recordingsDlg.asset.taml b/Templates/BaseGame/game/data/UI/guis/recordingsDlg.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/recordingsDlg.asset.taml rename to Templates/BaseGame/game/data/UI/guis/recordingsDlg.asset.taml diff --git a/Templates/BaseGame/game/data/ui/guis/remapConfirmDlg.gui b/Templates/BaseGame/game/data/UI/guis/remapConfirmDlg.gui similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/remapConfirmDlg.gui rename to Templates/BaseGame/game/data/UI/guis/remapConfirmDlg.gui diff --git a/Templates/BaseGame/game/data/ui/guis/remapDlg.gui b/Templates/BaseGame/game/data/UI/guis/remapDlg.gui similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/remapDlg.gui rename to Templates/BaseGame/game/data/UI/guis/remapDlg.gui diff --git a/Templates/BaseGame/game/data/ui/guis/startupGui.gui b/Templates/BaseGame/game/data/UI/guis/startupGui.gui similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/startupGui.gui rename to Templates/BaseGame/game/data/UI/guis/startupGui.gui diff --git a/Templates/BaseGame/game/data/ui/guis/startupGui.tscript b/Templates/BaseGame/game/data/UI/guis/startupGui.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/guis/startupGui.tscript rename to Templates/BaseGame/game/data/UI/guis/startupGui.tscript diff --git a/Templates/BaseGame/game/data/ui/images/BackgroundImage.png b/Templates/BaseGame/game/data/UI/images/BackgroundImage.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/BackgroundImage.png rename to Templates/BaseGame/game/data/UI/images/BackgroundImage.png diff --git a/Templates/BaseGame/game/data/ui/images/BackgroundImage_image.asset.taml b/Templates/BaseGame/game/data/UI/images/BackgroundImage_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/BackgroundImage_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/BackgroundImage_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Controller_Disconnected.png b/Templates/BaseGame/game/data/UI/images/Inputs/Controller_Disconnected.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Controller_Disconnected.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Controller_Disconnected.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Controller_Disconnected_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Controller_Disconnected_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Controller_Disconnected_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Controller_Disconnected_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_0.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_0.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_0.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_0.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_0_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_0_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_0_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_0_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_1.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_1.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_1.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_1.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_10.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_10.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_10.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_10.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_10_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_10_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_10_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_10_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_11.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_11.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_11.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_11.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_11_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_11_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_11_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_11_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_12.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_12.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_12.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_12.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_12_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_12_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_12_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_12_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_1_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_1_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_1_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_1_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_2.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_2.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_2.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_2.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_2_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_2_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_2_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_2_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_3.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_3.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_3.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_3.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_3_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_3_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_3_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_3_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_4.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_4.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_4.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_4.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_4_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_4_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_4_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_4_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_5.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_5.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_5.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_5.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_5_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_5_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_5_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_5_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_6.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_6.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_6.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_6.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_6_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_6_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_6_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_6_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_7.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_7.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_7.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_7.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_7_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_7_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_7_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_7_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_8.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_8.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_8.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_8.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_8_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_8_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_8_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_8_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_9.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_9.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_9.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_9.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_9_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_9_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_9_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_9_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_A.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_A.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_A.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_A.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_A_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_A_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_A_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_A_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Alt.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Alt.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Alt.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Alt.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Alt_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Alt_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Alt_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Alt_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Down.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Down.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Down.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Down.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Down_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Down_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Down_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Down_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Left.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Left.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Left.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Left.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Left_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Left_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Left_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Left_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Right.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Right.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Right.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Right.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Right_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Right_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Right_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Right_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Up.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Up.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Up.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Up.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Up_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Up_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Up_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Arrow_Up_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Asterisk.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Asterisk.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Asterisk.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Asterisk.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Asterisk_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Asterisk_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Asterisk_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Asterisk_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_B.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_B.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_B.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_B.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_B_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_B_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_B_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_B_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Backspace.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Backspace.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Backspace.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Backspace.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Backspace_Alt.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Backspace_Alt.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Backspace_Alt.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Backspace_Alt.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Backspace_Alt_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Backspace_Alt_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Backspace_Alt_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Backspace_Alt_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Backspace_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Backspace_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Backspace_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Backspace_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Blank.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Blank.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Blank.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Blank.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Blank_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Blank_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Blank_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Blank_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Bracket_Left.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Bracket_Left.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Bracket_Left.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Bracket_Left.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Bracket_Left_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Bracket_Left_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Bracket_Left_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Bracket_Left_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Bracket_Right.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Bracket_Right.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Bracket_Right.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Bracket_Right.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Bracket_Right_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Bracket_Right_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Bracket_Right_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Bracket_Right_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_C.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_C.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_C.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_C.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_C_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_C_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_C_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_C_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Caps_Lock.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Caps_Lock.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Caps_Lock.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Caps_Lock.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Caps_Lock_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Caps_Lock_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Caps_Lock_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Caps_Lock_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Command.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Command.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Command.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Command.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Command_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Command_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Command_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Command_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Ctrl.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Ctrl.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Ctrl.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Ctrl.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Ctrl_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Ctrl_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Ctrl_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Ctrl_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_D.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_D.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_D.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_D.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_D_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_D_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_D_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_D_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Del.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Del.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Del.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Del.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Del_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Del_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Del_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Del_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_E.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_E.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_E.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_E.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_E_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_E_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_E_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_E_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_End.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_End.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_End.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_End.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_End_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_End_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_End_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_End_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Escape.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Escape.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Escape.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Escape.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Escape_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Escape_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Escape_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Escape_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F1.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F1.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F1.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F1.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F10.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F10.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F10.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F10.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F10_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F10_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F10_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F10_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F11.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F11.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F11.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F11.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F11_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F11_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F11_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F11_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F12.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F12.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F12.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F12.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F12_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F12_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F12_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F12_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F1_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F1_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F1_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F1_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F2.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F2.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F2.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F2.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F2_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F2_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F2_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F2_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F3.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F3.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F3.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F3.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F3_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F3_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F3_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F3_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F4.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F4.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F4.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F4.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F4_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F4_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F4_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F4_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F5.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F5.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F5.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F5.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F5_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F5_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F5_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F5_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F6.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F6.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F6.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F6.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F6_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F6_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F6_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F6_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F7.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F7.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F7.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F7.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F7_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F7_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F7_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F7_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F8.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F8.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F8.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F8.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F8_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F8_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F8_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F8_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F9.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F9.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F9.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F9.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F9_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F9_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F9_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F9_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_F_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_F_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_G.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_G.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_G.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_G.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_G_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_G_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_G_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_G_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_H.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_H.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_H.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_H.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_H_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_H_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_H_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_H_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Home.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Home.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Home.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Home.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Home_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Home_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Home_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Home_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_I.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_I.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_I.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_I.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_I_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_I_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_I_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_I_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Insert.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Insert.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Insert.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Insert.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Insert_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Insert_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Insert_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Insert_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_J.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_J.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_J.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_J.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_J_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_J_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_J_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_J_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_K.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_K.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_K.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_K.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_K_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_K_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_K_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_K_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_L.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_L.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_L.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_L.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_L_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_L_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_L_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_L_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_M.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_M.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_M.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_M.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_M_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_M_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_M_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_M_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mark_Left.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mark_Left.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mark_Left.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mark_Left.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mark_Left_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mark_Left_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mark_Left_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mark_Left_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mark_Right.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mark_Right.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mark_Right.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mark_Right.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mark_Right_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mark_Right_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mark_Right_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mark_Right_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Minus.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Minus.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Minus.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Minus.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Minus_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Minus_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Minus_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Minus_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse1.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse1.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse1.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse1.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse1_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse1_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse1_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse1_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse2.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse2.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse2.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse2.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse2_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse2_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse2_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse2_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse3.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse3.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse3.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse3.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse3_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse3_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse3_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse3_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse_Simple.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse_Simple.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse_Simple.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse_Simple.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse_Simple_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse_Simple_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse_Simple_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse_Simple_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_N.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_N.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_N.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_N.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_N_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_N_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_N_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_N_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Num_Lock.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Num_Lock.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Num_Lock.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Num_Lock.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Num_Lock_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Num_Lock_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Num_Lock_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Num_Lock_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_O.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_O.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_O.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_O.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_O_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_O_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_O_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_O_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_P.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_P.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_P.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_P.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_P_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_P_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_P_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_P_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Page_Down.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Page_Down.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Page_Down.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Page_Down.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Page_Down_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Page_Down_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Page_Down_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Page_Down_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Page_Up.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Page_Up.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Page_Up.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Page_Up.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Page_Up_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Page_Up_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Page_Up_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Page_Up_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Plus.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Plus.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Plus.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Plus.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Plus_Tall.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Plus_Tall.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Plus_Tall.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Plus_Tall.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Plus_Tall_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Plus_Tall_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Plus_Tall_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Plus_Tall_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Plus_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Plus_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Plus_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Plus_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Print_Screen.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Print_Screen.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Print_Screen.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Print_Screen.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Print_Screen_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Print_Screen_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Print_Screen_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Print_Screen_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Q.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Q.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Q.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Q.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Q_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Q_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Q_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Q_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Question.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Question.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Question.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Question.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Question_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Question_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Question_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Question_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Quote.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Quote.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Quote.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Quote.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Quote_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Quote_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Quote_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Quote_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_R.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_R.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_R.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_R.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_R_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_R_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_R_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_R_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return_Alt.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return_Alt.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return_Alt.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return_Alt.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return_Alt_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return_Alt_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return_Alt_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return_Alt_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return_Tall.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return_Tall.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return_Tall.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return_Tall.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return_Tall_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return_Tall_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return_Tall_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return_Tall_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Return_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_S.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_S.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_S.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_S.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_S_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_S_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_S_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_S_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Semicolon.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Semicolon.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Semicolon.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Semicolon.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Semicolon_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Semicolon_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Semicolon_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Semicolon_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Shift.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Shift.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Shift.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Shift.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Shift_Alt.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Shift_Alt.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Shift_Alt.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Shift_Alt.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Shift_Alt_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Shift_Alt_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Shift_Alt_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Shift_Alt_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Shift_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Shift_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Shift_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Shift_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Slash.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Slash.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Slash.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Slash.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Slash_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Slash_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Slash_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Slash_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Space.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Space.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Space.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Space.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Space_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Space_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Space_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Space_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_T.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_T.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_T.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_T.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_T_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_T_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_T_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_T_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Tab.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Tab.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Tab.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Tab.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Tab_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Tab_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Tab_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Tab_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Tilda.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Tilda.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Tilda.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Tilda.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Tilda_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Tilda_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Tilda_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Tilda_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_U.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_U.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_U.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_U.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_U_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_U_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_U_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_U_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_V.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_V.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_V.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_V.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_V_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_V_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_V_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_V_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_W.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_W.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_W.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_W.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_W_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_W_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_W_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_W_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Win.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Win.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Win.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Win.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Win_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Win_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Win_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Win_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_X.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_X.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_X.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_X.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_X_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_X_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_X_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_X_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Y.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Y.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Y.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Y.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Y_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Y_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Y_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Y_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Z.png b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Z.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Z.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Z.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Z_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Z_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Z_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Keyboard & Mouse/Keyboard_Black_Z_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Circle.png b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Circle.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Circle.png rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Circle.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Circle_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Circle_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Circle_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Circle_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Cross.png b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Cross.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Cross.png rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Cross.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Cross_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Cross_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Cross_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Cross_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Dpad.png b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Dpad.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Dpad.png rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Dpad.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Dpad_Down.png b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Dpad_Down.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Dpad_Down.png rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Dpad_Down.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Dpad_Down_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Dpad_Down_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Dpad_Down_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Dpad_Down_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Dpad_Left.png b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Dpad_Left.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Dpad_Left.png rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Dpad_Left.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Dpad_Left_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Dpad_Left_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Dpad_Left_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Dpad_Left_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Dpad_Right.png b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Dpad_Right.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Dpad_Right.png rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Dpad_Right.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Dpad_Right_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Dpad_Right_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Dpad_Right_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Dpad_Right_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Dpad_Up.png b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Dpad_Up.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Dpad_Up.png rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Dpad_Up.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Dpad_Up_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Dpad_Up_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Dpad_Up_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Dpad_Up_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Dpad_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Dpad_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Dpad_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Dpad_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_L1.png b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_L1.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_L1.png rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_L1.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_L1_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_L1_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_L1_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_L1_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_L2.png b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_L2.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_L2.png rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_L2.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_L2_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_L2_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_L2_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_L2_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Left_Stick.png b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Left_Stick.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Left_Stick.png rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Left_Stick.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Left_Stick_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Left_Stick_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Left_Stick_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Left_Stick_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Options.png b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Options.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Options.png rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Options.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Options_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Options_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Options_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Options_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_R1.png b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_R1.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_R1.png rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_R1.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_R1_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_R1_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_R1_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_R1_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_R2.png b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_R2.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_R2.png rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_R2.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_R2_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_R2_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_R2_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_R2_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Right_Stick.png b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Right_Stick.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Right_Stick.png rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Right_Stick.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Right_Stick_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Right_Stick_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Right_Stick_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Right_Stick_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Share.png b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Share.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Share.png rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Share.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Share_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Share_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Share_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Share_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Square.png b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Square.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Square.png rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Square.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Square_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Square_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Square_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Square_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Touch_Pad.png b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Touch_Pad.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Touch_Pad.png rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Touch_Pad.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Touch_Pad_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Touch_Pad_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Touch_Pad_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Touch_Pad_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Triangle.png b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Triangle.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Triangle.png rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Triangle.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Triangle_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Triangle_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/PS4/PS4_Triangle_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/PS4/PS4_Triangle_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_A.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_A.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_A.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_A.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_A_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_A_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_A_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_A_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_B.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_B.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_B.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_B.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_B_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_B_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_B_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_B_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Controller_Left.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Controller_Left.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Controller_Left.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Controller_Left.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Controller_Left_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Controller_Left_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Controller_Left_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Controller_Left_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Controller_Right.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Controller_Right.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Controller_Right.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Controller_Right.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Controller_Right_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Controller_Right_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Controller_Right_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Controller_Right_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Controllers.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Controllers.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Controllers.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Controllers.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Controllers_Separate.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Controllers_Separate.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Controllers_Separate.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Controllers_Separate.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Controllers_Separate_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Controllers_Separate_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Controllers_Separate_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Controllers_Separate_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Controllers_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Controllers_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Controllers_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Controllers_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Down.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Down.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Down.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Down.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Down_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Down_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Down_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Down_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Dpad.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Dpad.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Dpad.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Dpad.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Dpad_Down.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Dpad_Down.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Dpad_Down.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Dpad_Down.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Dpad_Down_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Dpad_Down_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Dpad_Down_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Dpad_Down_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Dpad_Left.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Dpad_Left.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Dpad_Left.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Dpad_Left.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Dpad_Left_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Dpad_Left_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Dpad_Left_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Dpad_Left_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Dpad_Right.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Dpad_Right.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Dpad_Right.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Dpad_Right.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Dpad_Right_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Dpad_Right_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Dpad_Right_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Dpad_Right_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Dpad_Up.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Dpad_Up.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Dpad_Up.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Dpad_Up.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Dpad_Up_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Dpad_Up_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Dpad_Up_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Dpad_Up_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Dpad_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Dpad_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Dpad_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Dpad_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Home.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Home.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Home.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Home.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Home_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Home_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Home_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Home_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_LB.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_LB.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_LB.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_LB.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_LB_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_LB_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_LB_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_LB_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_LT.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_LT.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_LT.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_LT.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_LT_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_LT_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_LT_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_LT_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Left.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Left.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Left.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Left.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Left_Stick.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Left_Stick.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Left_Stick.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Left_Stick.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Left_Stick_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Left_Stick_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Left_Stick_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Left_Stick_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Left_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Left_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Left_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Left_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Minus.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Minus.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Minus.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Minus.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Minus_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Minus_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Minus_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Minus_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Plus.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Plus.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Plus.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Plus.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Plus_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Plus_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Plus_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Plus_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_RB.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_RB.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_RB.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_RB.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_RB_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_RB_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_RB_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_RB_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_RT.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_RT.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_RT.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_RT.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_RT_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_RT_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_RT_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_RT_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Right.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Right.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Right.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Right.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Right_Stick.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Right_Stick.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Right_Stick.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Right_Stick.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Right_Stick_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Right_Stick_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Right_Stick_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Right_Stick_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Right_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Right_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Right_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Right_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Square.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Square.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Square.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Square.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Square_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Square_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Square_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Square_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Up.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Up.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Up.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Up.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Up_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Up_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Up_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Up_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_X.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_X.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_X.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_X.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_X_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_X_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_X_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_X_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Y.png b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Y.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Y.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Y.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Y_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Y_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Switch/Switch_Y_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Switch/Switch_Y_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_A.png b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_A.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_A.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_A.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_A_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_A_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_A_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_A_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_B.png b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_B.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_B.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_B.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_B_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_B_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_B_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_B_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Dpad.png b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Dpad.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Dpad.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Dpad.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Dpad_Down.png b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Dpad_Down.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Dpad_Down.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Dpad_Down.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Dpad_Down_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Dpad_Down_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Dpad_Down_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Dpad_Down_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Dpad_Left.png b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Dpad_Left.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Dpad_Left.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Dpad_Left.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Dpad_Left_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Dpad_Left_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Dpad_Left_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Dpad_Left_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Dpad_Right.png b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Dpad_Right.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Dpad_Right.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Dpad_Right.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Dpad_Right_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Dpad_Right_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Dpad_Right_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Dpad_Right_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Dpad_Up.png b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Dpad_Up.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Dpad_Up.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Dpad_Up.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Dpad_Up_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Dpad_Up_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Dpad_Up_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Dpad_Up_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Dpad_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Dpad_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Dpad_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Dpad_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_LB.png b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_LB.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_LB.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_LB.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_LB_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_LB_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_LB_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_LB_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_LT.png b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_LT.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_LT.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_LT.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_LT_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_LT_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_LT_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_LT_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Left_Stick.png b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Left_Stick.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Left_Stick.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Left_Stick.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Left_Stick_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Left_Stick_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Left_Stick_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Left_Stick_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Menu.png b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Menu.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Menu.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Menu.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Menu_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Menu_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Menu_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Menu_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_RB.png b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_RB.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_RB.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_RB.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_RB_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_RB_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_RB_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_RB_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_RT.png b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_RT.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_RT.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_RT.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_RT_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_RT_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_RT_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_RT_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Right_Stick.png b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Right_Stick.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Right_Stick.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Right_Stick.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Right_Stick_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Right_Stick_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Right_Stick_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Right_Stick_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Windows.png b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Windows.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Windows.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Windows.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Windows_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Windows_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Windows_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Windows_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_X.png b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_X.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_X.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_X.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_X_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_X_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_X_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_X_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Y.png b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Y.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Y.png rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Y.png diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Y_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Y_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Inputs/Xbox/Xbox_Y_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Inputs/Xbox/Xbox_Y_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/ScreenBrightness_Dark.png b/Templates/BaseGame/game/data/UI/images/ScreenBrightness_Dark.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/ScreenBrightness_Dark.png rename to Templates/BaseGame/game/data/UI/images/ScreenBrightness_Dark.png diff --git a/Templates/BaseGame/game/data/ui/images/ScreenBrightness_Dark_image.asset.taml b/Templates/BaseGame/game/data/UI/images/ScreenBrightness_Dark_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/ScreenBrightness_Dark_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/ScreenBrightness_Dark_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/ScreenBrightness_Light.png b/Templates/BaseGame/game/data/UI/images/ScreenBrightness_Light.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/ScreenBrightness_Light.png rename to Templates/BaseGame/game/data/UI/images/ScreenBrightness_Light.png diff --git a/Templates/BaseGame/game/data/ui/images/ScreenBrightness_Light_image.asset.taml b/Templates/BaseGame/game/data/UI/images/ScreenBrightness_Light_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/ScreenBrightness_Light_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/ScreenBrightness_Light_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Torque-3D-logo-shortcut.png b/Templates/BaseGame/game/data/UI/images/Torque-3D-logo-shortcut.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Torque-3D-logo-shortcut.png rename to Templates/BaseGame/game/data/UI/images/Torque-3D-logo-shortcut.png diff --git a/Templates/BaseGame/game/data/ui/images/Torque-3D-logo-w.png b/Templates/BaseGame/game/data/UI/images/Torque-3D-logo-w.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Torque-3D-logo-w.png rename to Templates/BaseGame/game/data/UI/images/Torque-3D-logo-w.png diff --git a/Templates/BaseGame/game/data/ui/images/Torque-3D-logo.png b/Templates/BaseGame/game/data/UI/images/Torque-3D-logo.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Torque-3D-logo.png rename to Templates/BaseGame/game/data/UI/images/Torque-3D-logo.png diff --git a/Templates/BaseGame/game/data/ui/images/Torque-3D-logo_alt.png b/Templates/BaseGame/game/data/UI/images/Torque-3D-logo_alt.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Torque-3D-logo_alt.png rename to Templates/BaseGame/game/data/UI/images/Torque-3D-logo_alt.png diff --git a/Templates/BaseGame/game/data/ui/images/Torque_3D_logo_alt_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Torque_3D_logo_alt_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Torque_3D_logo_alt_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Torque_3D_logo_alt_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Torque_3D_logo_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Torque_3D_logo_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Torque_3D_logo_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Torque_3D_logo_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Torque_3D_logo_shortcut_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Torque_3D_logo_shortcut_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Torque_3D_logo_shortcut_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Torque_3D_logo_shortcut_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/Torque_3D_logo_w_image.asset.taml b/Templates/BaseGame/game/data/UI/images/Torque_3D_logo_w_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/Torque_3D_logo_w_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/Torque_3D_logo_w_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/background-dark.png b/Templates/BaseGame/game/data/UI/images/background-dark.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/background-dark.png rename to Templates/BaseGame/game/data/UI/images/background-dark.png diff --git a/Templates/BaseGame/game/data/ui/images/background.png b/Templates/BaseGame/game/data/UI/images/background.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/background.png rename to Templates/BaseGame/game/data/UI/images/background.png diff --git a/Templates/BaseGame/game/data/ui/images/background_dark_image.asset.taml b/Templates/BaseGame/game/data/UI/images/background_dark_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/background_dark_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/background_dark_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/background_image.asset.taml b/Templates/BaseGame/game/data/UI/images/background_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/background_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/background_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/buttontab.png b/Templates/BaseGame/game/data/UI/images/buttontab.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/buttontab.png rename to Templates/BaseGame/game/data/UI/images/buttontab.png diff --git a/Templates/BaseGame/game/data/ui/images/buttontab_image.asset.taml b/Templates/BaseGame/game/data/UI/images/buttontab_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/buttontab_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/buttontab_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/chatHudBorderArray.png b/Templates/BaseGame/game/data/UI/images/chatHudBorderArray.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/chatHudBorderArray.png rename to Templates/BaseGame/game/data/UI/images/chatHudBorderArray.png diff --git a/Templates/BaseGame/game/data/ui/images/chatHudBorderArray_image.asset.taml b/Templates/BaseGame/game/data/UI/images/chatHudBorderArray_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/chatHudBorderArray_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/chatHudBorderArray_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/checkbox.png b/Templates/BaseGame/game/data/UI/images/checkbox.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/checkbox.png rename to Templates/BaseGame/game/data/UI/images/checkbox.png diff --git a/Templates/BaseGame/game/data/ui/images/checkbox_image.asset.taml b/Templates/BaseGame/game/data/UI/images/checkbox_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/checkbox_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/checkbox_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/clear-btn_d.png b/Templates/BaseGame/game/data/UI/images/clear-btn_d.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/clear-btn_d.png rename to Templates/BaseGame/game/data/UI/images/clear-btn_d.png diff --git a/Templates/BaseGame/game/data/ui/images/clear-btn_h.png b/Templates/BaseGame/game/data/UI/images/clear-btn_h.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/clear-btn_h.png rename to Templates/BaseGame/game/data/UI/images/clear-btn_h.png diff --git a/Templates/BaseGame/game/data/ui/images/clear-btn_n.png b/Templates/BaseGame/game/data/UI/images/clear-btn_n.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/clear-btn_n.png rename to Templates/BaseGame/game/data/UI/images/clear-btn_n.png diff --git a/Templates/BaseGame/game/data/ui/images/clear_btn_d_image.asset.taml b/Templates/BaseGame/game/data/UI/images/clear_btn_d_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/clear_btn_d_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/clear_btn_d_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/clear_btn_h_image.asset.taml b/Templates/BaseGame/game/data/UI/images/clear_btn_h_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/clear_btn_h_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/clear_btn_h_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/clear_btn_n_image.asset.taml b/Templates/BaseGame/game/data/UI/images/clear_btn_n_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/clear_btn_n_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/clear_btn_n_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/collapse-toolbar_d.png b/Templates/BaseGame/game/data/UI/images/collapse-toolbar_d.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/collapse-toolbar_d.png rename to Templates/BaseGame/game/data/UI/images/collapse-toolbar_d.png diff --git a/Templates/BaseGame/game/data/ui/images/collapse-toolbar_h.png b/Templates/BaseGame/game/data/UI/images/collapse-toolbar_h.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/collapse-toolbar_h.png rename to Templates/BaseGame/game/data/UI/images/collapse-toolbar_h.png diff --git a/Templates/BaseGame/game/data/ui/images/collapse-toolbar_n.png b/Templates/BaseGame/game/data/UI/images/collapse-toolbar_n.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/collapse-toolbar_n.png rename to Templates/BaseGame/game/data/UI/images/collapse-toolbar_n.png diff --git a/Templates/BaseGame/game/data/ui/images/collapse_toolbar_d_image.asset.taml b/Templates/BaseGame/game/data/UI/images/collapse_toolbar_d_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/collapse_toolbar_d_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/collapse_toolbar_d_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/collapse_toolbar_h_image.asset.taml b/Templates/BaseGame/game/data/UI/images/collapse_toolbar_h_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/collapse_toolbar_h_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/collapse_toolbar_h_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/collapse_toolbar_n_image.asset.taml b/Templates/BaseGame/game/data/UI/images/collapse_toolbar_n_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/collapse_toolbar_n_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/collapse_toolbar_n_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/defaultCursor.png b/Templates/BaseGame/game/data/UI/images/defaultCursor.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/defaultCursor.png rename to Templates/BaseGame/game/data/UI/images/defaultCursor.png diff --git a/Templates/BaseGame/game/data/ui/images/defaultCursor_image.asset.taml b/Templates/BaseGame/game/data/UI/images/defaultCursor_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/defaultCursor_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/defaultCursor_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/dropDown.png b/Templates/BaseGame/game/data/UI/images/dropDown.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/dropDown.png rename to Templates/BaseGame/game/data/UI/images/dropDown.png diff --git a/Templates/BaseGame/game/data/ui/images/dropDown_image.asset.taml b/Templates/BaseGame/game/data/UI/images/dropDown_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/dropDown_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/dropDown_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/dropdown-button-arrow.png b/Templates/BaseGame/game/data/UI/images/dropdown-button-arrow.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/dropdown-button-arrow.png rename to Templates/BaseGame/game/data/UI/images/dropdown-button-arrow.png diff --git a/Templates/BaseGame/game/data/ui/images/dropdown-textEdit.png b/Templates/BaseGame/game/data/UI/images/dropdown-textEdit.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/dropdown-textEdit.png rename to Templates/BaseGame/game/data/UI/images/dropdown-textEdit.png diff --git a/Templates/BaseGame/game/data/ui/images/dropdown_button_arrow_image.asset.taml b/Templates/BaseGame/game/data/UI/images/dropdown_button_arrow_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/dropdown_button_arrow_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/dropdown_button_arrow_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/dropdown_textEdit_image.asset.taml b/Templates/BaseGame/game/data/UI/images/dropdown_textEdit_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/dropdown_textEdit_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/dropdown_textEdit_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/dropslider_d.png b/Templates/BaseGame/game/data/UI/images/dropslider_d.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/dropslider_d.png rename to Templates/BaseGame/game/data/UI/images/dropslider_d.png diff --git a/Templates/BaseGame/game/data/ui/images/dropslider_d_image.asset.taml b/Templates/BaseGame/game/data/UI/images/dropslider_d_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/dropslider_d_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/dropslider_d_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/dropslider_h.png b/Templates/BaseGame/game/data/UI/images/dropslider_h.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/dropslider_h.png rename to Templates/BaseGame/game/data/UI/images/dropslider_h.png diff --git a/Templates/BaseGame/game/data/ui/images/dropslider_h_image.asset.taml b/Templates/BaseGame/game/data/UI/images/dropslider_h_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/dropslider_h_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/dropslider_h_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/dropslider_n.png b/Templates/BaseGame/game/data/UI/images/dropslider_n.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/dropslider_n.png rename to Templates/BaseGame/game/data/UI/images/dropslider_n.png diff --git a/Templates/BaseGame/game/data/ui/images/dropslider_n_image.asset.taml b/Templates/BaseGame/game/data/UI/images/dropslider_n_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/dropslider_n_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/dropslider_n_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/expand-toolbar_d.png b/Templates/BaseGame/game/data/UI/images/expand-toolbar_d.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/expand-toolbar_d.png rename to Templates/BaseGame/game/data/UI/images/expand-toolbar_d.png diff --git a/Templates/BaseGame/game/data/ui/images/expand-toolbar_h.png b/Templates/BaseGame/game/data/UI/images/expand-toolbar_h.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/expand-toolbar_h.png rename to Templates/BaseGame/game/data/UI/images/expand-toolbar_h.png diff --git a/Templates/BaseGame/game/data/ui/images/expand-toolbar_n.png b/Templates/BaseGame/game/data/UI/images/expand-toolbar_n.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/expand-toolbar_n.png rename to Templates/BaseGame/game/data/UI/images/expand-toolbar_n.png diff --git a/Templates/BaseGame/game/data/ui/images/expand_toolbar_d_image.asset.taml b/Templates/BaseGame/game/data/UI/images/expand_toolbar_d_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/expand_toolbar_d_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/expand_toolbar_d_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/expand_toolbar_h_image.asset.taml b/Templates/BaseGame/game/data/UI/images/expand_toolbar_h_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/expand_toolbar_h_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/expand_toolbar_h_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/expand_toolbar_n_image.asset.taml b/Templates/BaseGame/game/data/UI/images/expand_toolbar_n_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/expand_toolbar_n_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/expand_toolbar_n_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/folder.png b/Templates/BaseGame/game/data/UI/images/folder.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/folder.png rename to Templates/BaseGame/game/data/UI/images/folder.png diff --git a/Templates/BaseGame/game/data/ui/images/folder_image.asset.taml b/Templates/BaseGame/game/data/UI/images/folder_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/folder_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/folder_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/group-border.png b/Templates/BaseGame/game/data/UI/images/group-border.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/group-border.png rename to Templates/BaseGame/game/data/UI/images/group-border.png diff --git a/Templates/BaseGame/game/data/ui/images/group_border_image.asset.taml b/Templates/BaseGame/game/data/UI/images/group_border_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/group_border_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/group_border_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/hudfill.png b/Templates/BaseGame/game/data/UI/images/hudfill.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/hudfill.png rename to Templates/BaseGame/game/data/UI/images/hudfill.png diff --git a/Templates/BaseGame/game/data/ui/images/hudfill_image.asset.taml b/Templates/BaseGame/game/data/UI/images/hudfill_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/hudfill_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/hudfill_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/inactive-overlay.png b/Templates/BaseGame/game/data/UI/images/inactive-overlay.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/inactive-overlay.png rename to Templates/BaseGame/game/data/UI/images/inactive-overlay.png diff --git a/Templates/BaseGame/game/data/ui/images/inactive_overlay_image.asset.taml b/Templates/BaseGame/game/data/UI/images/inactive_overlay_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/inactive_overlay_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/inactive_overlay_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/lagIcon.png b/Templates/BaseGame/game/data/UI/images/lagIcon.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/lagIcon.png rename to Templates/BaseGame/game/data/UI/images/lagIcon.png diff --git a/Templates/BaseGame/game/data/ui/images/lagIcon_image.asset.taml b/Templates/BaseGame/game/data/UI/images/lagIcon_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/lagIcon_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/lagIcon_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/listMenuArray.png b/Templates/BaseGame/game/data/UI/images/listMenuArray.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/listMenuArray.png rename to Templates/BaseGame/game/data/UI/images/listMenuArray.png diff --git a/Templates/BaseGame/game/data/ui/images/listMenuArray_image.asset.taml b/Templates/BaseGame/game/data/UI/images/listMenuArray_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/listMenuArray_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/listMenuArray_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/loadingbar.png b/Templates/BaseGame/game/data/UI/images/loadingbar.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/loadingbar.png rename to Templates/BaseGame/game/data/UI/images/loadingbar.png diff --git a/Templates/BaseGame/game/data/ui/images/loadingbar_image.asset.taml b/Templates/BaseGame/game/data/UI/images/loadingbar_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/loadingbar_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/loadingbar_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/macCursor.png b/Templates/BaseGame/game/data/UI/images/macCursor.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/macCursor.png rename to Templates/BaseGame/game/data/UI/images/macCursor.png diff --git a/Templates/BaseGame/game/data/ui/images/macCursor_image.asset.taml b/Templates/BaseGame/game/data/UI/images/macCursor_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/macCursor_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/macCursor_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/menu-button.png b/Templates/BaseGame/game/data/UI/images/menu-button.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/menu-button.png rename to Templates/BaseGame/game/data/UI/images/menu-button.png diff --git a/Templates/BaseGame/game/data/ui/images/menu.png b/Templates/BaseGame/game/data/UI/images/menu.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/menu.png rename to Templates/BaseGame/game/data/UI/images/menu.png diff --git a/Templates/BaseGame/game/data/ui/images/menuSlider.png b/Templates/BaseGame/game/data/UI/images/menuSlider.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/menuSlider.png rename to Templates/BaseGame/game/data/UI/images/menuSlider.png diff --git a/Templates/BaseGame/game/data/ui/images/menuSlider_image.asset.taml b/Templates/BaseGame/game/data/UI/images/menuSlider_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/menuSlider_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/menuSlider_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/menu_button_image.asset.taml b/Templates/BaseGame/game/data/UI/images/menu_button_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/menu_button_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/menu_button_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/menu_image.asset.taml b/Templates/BaseGame/game/data/UI/images/menu_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/menu_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/menu_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/new_d.png b/Templates/BaseGame/game/data/UI/images/new_d.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/new_d.png rename to Templates/BaseGame/game/data/UI/images/new_d.png diff --git a/Templates/BaseGame/game/data/ui/images/new_d_image.asset.taml b/Templates/BaseGame/game/data/UI/images/new_d_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/new_d_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/new_d_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/new_h.png b/Templates/BaseGame/game/data/UI/images/new_h.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/new_h.png rename to Templates/BaseGame/game/data/UI/images/new_h.png diff --git a/Templates/BaseGame/game/data/ui/images/new_h_image.asset.taml b/Templates/BaseGame/game/data/UI/images/new_h_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/new_h_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/new_h_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/new_n.png b/Templates/BaseGame/game/data/UI/images/new_n.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/new_n.png rename to Templates/BaseGame/game/data/UI/images/new_n.png diff --git a/Templates/BaseGame/game/data/ui/images/new_n_image.asset.taml b/Templates/BaseGame/game/data/UI/images/new_n_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/new_n_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/new_n_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/next-button_d.png b/Templates/BaseGame/game/data/UI/images/next-button_d.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/next-button_d.png rename to Templates/BaseGame/game/data/UI/images/next-button_d.png diff --git a/Templates/BaseGame/game/data/ui/images/next-button_h.png b/Templates/BaseGame/game/data/UI/images/next-button_h.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/next-button_h.png rename to Templates/BaseGame/game/data/UI/images/next-button_h.png diff --git a/Templates/BaseGame/game/data/ui/images/next-button_n.png b/Templates/BaseGame/game/data/UI/images/next-button_n.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/next-button_n.png rename to Templates/BaseGame/game/data/UI/images/next-button_n.png diff --git a/Templates/BaseGame/game/data/ui/images/next_button_d_image.asset.taml b/Templates/BaseGame/game/data/UI/images/next_button_d_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/next_button_d_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/next_button_d_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/next_button_h_image.asset.taml b/Templates/BaseGame/game/data/UI/images/next_button_h_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/next_button_h_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/next_button_h_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/next_button_n_image.asset.taml b/Templates/BaseGame/game/data/UI/images/next_button_n_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/next_button_n_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/next_button_n_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/no-preview.png b/Templates/BaseGame/game/data/UI/images/no-preview.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/no-preview.png rename to Templates/BaseGame/game/data/UI/images/no-preview.png diff --git a/Templates/BaseGame/game/data/ui/images/no_preview_image.asset.taml b/Templates/BaseGame/game/data/UI/images/no_preview_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/no_preview_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/no_preview_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/numericslider.png b/Templates/BaseGame/game/data/UI/images/numericslider.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/numericslider.png rename to Templates/BaseGame/game/data/UI/images/numericslider.png diff --git a/Templates/BaseGame/game/data/ui/images/numericslider_image.asset.taml b/Templates/BaseGame/game/data/UI/images/numericslider_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/numericslider_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/numericslider_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/optionsMenuSliderBitmapArray.png b/Templates/BaseGame/game/data/UI/images/optionsMenuSliderBitmapArray.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/optionsMenuSliderBitmapArray.png rename to Templates/BaseGame/game/data/UI/images/optionsMenuSliderBitmapArray.png diff --git a/Templates/BaseGame/game/data/ui/images/optionsMenuSliderBitmapArray_image.asset.taml b/Templates/BaseGame/game/data/UI/images/optionsMenuSliderBitmapArray_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/optionsMenuSliderBitmapArray_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/optionsMenuSliderBitmapArray_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/panel.png b/Templates/BaseGame/game/data/UI/images/panel.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/panel.png rename to Templates/BaseGame/game/data/UI/images/panel.png diff --git a/Templates/BaseGame/game/data/ui/images/panel_image.asset.taml b/Templates/BaseGame/game/data/UI/images/panel_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/panel_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/panel_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/panel_low.png b/Templates/BaseGame/game/data/UI/images/panel_low.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/panel_low.png rename to Templates/BaseGame/game/data/UI/images/panel_low.png diff --git a/Templates/BaseGame/game/data/ui/images/panel_low_image.asset.taml b/Templates/BaseGame/game/data/UI/images/panel_low_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/panel_low_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/panel_low_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/previous-button_d.png b/Templates/BaseGame/game/data/UI/images/previous-button_d.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/previous-button_d.png rename to Templates/BaseGame/game/data/UI/images/previous-button_d.png diff --git a/Templates/BaseGame/game/data/ui/images/previous-button_h.png b/Templates/BaseGame/game/data/UI/images/previous-button_h.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/previous-button_h.png rename to Templates/BaseGame/game/data/UI/images/previous-button_h.png diff --git a/Templates/BaseGame/game/data/ui/images/previous-button_n.png b/Templates/BaseGame/game/data/UI/images/previous-button_n.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/previous-button_n.png rename to Templates/BaseGame/game/data/UI/images/previous-button_n.png diff --git a/Templates/BaseGame/game/data/ui/images/previous_button_d_image.asset.taml b/Templates/BaseGame/game/data/UI/images/previous_button_d_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/previous_button_d_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/previous_button_d_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/previous_button_h_image.asset.taml b/Templates/BaseGame/game/data/UI/images/previous_button_h_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/previous_button_h_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/previous_button_h_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/previous_button_n_image.asset.taml b/Templates/BaseGame/game/data/UI/images/previous_button_n_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/previous_button_n_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/previous_button_n_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/radioButton.png b/Templates/BaseGame/game/data/UI/images/radioButton.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/radioButton.png rename to Templates/BaseGame/game/data/UI/images/radioButton.png diff --git a/Templates/BaseGame/game/data/ui/images/radioButton_image.asset.taml b/Templates/BaseGame/game/data/UI/images/radioButton_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/radioButton_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/radioButton_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/scrollBar.png b/Templates/BaseGame/game/data/UI/images/scrollBar.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/scrollBar.png rename to Templates/BaseGame/game/data/UI/images/scrollBar.png diff --git a/Templates/BaseGame/game/data/ui/images/scrollBar_image.asset.taml b/Templates/BaseGame/game/data/UI/images/scrollBar_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/scrollBar_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/scrollBar_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/selector-button-blank.png b/Templates/BaseGame/game/data/UI/images/selector-button-blank.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/selector-button-blank.png rename to Templates/BaseGame/game/data/UI/images/selector-button-blank.png diff --git a/Templates/BaseGame/game/data/ui/images/selector-button-dark.png b/Templates/BaseGame/game/data/UI/images/selector-button-dark.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/selector-button-dark.png rename to Templates/BaseGame/game/data/UI/images/selector-button-dark.png diff --git a/Templates/BaseGame/game/data/ui/images/selector-button-highlight-only.png b/Templates/BaseGame/game/data/UI/images/selector-button-highlight-only.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/selector-button-highlight-only.png rename to Templates/BaseGame/game/data/UI/images/selector-button-highlight-only.png diff --git a/Templates/BaseGame/game/data/ui/images/selector-button.png b/Templates/BaseGame/game/data/UI/images/selector-button.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/selector-button.png rename to Templates/BaseGame/game/data/UI/images/selector-button.png diff --git a/Templates/BaseGame/game/data/ui/images/selector_button_blank_image.asset.taml b/Templates/BaseGame/game/data/UI/images/selector_button_blank_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/selector_button_blank_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/selector_button_blank_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/selector_button_dark_image.asset.taml b/Templates/BaseGame/game/data/UI/images/selector_button_dark_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/selector_button_dark_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/selector_button_dark_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/selector_button_highlight_only_image.asset.taml b/Templates/BaseGame/game/data/UI/images/selector_button_highlight_only_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/selector_button_highlight_only_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/selector_button_highlight_only_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/selector_button_image.asset.taml b/Templates/BaseGame/game/data/UI/images/selector_button_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/selector_button_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/selector_button_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/separator-h.png b/Templates/BaseGame/game/data/UI/images/separator-h.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/separator-h.png rename to Templates/BaseGame/game/data/UI/images/separator-h.png diff --git a/Templates/BaseGame/game/data/ui/images/separator-v.png b/Templates/BaseGame/game/data/UI/images/separator-v.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/separator-v.png rename to Templates/BaseGame/game/data/UI/images/separator-v.png diff --git a/Templates/BaseGame/game/data/ui/images/separator_h_image.asset.taml b/Templates/BaseGame/game/data/UI/images/separator_h_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/separator_h_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/separator_h_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/separator_v_image.asset.taml b/Templates/BaseGame/game/data/UI/images/separator_v_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/separator_v_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/separator_v_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/slider - Copy.png b/Templates/BaseGame/game/data/UI/images/slider - Copy.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/slider - Copy.png rename to Templates/BaseGame/game/data/UI/images/slider - Copy.png diff --git a/Templates/BaseGame/game/data/ui/images/slider-w-box.png b/Templates/BaseGame/game/data/UI/images/slider-w-box.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/slider-w-box.png rename to Templates/BaseGame/game/data/UI/images/slider-w-box.png diff --git a/Templates/BaseGame/game/data/ui/images/slider___Copy_image.asset.taml b/Templates/BaseGame/game/data/UI/images/slider___Copy_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/slider___Copy_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/slider___Copy_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/slider_w_box_image.asset.taml b/Templates/BaseGame/game/data/UI/images/slider_w_box_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/slider_w_box_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/slider_w_box_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/tab-border.png b/Templates/BaseGame/game/data/UI/images/tab-border.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/tab-border.png rename to Templates/BaseGame/game/data/UI/images/tab-border.png diff --git a/Templates/BaseGame/game/data/ui/images/tab.png b/Templates/BaseGame/game/data/UI/images/tab.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/tab.png rename to Templates/BaseGame/game/data/UI/images/tab.png diff --git a/Templates/BaseGame/game/data/ui/images/tab_border_image.asset.taml b/Templates/BaseGame/game/data/UI/images/tab_border_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/tab_border_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/tab_border_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/tab_image.asset.taml b/Templates/BaseGame/game/data/UI/images/tab_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/tab_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/tab_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/textEdit.png b/Templates/BaseGame/game/data/UI/images/textEdit.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/textEdit.png rename to Templates/BaseGame/game/data/UI/images/textEdit.png diff --git a/Templates/BaseGame/game/data/ui/images/textEditSliderBox.png b/Templates/BaseGame/game/data/UI/images/textEditSliderBox.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/textEditSliderBox.png rename to Templates/BaseGame/game/data/UI/images/textEditSliderBox.png diff --git a/Templates/BaseGame/game/data/ui/images/textEditSliderBox_image.asset.taml b/Templates/BaseGame/game/data/UI/images/textEditSliderBox_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/textEditSliderBox_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/textEditSliderBox_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/textEdit_image.asset.taml b/Templates/BaseGame/game/data/UI/images/textEdit_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/textEdit_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/textEdit_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/images/window.png b/Templates/BaseGame/game/data/UI/images/window.png similarity index 100% rename from Templates/BaseGame/game/data/ui/images/window.png rename to Templates/BaseGame/game/data/UI/images/window.png diff --git a/Templates/BaseGame/game/data/ui/images/window_image.asset.taml b/Templates/BaseGame/game/data/UI/images/window_image.asset.taml similarity index 100% rename from Templates/BaseGame/game/data/ui/images/window_image.asset.taml rename to Templates/BaseGame/game/data/UI/images/window_image.asset.taml diff --git a/Templates/BaseGame/game/data/ui/scripts/controlsMenu.tscript b/Templates/BaseGame/game/data/UI/scripts/controlsMenu.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/scripts/controlsMenu.tscript rename to Templates/BaseGame/game/data/UI/scripts/controlsMenu.tscript diff --git a/Templates/BaseGame/game/data/ui/scripts/cursors.tscript b/Templates/BaseGame/game/data/UI/scripts/cursors.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/scripts/cursors.tscript rename to Templates/BaseGame/game/data/UI/scripts/cursors.tscript diff --git a/Templates/BaseGame/game/data/ui/scripts/guiTreeViewCtrl.tscript b/Templates/BaseGame/game/data/UI/scripts/guiTreeViewCtrl.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/scripts/guiTreeViewCtrl.tscript rename to Templates/BaseGame/game/data/UI/scripts/guiTreeViewCtrl.tscript diff --git a/Templates/BaseGame/game/data/ui/scripts/help.tscript b/Templates/BaseGame/game/data/UI/scripts/help.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/scripts/help.tscript rename to Templates/BaseGame/game/data/UI/scripts/help.tscript diff --git a/Templates/BaseGame/game/data/ui/scripts/menuInputButtons.tscript b/Templates/BaseGame/game/data/UI/scripts/menuInputButtons.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/scripts/menuInputButtons.tscript rename to Templates/BaseGame/game/data/UI/scripts/menuInputButtons.tscript diff --git a/Templates/BaseGame/game/data/ui/scripts/messageBoxes.tscript b/Templates/BaseGame/game/data/UI/scripts/messageBoxes.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/scripts/messageBoxes.tscript rename to Templates/BaseGame/game/data/UI/scripts/messageBoxes.tscript diff --git a/Templates/BaseGame/game/data/ui/scripts/profiles.tscript b/Templates/BaseGame/game/data/UI/scripts/profiles.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/scripts/profiles.tscript rename to Templates/BaseGame/game/data/UI/scripts/profiles.tscript diff --git a/Templates/BaseGame/game/data/ui/scripts/utility.tscript b/Templates/BaseGame/game/data/UI/scripts/utility.tscript similarity index 100% rename from Templates/BaseGame/game/data/ui/scripts/utility.tscript rename to Templates/BaseGame/game/data/UI/scripts/utility.tscript diff --git a/Templates/BaseGame/game/data/ui/sounds/buttonClick.wav b/Templates/BaseGame/game/data/UI/sounds/buttonClick.wav similarity index 100% rename from Templates/BaseGame/game/data/ui/sounds/buttonClick.wav rename to Templates/BaseGame/game/data/UI/sounds/buttonClick.wav diff --git a/Templates/BaseGame/game/data/ui/sounds/buttonHover.wav b/Templates/BaseGame/game/data/UI/sounds/buttonHover.wav similarity index 100% rename from Templates/BaseGame/game/data/ui/sounds/buttonHover.wav rename to Templates/BaseGame/game/data/UI/sounds/buttonHover.wav diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript index f213cca95..1f308f55d 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript @@ -543,7 +543,7 @@ function AssetBrowser::doRefresh(%this) %this.navigateTo(%this.dirHandler.currentAddress); //Forces a clean collapse of the tree for any not-really-exposed items - %dataItem = AssetBrowser-->filterTree.findItemByName("Data"); + %dataItem = AssetBrowser-->filterTree.findItemByName("data"); AssetBrowser-->filterTree.expandItem(%dataItem, false); AssetBrowser-->filterTree.expandItem(%dataItem); @@ -580,11 +580,11 @@ function AssetBrowser::loadDirectories( %this ) AssetBrowser-->filterTree.modulesIdx = AssetBrowser-->filterTree.insertItem(1, "Modules"); - %dataItem = AssetBrowser-->filterTree.insertItem(AssetBrowser-->filterTree.modulesIdx, "Data"); + %dataItem = AssetBrowser-->filterTree.insertItem(AssetBrowser-->filterTree.modulesIdx, "data"); AssetBrowser-->filterTree.tagsIdx = AssetBrowser-->filterTree.insertItem(1, "Tags"); AssetBrowser-->filterTree.creatorIdx = AssetBrowser-->filterTree.insertItem(1, "Creator"); - %this.dirHandler.loadFolders("Data", %dataItem); + %this.dirHandler.loadFolders("data", %dataItem); %this.loadCollectionSets(); @@ -595,15 +595,15 @@ function AssetBrowser::loadDirectories( %this ) //If set to, show core if(EditorSettings.value("Assets/Browser/showCoreModule", false) == 1) { - %coreItem = AssetBrowser-->filterTree.insertItem(AssetBrowser-->filterTree.modulesIdx, "Core"); - %this.dirHandler.loadFolders("Core", %coreItem); + %coreItem = AssetBrowser-->filterTree.insertItem(AssetBrowser-->filterTree.modulesIdx, "core"); + %this.dirHandler.loadFolders("core", %coreItem); } //If set to, show tools if(EditorSettings.value("Assets/Browser/showToolsModule", false) == 1) { - %toolsItem = AssetBrowser-->filterTree.insertItem(AssetBrowser-->filterTree.modulesIdx, "Tools"); - %this.dirHandler.loadFolders("Tools", %toolsItem); + %toolsItem = AssetBrowser-->filterTree.insertItem(AssetBrowser-->filterTree.modulesIdx, "tools"); + %this.dirHandler.loadFolders("tools", %toolsItem); } //Add Non-Asset Scripted Objects. Datablock, etc based @@ -676,7 +676,7 @@ function AssetBrowser::loadDirectories( %this ) AssetBrowser.newModuleId = ""; } - //%dataItem = AssetBrowser-->filterTree.findItemByName("Data"); + //%dataItem = AssetBrowser-->filterTree.findItemByName("data"); //AssetBrowser-->filterTree.expandItem(%dataItem); AssetBrowser.dirHandler.expandTreeToAddress(AssetBrowser.dirHandler.currentAddress); @@ -1219,14 +1219,14 @@ function AssetBrowserFilterTree::onRightMouseDown(%this, %itemId) } else { - if( %this.getSelectedItemsCount() > 0 && (%itemText !$= "Data" && %itemText !$= "Core" && %itemText !$= "Tools")) + if( %this.getSelectedItemsCount() > 0 && (%itemText !$= "data" && %itemText !$="core" && %itemText !$= "tools")) { //AddNewAssetPopup.showPopup(Canvas); //We have something clicked, so figure out if it's a sub-filter or a module filter, then push the correct //popup menu %parentItem = %this.getParentItem(%itemId); - if(%this.getItemText(%parentItem) $= "Data") //if it's a data module, continue + if(%this.getItemText(%parentItem) $= "data") //if it's a data module, continue { //find out if it's a folder or a module! if(ModuleDatabase.findModule(%itemText)) @@ -1248,11 +1248,11 @@ function AssetBrowserFilterTree::onRightMouseDown(%this, %itemId) EditFolderPopup.assetType = "Folder"; } } - else if(%itemText $= "Data") + else if(%itemText $= "data") { AddNewModulePopup.showPopup(Canvas); } - else if(%itemText $= "Tools") + else if(%itemText $= "tools") { AddNewToolPopup.showPopup(Canvas); } diff --git a/Templates/BaseGame/game/tools/main.tscript b/Templates/BaseGame/game/tools/main.tscript index 3f35eaeeb..ea44d1ded 100644 --- a/Templates/BaseGame/game/tools/main.tscript +++ b/Templates/BaseGame/game/tools/main.tscript @@ -26,7 +26,7 @@ $Tools::resourcePath = "tools/"; // These must be loaded first, in this order, before anything else is loaded -$Tools::loadFirst = "editorClasses base worldEditor"; +$Tools::loadFirst = "editorClasses base worldEditor assetBrowser"; //--------------------------------------------------------------------------------------------- // Object that holds the simObject id that the materialEditor uses to interpret its material list diff --git a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript index 33cee57ea..511a1b5bd 100644 --- a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript @@ -47,7 +47,7 @@ function MaterialEditorGui::establishMaterials(%this) singleton CustomMaterial( materialEd_justAlphaMaterial ) { mapTo = "matEd_mappedMatB"; - texture[0] = materialEd_previewMaterial.diffuseMap[0]; + texture[0] = materialEd_previewMaterial.getdiffuseMap(0); }; //Custom shader to allow the display of just the alpha channel. @@ -176,7 +176,7 @@ function MaterialEditorGui::quit(%this) // Now we can delete the preview materials and shaders // knowing that there are no matinstances using them. matEdCubeMapPreviewMat.delete(); - materialEd_previewMaterial.delete(); + //materialEd_previewMaterial.delete(); materialEd_justAlphaMaterial.delete(); materialEd_justAlphaShader.delete(); } @@ -387,32 +387,32 @@ function MaterialEditorGui::updatePreviewObject(%this) { case "sphere": matEd_quickPreview_Popup.selected = %newModel; - matEd_previewObjectView.setModel("tools/materialEditor/gui/spherePreview.dts"); + matEd_previewObjectView.setModel("tools/materialEditor/gui/spherepreview.dts"); matEd_previewObjectView.setOrbitDistance(4); case "cube": matEd_quickPreview_Popup.selected = %newModel; - matEd_previewObjectView.setModel("tools/materialEditor/gui/cubePreview.dts"); + matEd_previewObjectView.setModel("tools/materialEditor/gui/cubepreview.dts"); matEd_previewObjectView.setOrbitDistance(5); case "pyramid": matEd_quickPreview_Popup.selected = %newModel; - matEd_previewObjectView.setModel("tools/materialEditor/gui/pyramidPreview.dts"); + matEd_previewObjectView.setModel("tools/materialEditor/gui/pyramidpreview.dts"); matEd_previewObjectView.setOrbitDistance(5); case "cylinder": matEd_quickPreview_Popup.selected = %newModel; - matEd_previewObjectView.setModel("tools/materialEditor/gui/cylinderPreview.dts"); + matEd_previewObjectView.setModel("tools/materialEditor/gui/cylinderpreview.dts"); matEd_previewObjectView.setOrbitDistance(4.2); case "torus": matEd_quickPreview_Popup.selected = %newModel; - matEd_previewObjectView.setModel("tools/materialEditor/gui/torusPreview.dts"); + matEd_previewObjectView.setModel("tools/materialEditor/gui/toruspreview.dts"); matEd_previewObjectView.setOrbitDistance(4.2); case "knot": matEd_quickPreview_Popup.selected = %newModel; - matEd_previewObjectView.setModel("tools/materialEditor/gui/torusknotPreview.dts"); + matEd_previewObjectView.setModel("tools/materialEditor/gui/torusknotpreview.dts"); } } diff --git a/Templates/BaseGame/game/tools/projectImporter/scripts/pre40/T3Dpre4ProjectImporter.tscript b/Templates/BaseGame/game/tools/projectImporter/scripts/pre40/T3Dpre4ProjectImporter.tscript index 4f795bee3..9c0b1691f 100644 --- a/Templates/BaseGame/game/tools/projectImporter/scripts/pre40/T3Dpre4ProjectImporter.tscript +++ b/Templates/BaseGame/game/tools/projectImporter/scripts/pre40/T3Dpre4ProjectImporter.tscript @@ -77,8 +77,15 @@ function T3Dpre4ProjectImporter::copyFiles(%this) { %filePath = filePath(%file); %fileName = fileName(%file); + %fileBase = fileBase(%file); %fileExt = fileExt(%file); + if(endsWith(%fileName, ".asset.taml")) + { + %fileBase = strreplace(%fileBase, ".asset", ""); + %fileExt = ".asset.taml"; + } + if(%fileExt $= ".dll" || %fileExt $= ".log" || %fileExt $= ".exe" || %fileExt $= ".manifest"|| %fileExt $= ".h" || %fileExt $= ".cpp" || %fileExt $= ".so" || %fileExt $= ".do" || %fileExt $= ".lib" ||%fileExt $= ".exp") { @@ -99,6 +106,17 @@ function T3Dpre4ProjectImporter::copyFiles(%this) } %targetFilePath = strReplace(%file, $ProjectImporter::sourceContentFolder, $ProjectImporter::modulePath); + + %sanitizedFilename = sanitizeString(%fileBase); + if(startsWith(%sanitizedFilename, "_")) + { + %sanitizedFilename = substr(%sanitizedFilename, 1, -1); + } + if(%sanitizedFilename !$= %fileBase) + { + %targetFilePath = filePath(%targetFilePath) @ "/" @ %sanitizedFilename @ %fileExt; + } + %targetFolder = filePath(%targetFilePath); if(!isDirectory(%targetFolder)) @@ -214,7 +232,7 @@ function T3Dpre4ProjectImporter::beginMaterialFilesImport(%this) %line = $ProjectImporter::fileObject.readLine(); %trimmedLine = trim(%line); - if(strIsMatchExpr("*new*(*)*", %line)) + if(strIsMatchExpr("*new*(*)*", %line) && strpos(%line, "::") == -1) { %className = findObjectClass(%line, "new"); @@ -246,6 +264,18 @@ function T3Dpre4ProjectImporter::beginMaterialFilesImport(%this) %fileWasChanged = true; } + %sanitizedName = sanitizeString(%objectName); + if(startsWith(%sanitizedName, "_")) + { + %sanitizedName = substr(%sanitizedName, 1, -1); + } + if(%sanitizedName !$= %objectName) + { + %line = strReplace(%line, %objectName, %sanitizedName); + + %fileWasChanged = true; + } + if(%objectClassStack.count() == 1) { %currentObjClass = %objectClassStack.getKey(%objectClassStack.count()-1); @@ -278,6 +308,18 @@ function T3Dpre4ProjectImporter::beginMaterialFilesImport(%this) %objectName = findObjectName(%line, "singleton"); + %sanitizedName = sanitizeString(%objectName); + if(startsWith(%sanitizedName, "_")) + { + %sanitizedName = substr(%sanitizedName, 1, -1); + } + if(%sanitizedName !$= %objectName) + { + %line = strReplace(%line, %objectName, %sanitizedName); + + %fileWasChanged = true; + } + if(%objectClassStack.count() == 1) { %currentObjClass = %objectClassStack.getKey(%objectClassStack.count()-1); @@ -418,7 +460,7 @@ function T3Dpre4ProjectImporter::beginCodeFilesImport(%this) %line = $ProjectImporter::fileObject.readLine(); %trimmedLine = trim(%line); - if(strIsMatchExpr("*new*(*)*", %line)) + if(strIsMatchExpr("*new*(*)*", %line) && strpos(%line, "::") == -1) { %className = findObjectClass(%line, "new"); @@ -428,6 +470,18 @@ function T3Dpre4ProjectImporter::beginCodeFilesImport(%this) if(%objectName !$= "") { + %sanitizedName = sanitizeString(%objectName); + if(startsWith(%sanitizedName, "_")) + { + %sanitizedName = substr(%sanitizedName, 1, -1); + } + if(%sanitizedName !$= %objectName) + { + %line = strReplace(%line, %objectName, %sanitizedName); + + %fileWasChanged = true; + } + if(%objectClassStack.count() == 1) { %currentObjClass = %objectClassStack.getKey(%objectClassStack.count()-1); @@ -513,6 +567,18 @@ function T3Dpre4ProjectImporter::beginCodeFilesImport(%this) if(%objectName !$= "") { + %sanitizedName = sanitizeString(%objectName); + if(startsWith(%sanitizedName, "_")) + { + %sanitizedName = substr(%sanitizedName, 1, -1); + } + if(%sanitizedName !$= %objectName) + { + %line = strReplace(%line, %objectName, %sanitizedName); + + %fileWasChanged = true; + } + if(%objectClassStack.count() == 1) { %currentObjClass = %objectClassStack.getKey(%objectClassStack.count()-1); @@ -764,6 +830,7 @@ T3Dpre4ProjectImporter::genProcessor("GroundPlane", "material materialAsset"); T3Dpre4ProjectImporter::genProcessor("LevelInfo", "accuTexture accuTextureAsset"); T3Dpre4ProjectImporter::genProcessor("TSStatic", "shape shapeAsset shapeName shapeAsset"); T3Dpre4ProjectImporter::genProcessor("TSForestItemData", "shape shapeAsset shapeName shapeAsset shapeFile shapeAsset"); +T3Dpre4ProjectImporter::genProcessor("TerrainBlock", "terrainFile terrainAsset"); //============================================================================== // Levels //============================================================================== @@ -1034,57 +1101,8 @@ function processGuiBitmapButtonCtrlField(%line, %originalFieldName, %newFieldNam //These are going to be texture/render targets, and we can leave them alone return %line; } - //find any assets with that filename - else if(startsWith(%value, "./")) - { - %targetFilename = strReplace(%value, "./", $ProjectImporter::currentFilePath @ "/"); - } - else if(startsWith(%value, "../")) - { - %slashPos = strposr($ProjectImporter::currentFilePath, "/"); - if(%slashPos == strlen($ProjectImporter::currentFilePath)-1) //if it's right at the end, we'll get the next one up - { - %slashPos = strposr($ProjectImporter::currentFilePath, "/", 2); - } - - %parentPath = getSubStr($ProjectImporter::currentFilePath, 0, %slashPos); - %targetFilename = strReplace(%value, "../", %parentPath @ "/"); - } - else if(startsWith(%value, "~")) - { - %targetFilename = strReplace(%value, "~", $ProjectImporter::modulePath @ "/"); - if(!isFile(%targetFilename)) - { - %targetFilename = strReplace(%value, "~", $ProjectImporter::modulePath @ "/main/"); - } - } - else if ((strpos(%value,"/") == -1)&&(strpos(%value,"\\") == -1)) - { - %targetFilename = $ProjectImporter::currentFilePath @ %value; - } - else if(!startsWith(%value, $ProjectImporter::modulePath @ "/")) - { - %targetFilename = $ProjectImporter::modulePath @ "/" @ %value; - } - else - { - %targetFilename = %value; - } - %targetFilename = strReplace(%targetFilename, "//", "/"); - %targetFilename = testFilenameExtensions(%targetFilename); - - if(!isFile(%targetFilename)) //if our presumed file target is bad, just bail out - { - //Now we test for a suffix - %targetPath = filePath(%targetFilename); - %targetName = fileBase(%targetFilename); - %targetExt = fileExt(%targetFilename); - - %targetFilename = %targetPath @ "/" @ %targetName @ "_n" @ %targetExt; - %targetFilename = strReplace(%targetFilename, "//", "/"); - %targetFilename = testFilenameExtensions(%targetFilename); - } + %targetFilename = sanitizeFilename(%value); //If we still have nothing, then we fail it out if(!isFile(%targetFilename)) diff --git a/Templates/BaseGame/game/tools/projectImporter/scripts/projectImporter.tscript b/Templates/BaseGame/game/tools/projectImporter/scripts/projectImporter.tscript index eff77c7d4..05a0847f4 100644 --- a/Templates/BaseGame/game/tools/projectImporter/scripts/projectImporter.tscript +++ b/Templates/BaseGame/game/tools/projectImporter/scripts/projectImporter.tscript @@ -220,10 +220,7 @@ function ProjectImportWizardPage3::openPage(%this) %topFolder = getToken($ProjectImporter::sourceContentFolder, "/", %slashCount-2); //clean up invalid characters and stuff - %topFolder = strReplace(%topFolder, " ", ""); - %topFolder = strReplace(%topFolder, "!", ""); - %topFolder = strReplace(%topFolder, "-", ""); - %topFolder = strReplace(%topFolder, ".", ""); + %topFolder = sanitizeString(%topFolder); $ProjectImporter::useExistingModule = false; $ProjectImporter::moduleName = %topFolder; //preseed the module name @@ -366,6 +363,91 @@ function beginProjectImport() AssetBrowser.refresh(); //update the AB just in case } +function sanitizeFilename(%file) +{ + if(startsWith(%file, "./")) + { + %targetFilename = strReplace(%file, "./", $ProjectImporter::currentFilePath @ "/"); + } + else if(startsWith(%file, "../")) + { + %slashPos = strposr($ProjectImporter::currentFilePath, "/"); + if(%slashPos == strlen($ProjectImporter::currentFilePath)-1) //if it's right at the end, we'll get the next one up + { + %slashPos = strposr($ProjectImporter::currentFilePath, "/", 2); + } + + %parentPath = getSubStr($ProjectImporter::currentFilePath, 0, %slashPos); + %targetFilename = strReplace(%file, "../", %parentPath @ "/"); + } + else if(startsWith(%file, "~")) + { + %targetFilename = strReplace(%file, "~", $ProjectImporter::modulePath @ "/"); + if(!isFile(%targetFilename)) + { + %targetFilename = strReplace(%file, "~", $ProjectImporter::modulePath @ "/main/"); + } + } + else if ((strpos(%file,"/") == -1)&&(strpos(%file,"\\") == -1)) + { + %targetFilename = $ProjectImporter::currentFilePath @ %file; + } + else if(!startsWith(%file, $ProjectImporter::modulePath @ "/")) + { + %targetFilename = $ProjectImporter::modulePath @ "/" @ %file; + } + else + { + %targetFilename = %file; + } + + //Now we test for a suffix + %flName = fileName(%targetFilename); + %targetPath = filePath(%targetFilename); + %targetName = fileBase(%targetFilename); + %targetExt = fileExt(%targetFilename); + + if(endsWith(%flName, ".asset.taml")) + { + %targetName = strreplace(%targetName, ".asset", ""); + %targetExt = ".asset.taml"; + } + + %sanitizedName = sanitizeString(%targetName); + if(startsWith(%sanitizedName, "_")) + { + %sanitizedName = substr(%sanitizedName, 1, -1); + } + if(%sanitizedName !$= %targetName) + { + %targetName = %sanitizedName; + %targetFilename = %targetPath @ "/" @ %targetName @ %targetExt; + } + + if(!isFile(%targetFilename)) + { + %bitmapFile = %targetPath @ "/" @ %targetName @ "_n" @ %targetExt; + if(isFile(%bitmapFile)) + %targetFilename = %bitmapFile; + } + + if(!isFile(%targetFilename)) + { + %targetFilename = testFilenameExtensions(%targetFilename); + } + + %targetFilename = strReplace(%targetFilename, "//", "/"); + + if(!isFile(%targetFilename)) //if our presumed file target is bad, just bail out + { + return %file; + } + else + { + return %targetFilename; + } +} + function testFilenameExtensions(%filename) { %ext = fileExt(%filename); @@ -432,47 +514,17 @@ function processLegacyField(%line, %originalFieldName, %newFieldName) //These are going to be texture/render targets, and we can leave them alone return %line; } - //find any assets with that filename - else if(startsWith(%value, "./")) - { - %targetFilename = strReplace(%value, "./", $ProjectImporter::currentFilePath @ "/"); - } - else if(startsWith(%value, "../")) - { - %slashPos = strposr($ProjectImporter::currentFilePath, "/"); - if(%slashPos == strlen($ProjectImporter::currentFilePath)-1) //if it's right at the end, we'll get the next one up - { - %slashPos = strposr($ProjectImporter::currentFilePath, "/", 2); - } - %parentPath = getSubStr($ProjectImporter::currentFilePath, 0, %slashPos); - %targetFilename = strReplace(%value, "../", %parentPath @ "/"); - } - else if(startsWith(%value, "~")) - { - %targetFilename = strReplace(%value, "~", $ProjectImporter::modulePath @ "/"); - if(!isFile(%targetFilename)) + %targetFilename = sanitizeFilename(%value); + + if(isObject(%targetFilename)) { - %targetFilename = strReplace(%value, "~", $ProjectImporter::modulePath @ "/main/"); - } - } - else if ((strpos(%value,"/") == -1)&&(strpos(%value,"\\") == -1)) - { - %targetFilename = $ProjectImporter::currentFilePath @ %value; - } - else if(!startsWith(%value, $ProjectImporter::modulePath @ "/")) - { - %targetFilename = $ProjectImporter::modulePath @ "/" @ %value; + //likely a material name, so handle it that way + %assetId = MaterialAsset::getAssetIdByMaterialName(%targetFilename); } else { - %targetFilename = %value; - } - - %targetFilename = strReplace(%targetFilename, "//", "/"); - %targetFilename = testFilenameExtensions(%targetFilename); - - if(!isFile(%targetFilename)) //if our presumed file target is bad, just bail out + if(!isFile(%targetFilename)) { error("Legacy Project Importer - file described in line could not be found/is not valid"); return %line; @@ -483,11 +535,12 @@ function processLegacyField(%line, %originalFieldName, %newFieldName) if(%foundAssets != 0) { %assetId = $ProjectImporter::assetQuery.getAsset(0); - echo("Legacy Project Importer - processing of legacy field line's value: " @ %value @ " has found a matching AssetId: " @ %assetId); + } } if(%assetId !$= "" && AssetDatabase.isDeclaredAsset(%assetId)) { + echo("Legacy Project Importer - processing of legacy field line's value: " @ %value @ " has found a matching AssetId: " @ %assetId); //if (%assetId.getStatusString() $= "Ok") %outLine = strReplace(%outLine, %value, %assetId); //else @@ -523,45 +576,7 @@ function processLegacyShapeConstructorField(%line) if(strPos(%animSourcePath, ":") != -1) return %line; - //otherwise, try and see if we've got an animation source file here - if(startsWith(%animSourcePath, "./")) - { - %targetFilename = strReplace(%animSourcePath, "./", $ProjectImporter::currentFilePath @ "/"); - } - else if(startsWith(%animSourcePath, "../")) - { - %slashPos = strposr($ProjectImporter::currentFilePath, "/"); - if(%slashPos == strlen($ProjectImporter::currentFilePath)-1) //if it's right at the end, we'll get the next one up - { - %slashPos = strposr($ProjectImporter::currentFilePath, "/", 2); - } - - %parentPath = getSubStr($ProjectImporter::currentFilePath, 0, %slashPos); - %targetFilename = strReplace(%animSourcePath, "../", %parentPath @ "/"); - } - else if(startsWith(%animSourcePath, "~")) - { - %targetFilename = strReplace(%animSourcePath, "~", $ProjectImporter::modulePath @ "/"); - if(!isFile(%targetFilename)) - { - %targetFilename = strReplace(%animSourcePath, "~", $ProjectImporter::modulePath @ "/main/"); - } - } - else if ((strpos(%animSourcePath,"/") == -1)&&(strpos(%animSourcePath,"\\") == -1)) - { - %targetFilename = $ProjectImporter::currentFilePath @ %animSourcePath; - } - else if(!startsWith(%animSourcePath, $ProjectImporter::modulePath @ "/")) - { - %targetFilename = $ProjectImporter::modulePath @ "/" @ %animSourcePath; - } - else - { - %targetFilename = %animSourcePath; - } - - %targetFilename = strReplace(%targetFilename, "//", "/"); - %targetFilename = testFilenameExtensions(%targetFilename); + %targetFilename = sanitizeFilename(%animSourcePath); if(!isFile(%targetFilename)) { @@ -828,6 +843,14 @@ function beginTerrainImport() %filePath = filePath(%file); if(%fileExt $= ".ter") { + %sanitizedFile = sanitizeFilename(%file); + if(%sanitizedFile !$= %file) + { + %file = %sanitizedFile; + %fileName = fileName(%file); + %filePath = filePath(%file); + } + $ProjectImporter::assetQuery.clear(); %assetsFound = AssetDatabase.findAssetLooseFile($ProjectImporter::assetQuery, %file); if(%assetsFound == 0) diff --git a/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript b/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript index 0201a4f5e..1f1da8fa9 100644 --- a/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript @@ -3369,7 +3369,7 @@ function ShapeEdMountWindow::mountShape( %this, %slot ) %type = %this-->mountType.getText(); if ( %model $= "Browse..." ) - %model = "core/shapes/octahedron.dts"; + %model = "core/gameObjects/shapes/octahedron.dts"; if ( ShapeEdShapeView.mountShape( %model, %node, %type, %slot ) ) {