diff --git a/frontend/src/ts/settings/settings-group.ts b/frontend/src/ts/elements/settings/settings-group.ts
similarity index 97%
rename from frontend/src/ts/settings/settings-group.ts
rename to frontend/src/ts/elements/settings/settings-group.ts
index 116066667..cefb61e46 100644
--- a/frontend/src/ts/settings/settings-group.ts
+++ b/frontend/src/ts/elements/settings/settings-group.ts
@@ -1,5 +1,5 @@
-import Config from "../config";
-import * as Notifications from "../elements/notifications";
+import Config from "../../config";
+import * as Notifications from "../notifications";
 import SlimSelect from "slim-select";
 
 export default class SettingsGroup<T extends SharedTypes.ConfigValue> {
diff --git a/frontend/src/ts/settings/theme-picker.ts b/frontend/src/ts/elements/settings/theme-picker.ts
similarity index 96%
rename from frontend/src/ts/settings/theme-picker.ts
rename to frontend/src/ts/elements/settings/theme-picker.ts
index 3af265f29..1cc0bfcae 100644
--- a/frontend/src/ts/settings/theme-picker.ts
+++ b/frontend/src/ts/elements/settings/theme-picker.ts
@@ -1,16 +1,16 @@
-import Config, * as UpdateConfig from "../config";
-import * as ThemeController from "../controllers/theme-controller";
-import * as Misc from "../utils/misc";
-import * as JSONData from "../utils/json-data";
-import * as Colors from "../utils/colors";
-import * as Notifications from "../elements/notifications";
-import * as ThemeColors from "../elements/theme-colors";
-import * as ChartController from "../controllers/chart-controller";
-import * as Loader from "../elements/loader";
-import * as DB from "../db";
-import * as ConfigEvent from "../observables/config-event";
-import { isAuthenticated } from "../firebase";
-import * as ActivePage from "../states/active-page";
+import Config, * as UpdateConfig from "../../config";
+import * as ThemeController from "../../controllers/theme-controller";
+import * as Misc from "../../utils/misc";
+import * as JSONData from "../../utils/json-data";
+import * as Colors from "../../utils/colors";
+import * as Notifications from "../notifications";
+import * as ThemeColors from "../theme-colors";
+import * as ChartController from "../../controllers/chart-controller";
+import * as Loader from "../loader";
+import * as DB from "../../db";
+import * as ConfigEvent from "../../observables/config-event";
+import { isAuthenticated } from "../../firebase";
+import * as ActivePage from "../../states/active-page";
 
 function updateActiveButton(): void {
   let activeThemeName = Config.theme;
diff --git a/frontend/src/ts/modals/simple-modals.ts b/frontend/src/ts/modals/simple-modals.ts
index 5d62756cc..c224de9ac 100644
--- a/frontend/src/ts/modals/simple-modals.ts
+++ b/frontend/src/ts/modals/simple-modals.ts
@@ -5,7 +5,7 @@ import * as UpdateConfig from "../config";
 import * as Loader from "../elements/loader";
 import * as Notifications from "../elements/notifications";
 import * as Settings from "../pages/settings";
-import * as ThemePicker from "../settings/theme-picker";
+import * as ThemePicker from "../elements/settings/theme-picker";
 import * as CustomText from "../test/custom-text";
 import * as AccountButton from "../elements/account-button";
 import { FirebaseError } from "firebase/app";
diff --git a/frontend/src/ts/pages/settings.ts b/frontend/src/ts/pages/settings.ts
index be5fd62bf..9c7193c36 100644
--- a/frontend/src/ts/pages/settings.ts
+++ b/frontend/src/ts/pages/settings.ts
@@ -1,4 +1,4 @@
-import SettingsGroup from "../settings/settings-group";
+import SettingsGroup from "../elements/settings/settings-group";
 import Config, * as UpdateConfig from "../config";
 import * as Sound from "../controllers/sound-controller";
 import * as Misc from "../utils/misc";
@@ -8,7 +8,7 @@ import * as DB from "../db";
 import { toggleFunbox } from "../test/funbox/funbox";
 import * as TagController from "../controllers/tag-controller";
 import * as PresetController from "../controllers/preset-controller";
-import * as ThemePicker from "../settings/theme-picker";
+import * as ThemePicker from "../elements/settings/theme-picker";
 import * as Notifications from "../elements/notifications";
 import * as ImportExportSettingsModal from "../modals/import-export-settings";
 import * as ConfigEvent from "../observables/config-event";