diff --git a/pages/components/contact.js b/components/contact.js
similarity index 100%
rename from pages/components/contact.js
rename to components/contact.js
diff --git a/pages/components/dateSelect.js b/components/dateSelect.js
similarity index 98%
rename from pages/components/dateSelect.js
rename to components/dateSelect.js
index c31658f..f5c5c4f 100644
--- a/pages/components/dateSelect.js
+++ b/components/dateSelect.js
@@ -10,7 +10,7 @@ import 'react-dates/initialize'
 import { DateRangePicker, SingleDatePicker } from 'react-dates'
 
 import Required from './required'
-import { dateFormat } from '../../helpers/date'
+import { dateFormat } from '../helpers/date'
 
 const fetcher = (path) => fetch(path).then((r) => r.json())
 
diff --git a/pages/components/reason.js b/components/reason.js
similarity index 100%
rename from pages/components/reason.js
rename to components/reason.js
diff --git a/pages/components/required.js b/components/required.js
similarity index 100%
rename from pages/components/required.js
rename to components/required.js
diff --git a/pages/components/wizard.js b/components/wizard.js
similarity index 100%
rename from pages/components/wizard.js
rename to components/wizard.js
diff --git a/pages/context/wizardStore.js b/context/wizardStore.js
similarity index 97%
rename from pages/context/wizardStore.js
rename to context/wizardStore.js
index 5004231..ab386e6 100644
--- a/pages/context/wizardStore.js
+++ b/context/wizardStore.js
@@ -1,6 +1,6 @@
 import React, { useReducer, useEffect } from 'react'
 
-import { storeFormData, loadFormData } from '../../helpers/storage'
+import { storeFormData, loadFormData } from '../helpers/storage'
 
 export const WizardContext = React.createContext()
 
diff --git a/pages/api/db/index.js b/db/index.js
similarity index 100%
rename from pages/api/db/index.js
rename to db/index.js
diff --git a/pages/api/db/schema.js b/db/schema.js
similarity index 95%
rename from pages/api/db/schema.js
rename to db/schema.js
index e7b74e4..1971af4 100644
--- a/pages/api/db/schema.js
+++ b/db/schema.js
@@ -1,6 +1,6 @@
 import { Schema } from 'mongoose'
 
-import { getDays, dateFormat } from '../../../helpers/date'
+import { getDays, dateFormat } from '../helpers/date'
 
 export const BookerSchema = new Schema(
   {
diff --git a/pages/api/booking.js b/pages/api/booking.js
index a698875..7c0c9d8 100644
--- a/pages/api/booking.js
+++ b/pages/api/booking.js
@@ -1,4 +1,4 @@
-import { createBooking } from './db/index'
+import { createBooking } from '../../db/index'
 import { Error } from 'mongoose'
 
 export default async function userHandler(req, res) {
diff --git a/pages/api/daysbooked.js b/pages/api/daysbooked.js
index f917258..71e5e1e 100644
--- a/pages/api/daysbooked.js
+++ b/pages/api/daysbooked.js
@@ -1,6 +1,6 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 
-import { getBookedDays } from './db/index'
+import { getBookedDays } from '../../db/index'
 
 export default async function useHandler(req, res) {
   const { method } = req
diff --git a/pages/index.js b/pages/index.js
index 0e2559e..633b83e 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -1,6 +1,6 @@
 import Head from 'next/head'
 
-import Wizard from './components/wizard'
+import Wizard from '../components/wizard'
 
 export default function Home() {
   return (