diff --git a/app/core/ApiController.php b/app/core/ApiController.php
deleted file mode 100644
index f96aebb..0000000
--- a/app/core/ApiController.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-// Extended controller for RESTful APIs
-class ApiController extends Controller
-{
-    // TODO: ...
-}
\ No newline at end of file
diff --git a/app/core/Controller.php b/app/core/App.php
similarity index 76%
rename from app/core/Controller.php
rename to app/core/App.php
index f3aaa2b..cf107fe 100644
--- a/app/core/Controller.php
+++ b/app/core/App.php
@@ -1,7 +1,13 @@
 <?php
 
-class Controller
+class App
 {
+    public function __construct()
+    {
+        $config = require __DIR__ . '/../config.php';
+        $this->config = $config;
+    }
+
     public function model(string $model): object
     {
         // Require model file
diff --git a/app/core/Flash.php b/app/core/Flash.php
deleted file mode 100644
index 81ab7dd..0000000
--- a/app/core/Flash.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// Provide user feedback by flashing a message on the next request. This is usually combined with a layout template that does this. 
-class Flash extends Session {
-    public function add(): void
-    {
-        // TODO: ...
-    }
-}
\ No newline at end of file
diff --git a/app/inc.php b/app/inc.php
index 0b4711e..72cbdfe 100644
--- a/app/inc.php
+++ b/app/inc.php
@@ -17,7 +17,5 @@ spl_autoload_register(function ($class_name) {
     require __DIR__ . '/core/' . $class_name . '.php';
 });
 
-// Define global CONFIG constant.
-define("CONFIG",
-    require __DIR__ . '/config.php'
-);
\ No newline at end of file
+// God mode class that instantiates many other classes... or something like that
+return new App();
\ No newline at end of file
diff --git a/app/view/index.php b/app/view/index.php
index f3e2a6e..e2bad4d 100644
--- a/app/view/index.php
+++ b/app/view/index.php
@@ -1,7 +1,3 @@
-<?php $this->view('template/header', ['title' => $title]); ?>
-
 <h1>Velkommen til forsida!</h1>
 <p>Ting fungerer noen ganger.</p>
-<p><?=$data?></p>
-
-<?php $this->view('template/footer'); ?>
\ No newline at end of file
+<p><?=$data?></p>
\ No newline at end of file
diff --git a/app/view/login.php b/app/view/login.php
index 82db8cb..9a7f1ea 100644
--- a/app/view/login.php
+++ b/app/view/login.php
@@ -1,5 +1,3 @@
-<?php $this->view('template/header', ['title' => $title]); ?>
-
 <h1>Logg inn</h1>
 <p>Fyll inn påloggingsinformasjonen din.</p>
 <form method="post">
@@ -13,6 +11,4 @@
     <br>
     <br>
     <input type="submit" value="Bekreft">
-</form>
-
-<?php $this->view('template/footer'); ?>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/app/view/template/header.php b/app/view/template/header.php
index 978348f..1bc287b 100644
--- a/app/view/template/header.php
+++ b/app/view/template/header.php
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title><?=htmlspecialchars($title);?> – Stafett for livet</title>
 
-    <link rel="stylesheet" href="<?=CONFIG['root_url']?>/static/style/main.css">
+    <link rel="stylesheet" href="<?=$this->config['root_url']?>/static/style/main.css">
 <body>
 
     <div id="header">
@@ -18,7 +18,7 @@
     <div id="menu">
         <small>
             <span>Ikke pålogget</span>
-            <a href="<?=CONFIG['root_url']?>/login.php">Logg inn</a>
+            <a href="<?=$this->config['root_url']?>/login.php">Logg inn</a>
         </small>
     </div>
 
@@ -28,9 +28,9 @@
 
         <div id="nav">
             <ul>
-                <li><a href="<?=CONFIG['root_url']?>/index.php">Forside</a></li>
-                <li><a href="<?=CONFIG['root_url']?>/login.php">Logg inn</a></li>
-                <li><a href="<?=CONFIG['root_url']?>">Eksempel</a></li>
+                <li><a href="<?=$this->config['root_url']?>/index.php">Forside</a></li>
+                <li><a href="<?=$this->config['root_url']?>/login.php">Logg inn</a></li>
+                <li><a href="<?=$this->config['root_url']?>">Eksempel</a></li>
             </ul>
         </div>
 
diff --git a/public/index.php b/public/index.php
index 3059008..2cbae5c 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,17 +1,10 @@
 <?php
-require("../app/inc.php");
+$app = require("../app/inc.php");
 
-// Instantiate a new controller
-$contr = new Controller;
+$model = $app->model('Index');
 
-// Grab the model
-$model = $contr->model('Index');
-
-// Perform database task with model 
-$username = $model->getUsername();
-
-// Display view with retrieved data 
-$contr->view('index', [
-    "title" => "Forside",
-    "data" => $username
-]);
\ No newline at end of file
+$app->view('template/header', ["title" => "Forside"]);
+$app->view('index', [
+    "data" => $model->getUsername()
+]);
+$app->view('template/footer');
\ No newline at end of file
diff --git a/public/login.php b/public/login.php
index 032b537..88e8ea8 100644
--- a/public/login.php
+++ b/public/login.php
@@ -1,8 +1,6 @@
 <?php
-require("../app/inc.php");
+$app = require("../app/inc.php");
 
-$contr = new Controller;
-
-$contr->view('login', [
-    "title" => "Logg inn",
-]);
\ No newline at end of file
+$app->view('template/header', ["title" => "Logg inn"]);
+$app->view('login');
+$app->view('template/footer');
\ No newline at end of file
