diff --git a/app/app.vue b/app/app.vue
index 04538ee..064b605 100644
--- a/app/app.vue
+++ b/app/app.vue
@@ -16,9 +16,9 @@ const showStats = ref(false);
     </div>
 
     <div>
-      <TopScreen>
+      <HomeTopScreen>
         <Stats v-if="showStats" />
-      </TopScreen>
+      </HomeTopScreen>
     </div>
     <div>
       <HomeBottomScreen>
diff --git a/app/assets/app.css b/app/assets/app.css
index 73abc8b..b1529c0 100644
--- a/app/assets/app.css
+++ b/app/assets/app.css
@@ -1,20 +1,13 @@
-@font-face {
-  font-family: "Nintendo DS BIOS";
-  src: url("/assets/Nintendo-DS-BIOS.ttf") format("truetype");
-  font-weight: normal;
-  font-style: normal;
-}
-
 @font-face {
   font-family: "NDS7";
-  src: url("/assets/nds-7px.ttf") format("truetype");
+  src: url("/assets/fonts/nds-7px.ttf") format("truetype");
   font-weight: normal;
   font-style: normal;
 }
 
 @font-face {
   font-family: "NDS9";
-  src: url("/assets/nds-9px.ttf") format("truetype");
+  src: url("/assets/fonts/nds-9px.ttf") format("truetype");
   font-weight: normal;
   font-style: normal;
 }
