diff --git a/core/ui/ControlPanel/Advanced/EditorTypes.tid b/core/ui/ControlPanel/EditorTypes.tid
similarity index 100%
rename from core/ui/ControlPanel/Advanced/EditorTypes.tid
rename to core/ui/ControlPanel/EditorTypes.tid
diff --git a/core/ui/ControlPanel/Advanced/LoadedModules.tid b/core/ui/ControlPanel/LoadedModules.tid
similarity index 100%
rename from core/ui/ControlPanel/Advanced/LoadedModules.tid
rename to core/ui/ControlPanel/LoadedModules.tid
diff --git a/core/ui/ControlPanel/Appearance/Palette.tid b/core/ui/ControlPanel/Palette.tid
similarity index 100%
rename from core/ui/ControlPanel/Appearance/Palette.tid
rename to core/ui/ControlPanel/Palette.tid
diff --git a/core/ui/ControlPanel/Advanced/Settings.tid b/core/ui/ControlPanel/Settings.tid
similarity index 100%
rename from core/ui/ControlPanel/Advanced/Settings.tid
rename to core/ui/ControlPanel/Settings.tid
diff --git a/core/ui/ControlPanel/Advanced/Settings/NavigationAddressBar.tid b/core/ui/ControlPanel/Settings/NavigationAddressBar.tid
similarity index 100%
rename from core/ui/ControlPanel/Advanced/Settings/NavigationAddressBar.tid
rename to core/ui/ControlPanel/Settings/NavigationAddressBar.tid
diff --git a/core/ui/ControlPanel/Advanced/Settings/NavigationHistory.tid b/core/ui/ControlPanel/Settings/NavigationHistory.tid
similarity index 100%
rename from core/ui/ControlPanel/Advanced/Settings/NavigationHistory.tid
rename to core/ui/ControlPanel/Settings/NavigationHistory.tid
diff --git a/core/ui/ControlPanel/Advanced/Settings/ToolbarButtons.tid b/core/ui/ControlPanel/Settings/ToolbarButtons.tid
similarity index 100%
rename from core/ui/ControlPanel/Advanced/Settings/ToolbarButtons.tid
rename to core/ui/ControlPanel/Settings/ToolbarButtons.tid
diff --git a/core/ui/ControlPanel/Appearance/StoryView.tid b/core/ui/ControlPanel/StoryView.tid
similarity index 100%
rename from core/ui/ControlPanel/Appearance/StoryView.tid
rename to core/ui/ControlPanel/StoryView.tid
diff --git a/core/ui/ControlPanel/Appearance/Theme.tid b/core/ui/ControlPanel/Theme.tid
similarity index 100%
rename from core/ui/ControlPanel/Appearance/Theme.tid
rename to core/ui/ControlPanel/Theme.tid
diff --git a/core/ui/ControlPanel/Advanced/TiddlerFields.tid b/core/ui/ControlPanel/TiddlerFields.tid
similarity index 100%
rename from core/ui/ControlPanel/Advanced/TiddlerFields.tid
rename to core/ui/ControlPanel/TiddlerFields.tid
diff --git a/core/ui/ControlPanel/Appearance/Toolbars.tid b/core/ui/ControlPanel/Toolbars.tid
similarity index 100%
rename from core/ui/ControlPanel/Appearance/Toolbars.tid
rename to core/ui/ControlPanel/Toolbars.tid
diff --git a/core/ui/ControlPanel/Appearance/Toolbars/EditToolbar.tid b/core/ui/ControlPanel/Toolbars/EditToolbar.tid
similarity index 100%
rename from core/ui/ControlPanel/Appearance/Toolbars/EditToolbar.tid
rename to core/ui/ControlPanel/Toolbars/EditToolbar.tid
diff --git a/core/ui/ControlPanel/Appearance/Toolbars/PageControls.tid b/core/ui/ControlPanel/Toolbars/PageControls.tid
similarity index 100%
rename from core/ui/ControlPanel/Appearance/Toolbars/PageControls.tid
rename to core/ui/ControlPanel/Toolbars/PageControls.tid
diff --git a/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar.tid b/core/ui/ControlPanel/Toolbars/ViewToolbar.tid
similarity index 100%
rename from core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar.tid
rename to core/ui/ControlPanel/Toolbars/ViewToolbar.tid