diff --git a/src/app.js b/src/app.js
index 3b35fe9..7f02aff 100644
--- a/src/app.js
+++ b/src/app.js
@@ -3,11 +3,11 @@ import "bootstrap/scss/bootstrap.scss";
 import "babel-polyfill";
 import angularStickyfill from "angular-stickyfill";
 import "angular-stickyfill/dist/angular-stickyfill.css";
-import {cleanUsername, generateRandomUsername} from "./util";
+import {cleanUsername, generateRandomUsername} from "./mailbox/util";
 import hasher from "hasher";
-import Header from "./components/header/header";
-import List from "./components/list/list";
-import Mail from "./components/mail/mail";
+import Header from "./mailbox/header/header";
+import List from "./mailbox/list/list";
+import Mail from "./mailbox/mail/mail";
 
 // config:
 const reload_interval_ms = 10000;
@@ -15,21 +15,16 @@ const backend_url = './backend.php';
 
 class AppController {
     /*@ngInject*/
-    constructor($http, $log, config, $interval) {
+    constructor($http, $log, $interval) {
         this.$interval = $interval;
         this.$http = $http;
-        this.config = config;
         this.$log = $log;
-        this.$log.log('start controller');
         this.address = null;
         this.username = null;
         this.mails = [];
-        this.state = {isUpdating: false};
     }
 
     $onInit() {
-        this.$log.debug("init");
-
         hasher.changed.add(this.onHashChange.bind(this));
         hasher.initialized.add(this.onHashChange.bind(this)); //add initialized listener (to grab initial value in case it is already set)
         hasher.init(); //initialize hasher (start listening for history changes)
@@ -64,12 +59,10 @@ class AppController {
 
     loadEmailsAsync(username) {
         this.$log.debug("updating mails for ", username);
-        this.state.isUpdating = true;
         this.loadEmails(this.username).then(data=> {
             this.mails = data.mails;
             this.address = data.address;
             this.username = data.username;
-            this.state.isUpdating = false;
             this.$log.debug("received mails for ", username);
         });
     }
diff --git a/src/components/header/header.js b/src/mailbox/header/header.js
similarity index 100%
rename from src/components/header/header.js
rename to src/mailbox/header/header.js
diff --git a/src/components/header/header.scss b/src/mailbox/header/header.scss
similarity index 100%
rename from src/components/header/header.scss
rename to src/mailbox/header/header.scss
diff --git a/src/components/header/octicon-inbox.gif b/src/mailbox/header/octicon-inbox.gif
similarity index 100%
rename from src/components/header/octicon-inbox.gif
rename to src/mailbox/header/octicon-inbox.gif
diff --git a/src/components/list/list.html b/src/mailbox/list/list.html
similarity index 100%
rename from src/components/list/list.html
rename to src/mailbox/list/list.html
diff --git a/src/components/list/list.js b/src/mailbox/list/list.js
similarity index 100%
rename from src/components/list/list.js
rename to src/mailbox/list/list.js
diff --git a/src/components/list/list.scss b/src/mailbox/list/list.scss
similarity index 100%
rename from src/components/list/list.scss
rename to src/mailbox/list/list.scss
diff --git a/src/components/list/spinner.gif b/src/mailbox/list/spinner.gif
similarity index 100%
rename from src/components/list/spinner.gif
rename to src/mailbox/list/spinner.gif
diff --git a/src/components/mail/mail.html b/src/mailbox/mail/mail.html
similarity index 100%
rename from src/components/mail/mail.html
rename to src/mailbox/mail/mail.html
diff --git a/src/components/mail/mail.js b/src/mailbox/mail/mail.js
similarity index 100%
rename from src/components/mail/mail.js
rename to src/mailbox/mail/mail.js
diff --git a/src/components/mail/mail.scss b/src/mailbox/mail/mail.scss
similarity index 100%
rename from src/components/mail/mail.scss
rename to src/mailbox/mail/mail.scss
diff --git a/src/util.js b/src/mailbox/util.js
similarity index 100%
rename from src/util.js
rename to src/mailbox/util.js