diff --git a/app/assets/nds-7px.ttf b/app/assets/fonts/nds-7px.ttf
similarity index 100%
rename from app/assets/nds-7px.ttf
rename to app/assets/fonts/nds-7px.ttf
diff --git a/app/assets/nds-9px.ttf b/app/assets/fonts/nds-9px.ttf
similarity index 100%
rename from app/assets/nds-9px.ttf
rename to app/assets/fonts/nds-9px.ttf
diff --git a/app/assets/home-screen_bottom_background.png b/app/assets/images/home/bottom-screen/background.png
similarity index 100%
rename from app/assets/home-screen_bottom_background.png
rename to app/assets/images/home/bottom-screen/background.png
diff --git a/app/assets/background.png b/app/assets/images/home/top-screen/background.png
similarity index 100%
rename from app/assets/background.png
rename to app/assets/images/home/top-screen/background.png
diff --git a/app/assets/calendar_day-selector.png b/app/assets/images/home/top-screen/calendar/day-selector.png
similarity index 100%
rename from app/assets/calendar_day-selector.png
rename to app/assets/images/home/top-screen/calendar/day-selector.png
diff --git a/app/assets/calendar_last-row.png b/app/assets/images/home/top-screen/calendar/last-row.png
similarity index 100%
rename from app/assets/calendar_last-row.png
rename to app/assets/images/home/top-screen/calendar/last-row.png
diff --git a/app/assets/status-bar_battery.png b/app/assets/images/home/top-screen/status-bar/battery.png
similarity index 100%
rename from app/assets/status-bar_battery.png
rename to app/assets/images/home/top-screen/status-bar/battery.png
diff --git a/app/assets/status-bar_gba-display.png b/app/assets/images/home/top-screen/status-bar/gba-display.png
similarity index 100%
rename from app/assets/status-bar_gba-display.png
rename to app/assets/images/home/top-screen/status-bar/gba-display.png
diff --git a/app/assets/status-bar_startup-mode.png b/app/assets/images/home/top-screen/status-bar/startup-mode.png
similarity index 100%
rename from app/assets/status-bar_startup-mode.png
rename to app/assets/images/home/top-screen/status-bar/startup-mode.png
diff --git a/app/components/Home/BottomScreen/Background.vue b/app/components/Home/BottomScreen/Background.vue
index e9143be..1f588b6 100644
--- a/app/components/Home/BottomScreen/Background.vue
+++ b/app/components/Home/BottomScreen/Background.vue
@@ -11,7 +11,7 @@ useRender((ctx) => {
 <template>
   <img
     ref="backgroundImage"
-    src="/assets/home-screen_bottom_background.png"
+    src="/assets/images/home/bottom-screen/background.png"
     hidden
   />
 </template>
diff --git a/app/components/TopScreen/Background.vue b/app/components/Home/TopScreen/Background.vue
similarity index 68%
rename from app/components/TopScreen/Background.vue
rename to app/components/Home/TopScreen/Background.vue
index 4be4828..c1c81d2 100644
--- a/app/components/TopScreen/Background.vue
+++ b/app/components/Home/TopScreen/Background.vue
@@ -9,5 +9,9 @@ useRender((ctx) => {
 </script>
 
 <template>
-  <img ref="backgroundImage" src="/assets/background.png" hidden />
+  <img
+    ref="backgroundImage"
+    src="/assets/images/home/top-screen/background.png"
+    hidden
+  />
 </template>
diff --git a/app/components/TopScreen/Calendar.vue b/app/components/Home/TopScreen/Calendar.vue
similarity index 89%
rename from app/components/TopScreen/Calendar.vue
rename to app/components/Home/TopScreen/Calendar.vue
index fb7219f..7502468 100644
--- a/app/components/TopScreen/Calendar.vue
+++ b/app/components/Home/TopScreen/Calendar.vue
@@ -70,6 +70,14 @@ useRender((ctx) => {
 </script>
 
 <template>
-  <img ref="lastRowImage" src="/assets/calendar_last-row.png" hidden />
-  <img ref="daySelectorImage" src="/assets/calendar_day-selector.png" hidden />
+  <img
+    ref="lastRowImage"
+    src="/assets/images/home/top-screen/calendar/last-row.png"
+    hidden
+  />
+  <img
+    ref="daySelectorImage"
+    src="/assets/images/home/top-screen/calendar/day-selector.png"
+    hidden
+  />
 </template>
diff --git a/app/components/TopScreen/Clock.vue b/app/components/Home/TopScreen/Clock.vue
similarity index 100%
rename from app/components/TopScreen/Clock.vue
rename to app/components/Home/TopScreen/Clock.vue
diff --git a/app/components/TopScreen/StatusBar.vue b/app/components/Home/TopScreen/StatusBar.vue
similarity index 81%
rename from app/components/TopScreen/StatusBar.vue
rename to app/components/Home/TopScreen/StatusBar.vue
index b3b08a7..6a32df4 100644
--- a/app/components/TopScreen/StatusBar.vue
+++ b/app/components/Home/TopScreen/StatusBar.vue
@@ -44,11 +44,19 @@ useRender((ctx) => {
 </script>
 
 <template>
-  <img ref="gbaDisplayImage" src="/assets/status-bar_gba-display.png" hidden />
   <img
-    ref="startupModeImage"
-    src="/assets/status-bar_startup-mode.png"
+    ref="gbaDisplayImage"
+    src="/assets/images/home/top-screen/status-bar/gba-display.png"
+    hidden
+  />
+  <img
+    ref="startupModeImage"
+    src="/assets/images/home/top-screen/status-bar/startup-mode.png"
+    hidden
+  />
+  <img
+    ref="batteryImage"
+    src="/assets/images/home/top-screen/status-bar/battery.png"
     hidden
   />
-  <img ref="batteryImage" src="/assets/status-bar_battery.png" hidden />
 </template>
diff --git a/app/components/Home/TopScreen/TopScreen.vue b/app/components/Home/TopScreen/TopScreen.vue
new file mode 100644
index 0000000..9f04724
--- /dev/null
+++ b/app/components/Home/TopScreen/TopScreen.vue
@@ -0,0 +1,10 @@
+<template>
+  <Screen>
+    <HomeTopScreenBackground />
+    <HomeTopScreenCalendar />
+    <HomeTopScreenClock />
+    <HomeTopScreenStatusBar />
+
+    <slot />
+  </Screen>
+</template>
diff --git a/app/components/TopScreen/TopScreen.vue b/app/components/TopScreen/TopScreen.vue
deleted file mode 100644
index 7b2be6d..0000000
--- a/app/components/TopScreen/TopScreen.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<template>
-  <Screen>
-    <TopScreenBackground />
-    <TopScreenCalendar />
-    <TopScreenClock />
-    <TopScreenStatusBar />
-
-    <slot />
-  </Screen>
-</template>