diff --git a/app/src/components/CommandlistPart.vue b/app/src/components/game/CommandlistPart.vue
similarity index 100%
rename from app/src/components/CommandlistPart.vue
rename to app/src/components/game/CommandlistPart.vue
diff --git a/app/src/components/CompleteModal.vue b/app/src/components/game/CompleteModal.vue
similarity index 100%
rename from app/src/components/CompleteModal.vue
rename to app/src/components/game/CompleteModal.vue
diff --git a/app/src/components/ControlPalette.vue b/app/src/components/game/ControlPalette.vue
similarity index 100%
rename from app/src/components/ControlPalette.vue
rename to app/src/components/game/ControlPalette.vue
diff --git a/app/src/components/HintPart.vue b/app/src/components/game/HintPart.vue
similarity index 100%
rename from app/src/components/HintPart.vue
rename to app/src/components/game/HintPart.vue
diff --git a/app/src/components/QuestPart.vue b/app/src/components/game/QuestPart.vue
similarity index 100%
rename from app/src/components/QuestPart.vue
rename to app/src/components/game/QuestPart.vue
diff --git a/app/src/components/TerminalPart.vue b/app/src/components/game/TerminalPart.vue
similarity index 100%
rename from app/src/components/TerminalPart.vue
rename to app/src/components/game/TerminalPart.vue
diff --git a/app/src/components/TreeChart.vue b/app/src/components/game/TreeChart.vue
similarity index 100%
rename from app/src/components/TreeChart.vue
rename to app/src/components/game/TreeChart.vue
diff --git a/app/src/components/VisualizationPart.vue b/app/src/components/game/VisualizationPart.vue
similarity index 100%
rename from app/src/components/VisualizationPart.vue
rename to app/src/components/game/VisualizationPart.vue
diff --git a/app/src/components/GameHeaderComponents.vue b/app/src/components/header/GameHeaderComponents.vue
similarity index 100%
rename from app/src/components/GameHeaderComponents.vue
rename to app/src/components/header/GameHeaderComponents.vue
diff --git a/app/src/components/HeaderPart.vue b/app/src/components/header/HeaderPart.vue
similarity index 100%
rename from app/src/components/HeaderPart.vue
rename to app/src/components/header/HeaderPart.vue
diff --git a/app/src/components/LandingHeaderComponents.vue b/app/src/components/header/LandingHeaderComponents.vue
similarity index 100%
rename from app/src/components/LandingHeaderComponents.vue
rename to app/src/components/header/LandingHeaderComponents.vue
diff --git a/app/src/views/GamePage.vue b/app/src/views/GamePage.vue
index 591df48..6fd5614 100644
--- a/app/src/views/GamePage.vue
+++ b/app/src/views/GamePage.vue
@@ -2,15 +2,15 @@
 import { computed, onMounted } from 'vue'
 import { useToast } from 'vue-toastification'
 import sessionStore, { init } from '../store/session'
-import HeaderPart from '../components/HeaderPart.vue'
-import GameHeaderComponents from '../components/GameHeaderComponents.vue'
+import HeaderPart from '../components/header/HeaderPart.vue'
+import GameHeaderComponents from '../components/header/GameHeaderComponents.vue'
 // import CommandlistPart from '../components/CommandlistPart.vue'
-import HintPart from '../components/HintPart.vue'
-import QuestPart from '../components/QuestPart.vue'
-import TerminalPart from '../components/TerminalPart.vue'
-import VisualizationPart from '../components/VisualizationPart.vue'
-import ControlPalette from '../components/ControlPalette.vue'
-import CompleteModal from '../components/CompleteModal.vue'
+import HintPart from '../components/game/HintPart.vue'
+import QuestPart from '../components/game/QuestPart.vue'
+import TerminalPart from '../components/game/TerminalPart.vue'
+import VisualizationPart from '../components/game/VisualizationPart.vue'
+import ControlPalette from '../components/game/ControlPalette.vue'
+import CompleteModal from '../components/game/CompleteModal.vue'
 import { LoadQuestError, LoadSessionError } from '../utils/errors'
 
 const completed = computed(() => {
diff --git a/app/src/views/LandingPage.vue b/app/src/views/LandingPage.vue
index c20cfb7..e148dab 100644
--- a/app/src/views/LandingPage.vue
+++ b/app/src/views/LandingPage.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import ContactButton from '../components/ContactButton.vue'
 import DynamicBackground from '../components/DynamicBackground.vue'
-import LandingHeaderComponents from '../components/LandingHeaderComponents.vue'
-import HeaderPart from '../components/HeaderPart.vue'
+import LandingHeaderComponents from '../components/header/LandingHeaderComponents.vue'
+import HeaderPart from '../components/header/HeaderPart.vue'
 
 import { facebookUrl, githubUrl } from '../config'
 </script>
diff --git a/app/src/views/QuestMapPage.vue b/app/src/views/QuestMapPage.vue
index 527523d..c0497e9 100644
--- a/app/src/views/QuestMapPage.vue
+++ b/app/src/views/QuestMapPage.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import QuestMap from '../components/QuestMap.vue'
-import HeaderPart from '../components/HeaderPart.vue'
-import GameHeaderComponents from '../components/GameHeaderComponents.vue'
+import HeaderPart from '../components/header/HeaderPart.vue'
+import GameHeaderComponents from '../components/header/GameHeaderComponents.vue'
 </script>
 
 <template>