diff --git a/AquaNet/src/components/GameSettingFields.svelte b/AquaNet/src/components/settings/GameSettingFields.svelte
similarity index 87%
rename from AquaNet/src/components/GameSettingFields.svelte
rename to AquaNet/src/components/settings/GameSettingFields.svelte
index 4364e181..8d5e09ad 100644
--- a/AquaNet/src/components/GameSettingFields.svelte
+++ b/AquaNet/src/components/settings/GameSettingFields.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import { slide } from "svelte/transition";
-  import { SETTING } from "../libs/sdk";
-  import type { GameOption } from "../libs/generalTypes";
-  import { ts } from "../libs/i18n";
-  import StatusOverlays from "./StatusOverlays.svelte";
-  import InputWithButton from "./ui/InputWithButton.svelte";
+  import { SETTING } from "../../libs/sdk";
+  import type { GameOption } from "../../libs/generalTypes";
+  import { ts } from "../../libs/i18n";
+  import StatusOverlays from "../StatusOverlays.svelte";
+  import InputWithButton from "../ui/InputWithButton.svelte";
 
   export let game: string;
   let gameFields: GameOption[] = []
diff --git a/AquaNet/src/components/GeneralGameSettings.svelte b/AquaNet/src/components/settings/GeneralGameSettings.svelte
similarity index 86%
rename from AquaNet/src/components/GeneralGameSettings.svelte
rename to AquaNet/src/components/settings/GeneralGameSettings.svelte
index d51c3f6f..0a634303 100644
--- a/AquaNet/src/components/GeneralGameSettings.svelte
+++ b/AquaNet/src/components/settings/GeneralGameSettings.svelte
@@ -1,9 +1,9 @@
 <script>
   import { fade } from "svelte/transition";
-  import { FADE_IN, FADE_OUT } from "../libs/config";
+  import { FADE_IN, FADE_OUT } from "../../libs/config";
   import GameSettingFields from "./GameSettingFields.svelte";
-  import { ts } from "../libs/i18n";
-  import useLocalStorage from "../libs/hooks/useLocalStorage.svelte";
+  import { ts } from "../../libs/i18n";
+  import useLocalStorage from "../../libs/hooks/useLocalStorage.svelte";
 
   const rounding = useLocalStorage("rounding", true);
 </script>
diff --git a/AquaNet/src/components/Mai2Settings.svelte b/AquaNet/src/components/settings/Mai2Settings.svelte
similarity index 93%
rename from AquaNet/src/components/Mai2Settings.svelte
rename to AquaNet/src/components/settings/Mai2Settings.svelte
index 34dfb3f3..544b2ce8 100644
--- a/AquaNet/src/components/Mai2Settings.svelte
+++ b/AquaNet/src/components/settings/Mai2Settings.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import { slide, fade } from "svelte/transition";
-  import { FADE_IN, FADE_OUT } from "../libs/config";
-  import { t } from "../libs/i18n.js";
+  import { FADE_IN, FADE_OUT } from "../../libs/config";
+  import { t } from "../../libs/i18n.js";
   import Icon from "@iconify/svelte";
-  import StatusOverlays from "./StatusOverlays.svelte";
-  import { GAME } from "../libs/sdk";
+  import StatusOverlays from "../StatusOverlays.svelte";
+  import { GAME } from "../../libs/sdk";
 
   const profileFields = [
     ['name', t('settings.mai2.name')],
diff --git a/AquaNet/src/components/WaccaSettings.svelte b/AquaNet/src/components/settings/WaccaSettings.svelte
similarity index 78%
rename from AquaNet/src/components/WaccaSettings.svelte
rename to AquaNet/src/components/settings/WaccaSettings.svelte
index 1cd62380..9d442758 100644
--- a/AquaNet/src/components/WaccaSettings.svelte
+++ b/AquaNet/src/components/settings/WaccaSettings.svelte
@@ -1,6 +1,6 @@
 <script>
   import { fade } from "svelte/transition";
-  import { FADE_IN, FADE_OUT } from "../libs/config";
+  import { FADE_IN, FADE_OUT } from "../../libs/config";
   import GameSettingFields from "./GameSettingFields.svelte";
 </script>
 
diff --git a/AquaNet/src/pages/User/Settings.svelte b/AquaNet/src/pages/User/Settings.svelte
index 8f1a0cb9..ca4f8e1b 100644
--- a/AquaNet/src/pages/User/Settings.svelte
+++ b/AquaNet/src/pages/User/Settings.svelte
@@ -9,10 +9,10 @@
   import { pfp } from "../../libs/ui";
   import { t, ts } from "../../libs/i18n";
   import { FADE_IN, FADE_OUT } from "../../libs/config";
-  import UserBox from "../../components/UserBox.svelte";
-  import Mai2Settings from "../../components/Mai2Settings.svelte";
-  import WaccaSettings from "../../components/WaccaSettings.svelte";
-  import GeneralGameSettings from "../../components/GeneralGameSettings.svelte";
+  import UserBox from "../../components/settings/ChuniSettings.svelte";
+  import Mai2Settings from "../../components/settings/Mai2Settings.svelte";
+  import WaccaSettings from "../../components/settings/WaccaSettings.svelte";
+  import GeneralGameSettings from "../../components/settings/GeneralGameSettings.svelte";
 
   USER.ensureLoggedIn()