diff --git a/src/components/website/layout/Menu.svelte b/src/app/layout/Menu.svelte
similarity index 100%
rename from src/components/website/layout/Menu.svelte
rename to src/app/layout/Menu.svelte
diff --git a/src/components/website/index/Countdown.svelte b/src/app/website/index/Countdown.svelte
similarity index 100%
rename from src/components/website/index/Countdown.svelte
rename to src/app/website/index/Countdown.svelte
diff --git a/src/components/website/index/Scroll.svelte b/src/app/website/index/Scroll.svelte
similarity index 100%
rename from src/components/website/index/Scroll.svelte
rename to src/app/website/index/Scroll.svelte
diff --git a/src/app/webite/index/Teams.svelte b/src/app/website/index/Teams.svelte
similarity index 89%
rename from src/app/webite/index/Teams.svelte
rename to src/app/website/index/Teams.svelte
index 01a6ca5..5256610 100644
--- a/src/app/webite/index/Teams.svelte
+++ b/src/app/website/index/Teams.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
   import Steve from '@assets/img/steve.png';
-  import Team from '@components/website/Team.svelte';
   import type { GetDeathsRes } from '@db/schema/death.ts';
   import { type ActionReturnType, actions } from 'astro:actions';
 
@@ -26,7 +25,10 @@
       {#each teams as team (team.id)}
         <tr>
           <td>
-            <Team name={team.name} color={team.color} />
+            <div class="flex items-center gap-x-2">
+              <div class="rounded-sm w-3 h-3" style="background-color: {team.color}"></div>
+              <h3 class="text-xs sm:text-xl">{team.name}</h3>
+            </div>
           </td>
           <td class="max-w-9 overflow-ellipsis">
             {#if team.memberOne.id}
diff --git a/src/components/website/signup/RegisteredPopup.svelte b/src/app/website/signup/RegisteredPopup.svelte
similarity index 97%
rename from src/components/website/signup/RegisteredPopup.svelte
rename to src/app/website/signup/RegisteredPopup.svelte
index 35467ab..f5e23b9 100644
--- a/src/components/website/signup/RegisteredPopup.svelte
+++ b/src/app/website/signup/RegisteredPopup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { registeredPopupState } from '@components/website/signup/RegisteredPopup.ts';
+  import { registeredPopupState } from '@app/website/signup/RegisteredPopup.ts';
   import Input from '@components/input/Input.svelte';
 
   interface Props {
diff --git a/src/components/website/signup/RegisteredPopup.ts b/src/app/website/signup/RegisteredPopup.ts
similarity index 100%
rename from src/components/website/signup/RegisteredPopup.ts
rename to src/app/website/signup/RegisteredPopup.ts
diff --git a/src/components/website/signup/RulesPopup.svelte b/src/app/website/signup/RulesPopup.svelte
similarity index 100%
rename from src/components/website/signup/RulesPopup.svelte
rename to src/app/website/signup/RulesPopup.svelte
diff --git a/src/components/website/signup/RulesPopup.ts b/src/app/website/signup/RulesPopup.ts
similarity index 100%
rename from src/components/website/signup/RulesPopup.ts
rename to src/app/website/signup/RulesPopup.ts
diff --git a/src/components/website/signup/TeamPopup.svelte b/src/app/website/signup/TeamPopup.svelte
similarity index 92%
rename from src/components/website/signup/TeamPopup.svelte
rename to src/app/website/signup/TeamPopup.svelte
index dad1a4f..d084fb4 100644
--- a/src/components/website/signup/TeamPopup.svelte
+++ b/src/app/website/signup/TeamPopup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { teamPopupOpen, teamPopupName } from '@components/website/signup/TeamPopup.ts';
+  import { teamPopupOpen, teamPopupName } from '@app/website/signup/TeamPopup.ts';
 
   let modal: HTMLDialogElement;
   let form: HTMLFormElement;
diff --git a/src/components/website/signup/TeamPopup.ts b/src/app/website/signup/TeamPopup.ts
similarity index 100%
rename from src/components/website/signup/TeamPopup.ts
rename to src/app/website/signup/TeamPopup.ts
diff --git a/src/components/website/Team.svelte b/src/components/website/Team.svelte
deleted file mode 100644
index aca3dc4..0000000
--- a/src/components/website/Team.svelte
+++ /dev/null
@@ -1,13 +0,0 @@
-<script lang="ts">
-  interface Props {
-    name: string;
-    color: string;
-  }
-
-  const { name, color }: Props = $props();
-</script>
-
-<div class="flex items-center gap-x-2">
-  <div class="rounded-sm w-3 h-3" style="background-color: {color}"></div>
-  <h3 class="text-xs sm:text-xl">{name}</h3>
-</div>
diff --git a/src/layouts/website/WebsiteLayout.astro b/src/layouts/website/WebsiteLayout.astro
index 872c123..b487945 100644
--- a/src/layouts/website/WebsiteLayout.astro
+++ b/src/layouts/website/WebsiteLayout.astro
@@ -2,7 +2,7 @@
 import '@assets/website_layout.css';
 import BaseLayout from '../BaseLayout.astro';
 import { Icon } from 'astro-icon/components';
-import Menu from '@components/website/layout/Menu.svelte';
+import Menu from '@app/layout/Menu.svelte';
 
 interface Props {
   title: string;
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 6addb7e..e88cd2f 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -1,8 +1,8 @@
 ---
 import WebsiteLayout from '@layouts/website/WebsiteLayout.astro';
-import Scroll from '@components/website/index/Scroll.svelte';
-import Teams from '@app/webite/index/Teams.svelte';
-import Countdown from '@components/website/index/Countdown.svelte';
+import Scroll from '@app/website/index/Scroll.svelte';
+import Teams from '@app/website/index/Teams.svelte';
+import Countdown from '@app/website/index/Countdown.svelte';
 import Varo from '@assets/img/varo.webp';
 import Background from '@assets/img/background.webp';
 import { START_DATE } from 'astro:env/server';
diff --git a/src/pages/signup.astro b/src/pages/signup.astro
index 6e7c87c..2bf4691 100644
--- a/src/pages/signup.astro
+++ b/src/pages/signup.astro
@@ -2,10 +2,10 @@
 import WebsiteLayout from '@layouts/website/WebsiteLayout.astro';
 import Checkbox from '@components/input/Checkbox.svelte';
 import Input from '@components/input/Input.svelte';
-import RulesPopup from '@components/website/signup/RulesPopup.svelte';
+import RulesPopup from '@app/website/signup/RulesPopup.svelte';
 import Popup from '@components/popup/Popup.svelte';
-import TeamPopup from '@components/website/signup/TeamPopup.svelte';
-import RegisteredPopup from '@components/website/signup/RegisteredPopup.svelte';
+import TeamPopup from '@app/website/signup/TeamPopup.svelte';
+import RegisteredPopup from '@app/website/signup/RegisteredPopup.svelte';
 import { getSettings, SettingKey } from '@util/settings';
 import { db } from '@db/database.ts';
 import { DISCORD_LINK, PAYPAL_LINK, START_DATE, TEAMSPEAK_LINK } from 'astro:env/server';
@@ -151,9 +151,9 @@ const signupDisabledSubMessage = signupSetting[SettingKey.SignupDisabledSubMessa
 <script>
   import { actions } from 'astro:actions';
   import { popupState } from '@components/popup/Popup';
-  import { rulesPopupState, rulesPopupRead } from '@components/website/signup/RulesPopup';
-  import { teamPopupName, teamPopupOpen } from '@components/website/signup/TeamPopup';
-  import { registeredPopupState } from '@components/website/signup/RegisteredPopup';
+  import { rulesPopupState, rulesPopupRead } from '@app/website/signup/RulesPopup';
+  import { teamPopupName, teamPopupOpen } from '@app/website/signup/TeamPopup';
+  import { registeredPopupState } from '@app/website/signup/RegisteredPopup';
 
   /* ----- client validation ----- */
   const rulesCheckbox = document.getElementById('rules')! as HTMLInputElement;