diff --git a/app/core/Config.php b/app/core/Config.php
index 72b7dc4..d72c8ff 100644
--- a/app/core/Config.php
+++ b/app/core/Config.php
@@ -1,6 +1,6 @@
 <?php
 
-// TODO: ...
+// TODO: ... this should validate the config and stuffs
 class Config
 {
     public array $config;
diff --git a/app/view/confirm-logout.php b/app/view/pages/confirm-logout.php
similarity index 100%
rename from app/view/confirm-logout.php
rename to app/view/pages/confirm-logout.php
diff --git a/app/view/example.php b/app/view/pages/example.php
similarity index 100%
rename from app/view/example.php
rename to app/view/pages/example.php
diff --git a/app/view/index.php b/app/view/pages/index.php
similarity index 100%
rename from app/view/index.php
rename to app/view/pages/index.php
diff --git a/app/view/login.php b/app/view/pages/login.php
similarity index 100%
rename from app/view/login.php
rename to app/view/pages/login.php
diff --git a/app/view/simulator.php b/app/view/pages/simulator.php
similarity index 100%
rename from app/view/simulator.php
rename to app/view/pages/simulator.php
diff --git a/app/view/teamtable/edit/index.php b/app/view/pages/teamtable/edit/index.php
similarity index 100%
rename from app/view/teamtable/edit/index.php
rename to app/view/pages/teamtable/edit/index.php
diff --git a/app/view/teamtable/index.php b/app/view/pages/teamtable/index.php
similarity index 100%
rename from app/view/teamtable/index.php
rename to app/view/pages/teamtable/index.php
diff --git a/public/confirm-logout.php b/public/confirm-logout.php
index 1746e09..6fdb66a 100644
--- a/public/confirm-logout.php
+++ b/public/confirm-logout.php
@@ -7,5 +7,5 @@ if (!$app->user->loggedIn)
 }
 
 $app->view('template/header', ["title" => "Bekreft avlogging"]);
-$app->view('confirm-logout');
+$app->view('pages/confirm-logout');
 $app->view('template/footer');
\ No newline at end of file
diff --git a/public/example.php b/public/example.php
index ab8e53c..b2249b0 100644
--- a/public/example.php
+++ b/public/example.php
@@ -13,7 +13,7 @@ $message = $model->returnGivenString('Hei på deg!!');
 
 // Render the view with prepared data
 $app->view('template/header', ['title' => 'Eksempel side']);
-$app->view('example', [
+$app->view('pages/example', [
     'message' => $message
 ]);
 $app->view('template/footer');
\ No newline at end of file
diff --git a/public/index.php b/public/index.php
index 28ae62d..413a6b6 100644
--- a/public/index.php
+++ b/public/index.php
@@ -2,5 +2,5 @@
 $app = require '../app/inc.php';
 
 $app->view('template/header', ["title" => "Forside"]);
-$app->view('index');
+$app->view('pages/index');
 $app->view('template/footer');
\ No newline at end of file
diff --git a/public/login.php b/public/login.php
index 8075803..6016ea8 100644
--- a/public/login.php
+++ b/public/login.php
@@ -18,5 +18,5 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST')
 }
 
 $app->view('template/header', ["title" => "Logg inn"]);
-$app->view('login');
+$app->view('pages/login');
 $app->view('template/footer');
\ No newline at end of file
diff --git a/public/simulator.php b/public/simulator.php
index 30ecbfb..12615b3 100644
--- a/public/simulator.php
+++ b/public/simulator.php
@@ -21,5 +21,5 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST')
 }
 
 $app->view('template/header', ['title' => 'Simulator']);
-$app->view('simulator');
+$app->view('pages/simulator');
 $app->view('template/footer');
\ No newline at end of file
diff --git a/public/teamtable/edit/index.php b/public/teamtable/edit/index.php
index 1c7d6d7..8c1334d 100644
--- a/public/teamtable/edit/index.php
+++ b/public/teamtable/edit/index.php
@@ -4,5 +4,5 @@ $app = require '../../../app/inc.php';
 $model = $app->model('Teamtable');
 
 $app->view('template/header', ['title' => 'Endre lagtabell']);
-$app->view('teamtable/edit/index', ["teams" => $model->getTable()]);
+$app->view('pages/teamtable/edit/index', ["teams" => $model->getTable()]);
 $app->view('template/footer');
\ No newline at end of file
diff --git a/public/teamtable/index.php b/public/teamtable/index.php
index 7083a3d..3de46a9 100644
--- a/public/teamtable/index.php
+++ b/public/teamtable/index.php
@@ -4,5 +4,5 @@ $app = require '../../app/inc.php';
 $model = $app->model('Teamtable');
 
 $app->view('template/header', ['title' => 'Lagtabell']);
-$app->view('teamtable/index', ["teams" => $model->getTable()]);
+$app->view('pages/teamtable/index', ["teams" => $model->getTable()]);
 $app->view('template/footer');
\ No newline at end of file