diff --git a/gamedir/INIEditorJA2.xml b/gamedir/INIEditorJA2.xml
index ec28be7be..65051e17f 100644
--- a/gamedir/INIEditorJA2.xml
+++ b/gamedir/INIEditorJA2.xml
@@ -35,7 +35,7 @@
请选择游戏mod对应的“vfs_config.*.ini”来加载这个 mod 。
-
+
The default Jagged Alliance 2 v1.13 Executable. This file will be used, if you click on the button "Launch JA2 v1.13".
Dies ist die standardmäßige Jagged Alliance 2 v1.13 Exe Datei, welche gestartet wird, wenn auf die Schaltfläche "Launch JA2 v1.13" geklickt wird.
Стартовый файл Jagged Alliance 2 v1.13.
diff --git a/gamedir/Ja2.ini b/gamedir/Ja2.ini
index 0fdee0d7c..8448306a3 100644
--- a/gamedir/Ja2.ini
+++ b/gamedir/Ja2.ini
@@ -34,18 +34,18 @@ VFS_CONFIG_INI = vfs_config.JA2113.ini
; VFS_CONFIG_INI = vfs_config.JA2113Demo.ini
; JA2 1.13 - Unfinished Business
-; VFS_CONFIG_INI=Data-UB\vfs_config.UB.ini
+; VFS_CONFIG_INI = vfs_config.UB.ini
; JA2 1.13 - SOG69 - Vietnam (Unfinished Business MOD)
-; VFS_CONFIG_INI=Data-UB\Addons\Data-Mod-SOG69-Vietnam\vfs_config.UB_SOG69-Vietnam.ini
+; VFS_CONFIG_INI = Data-UB\Addons\Data-Mod-SOG69-Vietnam\vfs_config.UB_SOG69-Vietnam.ini
;******************************************************************************************************************************
; This only has effect if you use the INI Editor to start Jagged Alliance 2 v1.13.
; Otherwise you can ignore that.
-; This executable will be the default file to start the selected ja2 1.13 game.
+; This Executable will be the default file to start JA2 1.13 from the INI Editor.
;******************************************************************************************************************************
-JA2_FILE = ja2.exe
+JA2_START_FILE = ja2.exe
;******************************************************************************************************************************
; You can choose from the following screen resolutions.
diff --git a/gamedir/Profiles/UserProfile_JA2113_UB_EN/Ja2_Settings.INI b/gamedir/Profiles/UserProfile_JA2113_UB_EN/Ja2_Settings.INI
deleted file mode 100644
index 8e90f52ce..000000000
--- a/gamedir/Profiles/UserProfile_JA2113_UB_EN/Ja2_Settings.INI
+++ /dev/null
@@ -1,108 +0,0 @@
-;******************************************************************************************************************************
-;******************************************************************************************************************************
-; Jagged Alliance 2 --Settings File--
-;
-; Please note that this file is automatically generated by the game.
-;
-; While it is safe to change things from within this file, not all values are acceptable. Some may break the game,
-; some may be ignored, but most likely they will be acceptable or reset to a default value.
-;
-; Please note, This file and its contents are in a beta phase. Expect changes, however they should be minimal and automated.
-;
-;******************************************************************************************************************************
-
-;******************************************************************************************************************************
-
-; The Current Game Setting Struct is defined as :
-;
-; typedef struct
-; {
-; INT8 bLastSavedGameSlot; // The last saved game number goes in here
-; UINT8 ubMusicVolumeSetting; // Volume Setting
-; UINT8 ubSoundEffectsVolume; // Volume Setting
-; UINT8 ubSpeechVolume; // Volume Setting
-; UINT8 fOptions[ NUM_ALL_GAME_OPTIONS ]; // Toggle Options (Speech, Subtitles, Show Tree Tops, etc.. )
-; UINT32 uiMeanwhileScenesSeenFlags; // Bit Vector describing seen 'mean whiles..'
-; BOOLEAN fHideHelpInAllScreens; // Controls Help "do not show help again" checkbox
-; } GAME_SETTINGS
-;
-;******************************************************************************************************************************
-
-
-[JA2 Game Settings]
-bLastSavedGameSlot = 18
-ubMusicVolumeSetting = 65
-ubSoundEffectsVolume = 65
-ubSpeechVolume = 65
-uiMeanwhileScenesSeenFlags = 0
-fHideHelpInAllScreens = FALSE
-TOPTION_SPEECH = TRUE
-TOPTION_MUTE_CONFIRMATIONS = FALSE
-TOPTION_SUBTITLES = TRUE
-TOPTION_KEY_ADVANCE_SPEECH = FALSE
-TOPTION_ANIMATE_SMOKE = TRUE
-TOPTION_BLOOD_N_GORE = TRUE
-TOPTION_DONT_MOVE_MOUSE = FALSE
-TOPTION_OLD_SELECTION_METHOD = FALSE
-TOPTION_ALWAYS_SHOW_MOVEMENT_PATH = FALSE
-TOPTION_SHOW_MISSES = FALSE
-TOPTION_RTCONFIRM = FALSE
-TOPTION_SLEEPWAKE_NOTIFICATION = TRUE
-TOPTION_USE_METRIC_SYSTEM = TRUE
-TOPTION_MERC_ALWAYS_LIGHT_UP = TRUE
-TOPTION_SMART_CURSOR = FALSE
-TOPTION_SNAP_CURSOR_TO_DOOR = TRUE
-TOPTION_GLOW_ITEMS = TRUE
-TOPTION_TOGGLE_TREE_TOPS = TRUE
-TOPTION_TOGGLE_WIREFRAME = TRUE
-TOPTION_3D_CURSOR = FALSE
-TOPTION_CTH_CURSOR = TRUE
-TOPTION_GL_BURST_CURSOR = TRUE
-TOPTION_ALLOW_TAUNTS = TRUE
-TOPTION_GL_HIGH_ANGLE = TRUE
-TOPTION_ALLOW_REAL_TIME_SNEAK = FALSE
-TOPTION_SPACE_SELECTS_NEXT_SQUAD = TRUE
-TOPTION_SHOW_ITEM_SHADOW = TRUE
-TOPTION_SHOW_WEAPON_RANGE_IN_TILES = TRUE
-TOPTION_TRACERS_FOR_SINGLE_FIRE = FALSE
-TOPTION_RAIN_SOUND = TRUE
-TOPTION_ALLOW_CROWS = TRUE
-TOPTION_ALLOW_SOLDIER_TOOLTIPS = TRUE
-TOPTION_USE_AUTO_SAVE = FALSE
-TOPTION_SILENT_SKYRIDER = FALSE
-TOPTION_ENHANCED_DESC_BOX = TRUE
-TOPTION_TOGGLE_TURN_MODE = FALSE
-TOPTION_STAT_PROGRESS_BARS = TRUE
-TOPTION_ALT_MAP_COLOR = FALSE
-TOPTION_ALTERNATE_BULLET_GRAPHICS = FALSE
-TOPTION_SHOW_MERC_RANKS = FALSE
-TOPTION_SHOW_TACTICAL_FACE_GEAR = FALSE
-TOPTION_SHOW_TACTICAL_FACE_ICONS = FALSE
-TOPTION_DISABLE_CURSOR_SWAP = FALSE
-TOPTION_QUIET_TRAINING = FALSE
-TOPTION_QUIET_REPAIRING = FALSE
-TOPTION_QUIET_DOCTORING = FALSE
-TOPTION_AUTO_FAST_FORWARD_MODE = FALSE
-TOPTION_ZOMBIES = FALSE
-TOPTION_ENABLE_INVENTORY_POPUPS = FALSE
-TOPTION_CHEAT_MODE_OPTIONS_HEADER = FALSE
-TOPTION_FORCE_BOBBY_RAY_SHIPMENTS = FALSE
-TOPTION_CHEAT_MODE_OPTIONS_END = FALSE
-TOPTION_DEBUG_MODE_OPTIONS_HEADER = FALSE
-TOPTION_REPORT_MISS_MARGIN = FALSE
-TOPTION_SHOW_RESET_ALL_OPTIONS = FALSE
-TOPTION_RESET_ALL_OPTIONS = FALSE
-TOPTION_RETAIN_DEBUG_OPTIONS_IN_RELEASE = FALSE
-TOPTION_DEBUG_MODE_RENDER_OPTIONS_GROUP = FALSE
-TOPTION_RENDER_MOUSE_REGIONS = FALSE
-TOPTION_DEBUG_MODE_OPTIONS_END = FALSE
-;******************************************************************************************************************************
-; Options beyond this point are Code derived options, DO NOT CHANGE THESE UNLESS YOU KNOW WHAT YOUR ARE DOING.
-; They are only included here for complete transparency for all GameSettings content.
-;******************************************************************************************************************************
-TOPTION_LAST_OPTION = FALSE
-NUM_GAME_OPTIONS = FALSE
-TOPTION_MERC_CASTS_LIGHT = TRUE
-TOPTION_HIDE_BULLETS = FALSE
-TOPTION_TRACKING_MODE = TRUE
-NUM_ALL_GAME_OPTIONS = FALSE
diff --git a/gamedir/Profiles/UserProfile_JA2113_UB_EN/Ja2_mp.ini b/gamedir/Profiles/UserProfile_JA2113_UB_EN/Ja2_mp.ini
deleted file mode 100644
index 79bfb21fa..000000000
--- a/gamedir/Profiles/UserProfile_JA2113_UB_EN/Ja2_mp.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-[Ja2_mp Settings]
-ALLOW_CUSTOM_NIV = 0
-CIV_ENABLED = 0
-CLIENT_NAME = Player Name
-DAMAGE_MULTIPLIER = 0.7
-DIFFICULT_LEVEL = 3
-DISABLE_BOBBY_RAYS = 0
-FILE_TRANSFER_DIRECTORY = MULTIPLAYER/Servers/My Server
-GAME_MODE = 0
-KIT_BAG = [201,214,243]
-MAX_CLIENTS = 4
-MAX_MERCS = 5
-OVERRIDE_MAX_AI = 0
-RANDOM_EDGES = 0
-RANDOM_MERCS = 0
-REPORT_NAME = 1
-SAME_MERC = 1
-SERVER_IP = 127.0.0.1
-SERVER_NAME = Server Name
-SERVER_PORT = 60005
-STARTING_BALANCE = 25000
-SYNC_CLIENTS_MP_DIR = 1
-TIME = 13.50
-TIMED_TURN_SECS_PER_TICK = 25
-
diff --git a/gamedir/Profiles/UserProfile_JA2113_UB_EN/Ja2_sp.ini b/gamedir/Profiles/UserProfile_JA2113_UB_EN/Ja2_sp.ini
deleted file mode 100644
index d509697d2..000000000
--- a/gamedir/Profiles/UserProfile_JA2113_UB_EN/Ja2_sp.ini
+++ /dev/null
@@ -1,139 +0,0 @@
-[JA2 Singleplayer Initial Settings]
-
-;******************************************************************************************************************************
-; The following settings are the initial settings in the initial game screen when you start a new game.
-;******************************************************************************************************************************
-
-;------------------------------------------------------------------------------------------------------------------------------
-; Difficulty Level
-;
-; 0 = Novice
-; 1 = Experienced
-; 2 = Expert
-; 3 = INSANE
-;------------------------------------------------------------------------------------------------------------------------------
-DIFFICULTY_LEVEL = 1
-
-;------------------------------------------------------------------------------------------------------------------------------
-; Bobby Ray Quality
-;
-; 1 = Normal
-; 2 = Great
-; 3 = Great
-; 4 = Excellent
-; 5 = Excellent
-; 6 = Excellent
-; 7 = Excellent
-; 8 = Excellent
-; 9 = Excellent
-; 10 = Awesome
-;------------------------------------------------------------------------------------------------------------------------------
-BOBBY_RAY_QUALITY = 2
-
-;------------------------------------------------------------------------------------------------------------------------------
-; Bobby Ray Quantity
-;
-; 1 = Normal (1x)
-; 2 = Great (2x)
-; 3 = Great (3x)
-; 4 = Excellent (4x)
-; 5 = Excellent (5x)
-; 6 = Excellent (6x)
-; 7 = Excellent (7x)
-; 8 = Excellent (8x)
-; 9 = Excellent (9x)
-; 10 = Awesome (10x)
-;------------------------------------------------------------------------------------------------------------------------------
-BOBBY_RAY_QUANTITY = 2
-
-;------------------------------------------------------------------------------------------------------------------------------
-; Max IMP Characters
-;
-; Range: 1 - 6
-;------------------------------------------------------------------------------------------------------------------------------
-MAX_IMP_CHARACTERS = 1
-
-;------------------------------------------------------------------------------------------------------------------------------
-; Progress Speed of Item Choices
-;
-; 0 = Very Slow
-; 1 = Slow
-; 2 = Normal
-; 3 = Fast
-; 4 = Very Fast
-;------------------------------------------------------------------------------------------------------------------------------
-PROGRESS_SPEED_OF_ITEM_CHOICES = 2
-
-;------------------------------------------------------------------------------------------------------------------------------
-; Skill Traits
-;
-; 0 = Old
-; 1 = New
-;------------------------------------------------------------------------------------------------------------------------------
-SKILL_TRAITS = 0
-
-;------------------------------------------------------------------------------------------------------------------------------
-; Inventory / Attachments
-;
-; 0 = Old / Old
-; 1 = New / Old
-; 2 = New / New
-;------------------------------------------------------------------------------------------------------------------------------
-INVENTORY_ATTACHMENTS = 2
-
-;------------------------------------------------------------------------------------------------------------------------------
-; Game Style
-;
-; 0 = Realistic
-; 1 = Sci Fi
-;------------------------------------------------------------------------------------------------------------------------------
-GAME_STYLE = 0
-
-;------------------------------------------------------------------------------------------------------------------------------
-; Enemies Drop All Items
-;
-; 0 = Off
-; 1 = On
-;------------------------------------------------------------------------------------------------------------------------------
-ENEMIES_DROP_ALL_ITEMS = 0
-
-;------------------------------------------------------------------------------------------------------------------------------
-; Extra Difficulty
-;
-; 0 = Save Anytime
-; 1 = Ironman (cannot save in combat)
-;------------------------------------------------------------------------------------------------------------------------------
-EXTRA_DIFFICULTY = 0
-
-;------------------------------------------------------------------------------------------------------------------------------
-; Available Arsenal
-;
-; 0 = Reduced
-; 1 = Tons of Guns
-;------------------------------------------------------------------------------------------------------------------------------
-AVAILABLE_ARSENAL = 1
-
-;------------------------------------------------------------------------------------------------------------------------------
-; Number of Terrorists
-;
-; 0 = Random
-; 1 = All
-;------------------------------------------------------------------------------------------------------------------------------
-NUMBER_OF_TERRORISTS = 0
-
-;------------------------------------------------------------------------------------------------------------------------------
-; Secret Weapon Caches
-;
-; 0 = Random
-; 1 = All
-;------------------------------------------------------------------------------------------------------------------------------
-SECRET_WEAPON_CACHES = 0
-
-;------------------------------------------------------------------------------------------------------------------------------
-; Maximum Squad Size
-;
-; 6 = Available in 640x480, 800x600 and 1024x768 screen resolution
-; 8 = Available in 800x600 and 1024x768 screen resolution
-; 10 = Available in 1024x768 screen resolution
-;------------------------------------------------------------------------------------------------------------------------------
-SQUAD_SIZE = 6
\ No newline at end of file
diff --git a/gamedir/Data-UB/vfs_config.UB.ini b/gamedir/vfs_config.UB.ini
similarity index 91%
rename from gamedir/Data-UB/vfs_config.UB.ini
rename to gamedir/vfs_config.UB.ini
index ad4640b42..b5363f719 100644
--- a/gamedir/Data-UB/vfs_config.UB.ini
+++ b/gamedir/vfs_config.UB.ini
@@ -43,15 +43,10 @@ MOUNT_POINT =
[LOC_UB_dir]
TYPE = DIRECTORY
-PATH = Data-UB/Data-Files
+PATH = Data-UB
MOUNT_POINT =
-[LOC_UB_Language_dir]
-TYPE = DIRECTORY
-PATH = Data-UB/Language/EN
-MOUNT_POINT =
-
-[LOC_UB_UB_Profile_dir]
+[LOC_UB_Profile_dir]
TYPE = DIRECTORY
PATH =
MOUNT_POINT =