diff --git a/components/header.js b/components/header.js
new file mode 100644
index 0000000..03a86ec
--- /dev/null
+++ b/components/header.js
@@ -0,0 +1,13 @@
+import React from 'react'
+
+export default function Header() {
+  return (
+    <>
+      <h1 className="text-3xl">Pfadi Bussle Buchen</h1>
+
+      <p className="mb-8">
+        Du willst das Pfadi Bussle buchen? Hier bist du richtig!
+      </p>
+    </>
+  )
+}
diff --git a/components/contact.js b/components/wizard/contact.js
similarity index 97%
rename from components/contact.js
rename to components/wizard/contact.js
index 754be19..d172669 100644
--- a/components/contact.js
+++ b/components/wizard/contact.js
@@ -1,5 +1,5 @@
 import React, { useContext } from 'react'
-import { WizardContext } from '../context/wizardStore'
+import { WizardContext } from './context/wizardStore'
 import Required from './required'
 
 export default function Contact() {
diff --git a/context/wizardStore.js b/components/wizard/context/wizardStore.js
similarity index 99%
rename from context/wizardStore.js
rename to components/wizard/context/wizardStore.js
index 1a143df..9e14fe3 100644
--- a/context/wizardStore.js
+++ b/components/wizard/context/wizardStore.js
@@ -4,7 +4,7 @@ import {
   storeBookingData,
   loadBookingData,
   clearBookingData,
-} from '../helpers/storage'
+} from '../../../helpers/storage'
 
 export const WizardContext = React.createContext()
 
diff --git a/components/dateSelect.js b/components/wizard/dateSelect.js
similarity index 95%
rename from components/dateSelect.js
rename to components/wizard/dateSelect.js
index e836e75..2834791 100644
--- a/components/dateSelect.js
+++ b/components/wizard/dateSelect.js
@@ -1,14 +1,14 @@
 import React, { useContext, useState, useRef, useEffect } from 'react'
 import useSWR from 'swr'
 
-import { WizardContext } from '../context/wizardStore'
+import { WizardContext } from './context/wizardStore'
 
 import { DateUtils } from 'react-day-picker'
 import DayPickerInput from 'react-day-picker/DayPickerInput'
 
 import Required from './required'
-import { dateFormatBackend } from '../helpers/date'
-import { getNextSmaller, getNextBigger } from '../helpers/array'
+import { dateFormatBackend } from '../../helpers/date'
+import { getNextSmaller, getNextBigger } from '../../helpers/array'
 
 import MomentLocaleUtils, {
   formatDate,
diff --git a/components/wizard.js b/components/wizard/index.js
similarity index 97%
rename from components/wizard.js
rename to components/wizard/index.js
index e79f89b..e242349 100644
--- a/components/wizard.js
+++ b/components/wizard/index.js
@@ -2,7 +2,7 @@ import React, { useContext } from 'react'
 
 import Link from 'next/link'
 
-import WizardStore, { WizardContext } from '../context/wizardStore'
+import WizardStore, { WizardContext } from './context/wizardStore'
 
 import DateSelect from './dateSelect'
 import Reason from './reason'
diff --git a/components/reason.js b/components/wizard/reason.js
similarity index 96%
rename from components/reason.js
rename to components/wizard/reason.js
index f3d1f4a..848377f 100644
--- a/components/reason.js
+++ b/components/wizard/reason.js
@@ -1,5 +1,5 @@
 import React, { useContext } from 'react'
-import { WizardContext } from '../context/wizardStore'
+import { WizardContext } from './context/wizardStore'
 import Required from './required'
 
 export default function Contact() {
diff --git a/components/required.js b/components/wizard/required.js
similarity index 100%
rename from components/required.js
rename to components/wizard/required.js
diff --git a/pages/booking/[uuid].js b/pages/booking/[uuid].js
index a481866..5ed5023 100644
--- a/pages/booking/[uuid].js
+++ b/pages/booking/[uuid].js
@@ -1,6 +1,5 @@
 import React, { useContext } from 'react'
 
-import { WizardContext } from '../../context/wizardStore'
 import Footer from '../../components/footer'
 
 // TODO: load booking somehow if we navigate to booking
diff --git a/pages/index.js b/pages/index.js
index 909a28b..18e5992 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -2,8 +2,9 @@ import React from 'react'
 
 import Head from 'next/head'
 
-import Wizard from '../components/wizard'
+import Header from '../components/header'
 import Footer from '../components/footer'
+import Wizard from '../components/wizard/index'
 
 export default function Home() {
   return (
@@ -13,16 +14,10 @@ export default function Home() {
         <link rel="icon" href="/favicon.ico" />
       </Head>
 
+      <Header />
       <main className="flex-grow">
-        <h1 className="text-3xl">Pfadi Bussle Buchen</h1>
-
-        <p className="mb-8">
-          Du willst das Pfadi Bussle buchen? Hier bist du richtig!
-        </p>
-
         <Wizard />
       </main>
-
       <Footer />
     </div>
   )