diff --git a/app/server/static/forum.css b/app/server/static/css/forum.css
similarity index 100%
rename from app/server/static/forum.css
rename to app/server/static/css/forum.css
diff --git a/app/server/static/inbox.css b/app/server/static/css/inbox.css
similarity index 100%
rename from app/server/static/inbox.css
rename to app/server/static/css/inbox.css
diff --git a/app/server/templates/annotation.html b/app/server/templates/annotation.html
index 279cf992..751b1ba4 100644
--- a/app/server/templates/annotation.html
+++ b/app/server/templates/annotation.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %} {% load static %} {% block header %}
-<link rel="stylesheet" type="text/css" href="{% static 'inbox.css' %}"> {% endblock %} {% block content %}
+<link rel="stylesheet" type="text/css" href="{% static 'css/inbox.css' %}"> {% endblock %} {% block content %}
 <div class="columns" id="mail-app">
     <aside class="column is-2 aside hero is-fullheight">
         <div>
diff --git a/app/server/templates/annotation/annotation_base.html b/app/server/templates/annotation/annotation_base.html
index 9188fc2b..4349d457 100644
--- a/app/server/templates/annotation/annotation_base.html
+++ b/app/server/templates/annotation/annotation_base.html
@@ -1,5 +1,9 @@
-{% extends "base.html" %} {% load static %} {% block header %}
-<link rel="stylesheet" type="text/css" href="{% static 'css/annotation.css' %}"> {% endblock %} {% block content %}
+{% extends "base.html" %}
+{% load static %}
+{% block header %}
+<link rel="stylesheet" type="text/css" href="{% static 'css/annotation.css' %}">
+{% endblock %}
+{% block content %}
 <div class="columns" id="mail-app">
     <aside class="column is-3 aside hero is-fullheight">
         <div>
diff --git a/app/server/templates/base.html b/app/server/templates/base.html
index 10625382..4eb5d865 100644
--- a/app/server/templates/base.html
+++ b/app/server/templates/base.html
@@ -14,7 +14,7 @@
     <!-- Bulma Version 0.6.2-->
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.6.2/css/bulma.min.css" integrity="sha256-2k1KVsNPRXxZOsXQ8aqcZ9GOOwmJTMoOB5o5Qp1d6/s="
         crossorigin="anonymous" />
-    <link rel="stylesheet" type="text/css" href="{% static 'forum.css' %}">
+    <link rel="stylesheet" type="text/css" href="{% static 'css/forum.css' %}">
     <script src="https://cdn.jsdelivr.net/npm/vue@2.5.16/dist/vue.js"></script>
     <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
     {% block header %}{% endblock %}