diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte
index d671866..970dbfb 100644
--- a/frontend/src/App.svelte
+++ b/frontend/src/App.svelte
@@ -2,12 +2,12 @@
   import { _ } from 'svelte-i18n'
 	import NavigationBar from './components/General/NavigationBar.svelte';
   import Clock from './components/General/Clock.svelte'
-  import Preparation from './components/Preparation.svelte';
-  import Animation from './components/Animation.svelte';
+  import Preparation from './components/Preparation/Preparation.svelte';
+  import Animation from './components/Animation/Animation.svelte';
   import Settings from './components/Settings/Settings.svelte';
-  import Devices from './components/Devices.svelte';
-  import Show from './components/Show.svelte';
-  import GeneralConsole from './components/GeneralConsole.svelte';
+  import Devices from './components/Devices/Devices.svelte';
+  import Show from './components/Show/Show.svelte';
+  import GeneralConsole from './components/Console/GeneralConsole.svelte';
 
   let selectedMenu = "settings"
   // When the navigation menu changed, update the selected menu
diff --git a/frontend/src/components/Animation.svelte b/frontend/src/components/Animation/Animation.svelte
similarity index 100%
rename from frontend/src/components/Animation.svelte
rename to frontend/src/components/Animation/Animation.svelte
diff --git a/frontend/src/components/GeneralConsole.svelte b/frontend/src/components/Console/GeneralConsole.svelte
similarity index 100%
rename from frontend/src/components/GeneralConsole.svelte
rename to frontend/src/components/Console/GeneralConsole.svelte
diff --git a/frontend/src/components/Devices.svelte b/frontend/src/components/Devices/Devices.svelte
similarity index 100%
rename from frontend/src/components/Devices.svelte
rename to frontend/src/components/Devices/Devices.svelte
diff --git a/frontend/src/components/Preparation.svelte b/frontend/src/components/Preparation/Preparation.svelte
similarity index 100%
rename from frontend/src/components/Preparation.svelte
rename to frontend/src/components/Preparation/Preparation.svelte
diff --git a/frontend/src/components/Settings/InputsOutputsContent.svelte b/frontend/src/components/Settings/InputsOutputsContent.svelte
index 652a6b5..60925a3 100644
--- a/frontend/src/components/Settings/InputsOutputsContent.svelte
+++ b/frontend/src/components/Settings/InputsOutputsContent.svelte
@@ -2,7 +2,7 @@
 
 </script>
 
-<button>You can change your hardware settings here</button>
+<p>This is the Inputs & outputs page</p>
 
 <style>
 
diff --git a/frontend/src/components/Show.svelte b/frontend/src/components/Show/Show.svelte
similarity index 100%
rename from frontend/src/components/Show.svelte
rename to frontend/src/components/Show/Show.svelte