diff --git a/src/client/Main.ts b/src/client/Main.ts
index 2194a0111..90ebb4ec1 100644
--- a/src/client/Main.ts
+++ b/src/client/Main.ts
@@ -19,10 +19,10 @@ import { JoinPrivateLobbyModal } from "./JoinPrivateLobbyModal";
 import "./PublicLobby";
 import { PublicLobby } from "./PublicLobby";
 import { SinglePlayerModal } from "./SinglePlayerModal";
-import { UserSettingModal } from "./UserSettingModal";
 import "./UsernameInput";
 import { UsernameInput } from "./UsernameInput";
 import { generateCryptoRandomUUID } from "./Utils";
+import { UserSettingModal } from "./components/UserSettingModal";
 import "./components/baseComponents/Button";
 import "./components/baseComponents/Modal";
 import "./components/baseComponents/Select";
diff --git a/src/client/Utils.ts b/src/client/Utils.ts
index 68c563c9a..b8db06665 100644
--- a/src/client/Utils.ts
+++ b/src/client/Utils.ts
@@ -1,4 +1,4 @@
-import { UserSettingModal } from "./UserSettingModal";
+import { UserSettingModal } from "./components/UserSettingModal";
 
 export function renderTroops(troops: number): string {
   return renderNumber(troops / 10);
diff --git a/src/client/UserSettingModal.ts b/src/client/components/UserSettingModal.ts
similarity index 90%
rename from src/client/UserSettingModal.ts
rename to src/client/components/UserSettingModal.ts
index 3fb746338..132c00312 100644
--- a/src/client/UserSettingModal.ts
+++ b/src/client/components/UserSettingModal.ts
@@ -1,27 +1,27 @@
 import { LitElement, html } from "lit";
 import { customElement, query, state } from "lit/decorators.js";
-import bg from "../../resources/lang/bg.json";
-import bn from "../../resources/lang/bn.json";
-import de from "../../resources/lang/de.json";
-import en from "../../resources/lang/en.json";
-import eo from "../../resources/lang/eo.json";
-import es from "../../resources/lang/es.json";
-import fr from "../../resources/lang/fr.json";
-import hi from "../../resources/lang/hi.json";
-import it from "../../resources/lang/it.json";
-import ja from "../../resources/lang/ja.json";
-import nl from "../../resources/lang/nl.json";
-import pl from "../../resources/lang/pl.json";
-import pt_br from "../../resources/lang/pt_br.json";
-import ru from "../../resources/lang/ru.json";
-import sh from "../../resources/lang/sh.json";
-import tr from "../../resources/lang/tr.json";
-import uk from "../../resources/lang/uk.json";
-import { UserSettings } from "../core/game/UserSettings";
-import "./components/baseComponents/Select";
-import "./components/baseComponents/setting/SettingNumber";
-import "./components/baseComponents/setting/SettingSlider";
-import "./components/baseComponents/setting/SettingToggle";
+import bg from "../../../resources/lang/bg.json";
+import bn from "../../../resources/lang/bn.json";
+import de from "../../../resources/lang/de.json";
+import en from "../../../resources/lang/en.json";
+import eo from "../../../resources/lang/eo.json";
+import es from "../../../resources/lang/es.json";
+import fr from "../../../resources/lang/fr.json";
+import hi from "../../../resources/lang/hi.json";
+import it from "../../../resources/lang/it.json";
+import ja from "../../../resources/lang/ja.json";
+import nl from "../../../resources/lang/nl.json";
+import pl from "../../../resources/lang/pl.json";
+import pt_br from "../../../resources/lang/pt_br.json";
+import ru from "../../../resources/lang/ru.json";
+import sh from "../../../resources/lang/sh.json";
+import tr from "../../../resources/lang/tr.json";
+import uk from "../../../resources/lang/uk.json";
+import { UserSettings } from "../../core/game/UserSettings";
+import "./baseComponents/Select";
+import "./baseComponents/setting/SettingNumber";
+import "./baseComponents/setting/SettingSlider";
+import "./baseComponents/setting/SettingToggle";
 
 @customElement("user-setting")
 export class UserSettingModal extends LitElement {