diff --git a/khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap-grid.css b/khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap-grid.css
similarity index 100%
rename from khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap-grid.css
rename to khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap-grid.css
diff --git a/khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap-grid.css.map b/khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap-grid.css.map
similarity index 100%
rename from khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap-grid.css.map
rename to khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap-grid.css.map
diff --git a/khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap-grid.min.css b/khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap-grid.min.css
similarity index 100%
rename from khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap-grid.min.css
rename to khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap-grid.min.css
diff --git a/khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap-grid.min.css.map b/khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap-grid.min.css.map
similarity index 100%
rename from khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap-grid.min.css.map
rename to khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap-grid.min.css.map
diff --git a/khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap-reboot.css b/khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap-reboot.css
similarity index 100%
rename from khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap-reboot.css
rename to khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap-reboot.css
diff --git a/khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap-reboot.css.map b/khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap-reboot.css.map
similarity index 100%
rename from khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap-reboot.css.map
rename to khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap-reboot.css.map
diff --git a/khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap-reboot.min.css b/khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap-reboot.min.css
similarity index 100%
rename from khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap-reboot.min.css
rename to khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap-reboot.min.css
diff --git a/khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap-reboot.min.css.map b/khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap-reboot.min.css.map
similarity index 100%
rename from khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap-reboot.min.css.map
rename to khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap-reboot.min.css.map
diff --git a/khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap.css b/khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap.css
similarity index 100%
rename from khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap.css
rename to khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap.css
diff --git a/khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap.css.map b/khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap.css.map
similarity index 100%
rename from khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap.css.map
rename to khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap.css.map
diff --git a/khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap.min.css b/khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap.min.css
similarity index 100%
rename from khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap.min.css
rename to khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap.min.css
diff --git a/khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap.min.css.map b/khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap.min.css.map
similarity index 100%
rename from khaganat/static/bootstrap/4.0.0-beta.3/css/bootstrap.min.css.map
rename to khaganat/static/khaganat/bootstrap/4.0.0-beta.3/css/bootstrap.min.css.map
diff --git a/khaganat/static/bootstrap/4.0.0-beta.3/js/bootstrap.bundle.js b/khaganat/static/khaganat/bootstrap/4.0.0-beta.3/js/bootstrap.bundle.js
similarity index 100%
rename from khaganat/static/bootstrap/4.0.0-beta.3/js/bootstrap.bundle.js
rename to khaganat/static/khaganat/bootstrap/4.0.0-beta.3/js/bootstrap.bundle.js
diff --git a/khaganat/static/bootstrap/4.0.0-beta.3/js/bootstrap.bundle.js.map b/khaganat/static/khaganat/bootstrap/4.0.0-beta.3/js/bootstrap.bundle.js.map
similarity index 100%
rename from khaganat/static/bootstrap/4.0.0-beta.3/js/bootstrap.bundle.js.map
rename to khaganat/static/khaganat/bootstrap/4.0.0-beta.3/js/bootstrap.bundle.js.map
diff --git a/khaganat/static/bootstrap/4.0.0-beta.3/js/bootstrap.bundle.min.js b/khaganat/static/khaganat/bootstrap/4.0.0-beta.3/js/bootstrap.bundle.min.js
similarity index 100%
rename from khaganat/static/bootstrap/4.0.0-beta.3/js/bootstrap.bundle.min.js
rename to khaganat/static/khaganat/bootstrap/4.0.0-beta.3/js/bootstrap.bundle.min.js
diff --git a/khaganat/static/bootstrap/4.0.0-beta.3/js/bootstrap.bundle.min.js.map b/khaganat/static/khaganat/bootstrap/4.0.0-beta.3/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from khaganat/static/bootstrap/4.0.0-beta.3/js/bootstrap.bundle.min.js.map
rename to khaganat/static/khaganat/bootstrap/4.0.0-beta.3/js/bootstrap.bundle.min.js.map
diff --git a/khaganat/static/bootstrap/4.0.0-beta.3/js/bootstrap.js b/khaganat/static/khaganat/bootstrap/4.0.0-beta.3/js/bootstrap.js
similarity index 100%
rename from khaganat/static/bootstrap/4.0.0-beta.3/js/bootstrap.js
rename to khaganat/static/khaganat/bootstrap/4.0.0-beta.3/js/bootstrap.js
diff --git a/khaganat/static/bootstrap/4.0.0-beta.3/js/bootstrap.js.map b/khaganat/static/khaganat/bootstrap/4.0.0-beta.3/js/bootstrap.js.map
similarity index 100%
rename from khaganat/static/bootstrap/4.0.0-beta.3/js/bootstrap.js.map
rename to khaganat/static/khaganat/bootstrap/4.0.0-beta.3/js/bootstrap.js.map
diff --git a/khaganat/static/bootstrap/4.0.0-beta.3/js/bootstrap.min.js b/khaganat/static/khaganat/bootstrap/4.0.0-beta.3/js/bootstrap.min.js
similarity index 100%
rename from khaganat/static/bootstrap/4.0.0-beta.3/js/bootstrap.min.js
rename to khaganat/static/khaganat/bootstrap/4.0.0-beta.3/js/bootstrap.min.js
diff --git a/khaganat/static/bootstrap/4.0.0-beta.3/js/bootstrap.min.js.map b/khaganat/static/khaganat/bootstrap/4.0.0-beta.3/js/bootstrap.min.js.map
similarity index 100%
rename from khaganat/static/bootstrap/4.0.0-beta.3/js/bootstrap.min.js.map
rename to khaganat/static/khaganat/bootstrap/4.0.0-beta.3/js/bootstrap.min.js.map
diff --git a/khaganat/static/css/khaganat.css b/khaganat/static/khaganat/css/khaganat.css
similarity index 87%
rename from khaganat/static/css/khaganat.css
rename to khaganat/static/khaganat/css/khaganat.css
index 4d99c6e..371dade 100644
--- a/khaganat/static/css/khaganat.css
+++ b/khaganat/static/khaganat/css/khaganat.css
@@ -1,5 +1,5 @@
 html,body {
-    background: url("/static/images/website_khaganat_bg_v7.jpg") no-repeat center fixed;
+    background: url("/static/khaganat/images/website_khaganat_bg_v7.jpg") no-repeat center fixed;
     font-family: "Verdana","Arial","Helvetica",sans-serif;
     color: #222;
 }
diff --git a/khaganat/static/images/favicon.ico b/khaganat/static/khaganat/images/favicon.ico
similarity index 100%
rename from khaganat/static/images/favicon.ico
rename to khaganat/static/khaganat/images/favicon.ico
diff --git a/khaganat/static/images/icon_khaganat.png b/khaganat/static/khaganat/images/icon_khaganat.png
similarity index 100%
rename from khaganat/static/images/icon_khaganat.png
rename to khaganat/static/khaganat/images/icon_khaganat.png
diff --git a/khaganat/static/images/website_khaganat_bg_v7.jpg b/khaganat/static/khaganat/images/website_khaganat_bg_v7.jpg
similarity index 100%
rename from khaganat/static/images/website_khaganat_bg_v7.jpg
rename to khaganat/static/khaganat/images/website_khaganat_bg_v7.jpg
diff --git a/khaganat/static/jquery-3.2.1.min.js b/khaganat/static/khaganat/jquery-3.2.1.min.js
similarity index 100%
rename from khaganat/static/jquery-3.2.1.min.js
rename to khaganat/static/khaganat/jquery-3.2.1.min.js
diff --git a/khaganat/static/js/khaganat.js b/khaganat/static/khaganat/js/khaganat.js
similarity index 100%
rename from khaganat/static/js/khaganat.js
rename to khaganat/static/khaganat/js/khaganat.js
diff --git a/khaganat/templates/khaganat/base.html b/khaganat/templates/khaganat/base.html
index 396db7b..8fb83aa 100644
--- a/khaganat/templates/khaganat/base.html
+++ b/khaganat/templates/khaganat/base.html
@@ -4,12 +4,12 @@
     <!-- Begin bootstrap headers -->
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-    <link rel="stylesheet" href="{% static "bootstrap/4.0.0-beta.3/css/bootstrap.min.css" %}" integrity="sha384-Zug+QiDoJOrZ5t4lssLdxGhVrurbmBWopoEl+M6BdEfwnCJZtKxi1KgxUyJq13dy" />
+    <link rel="stylesheet" href="{% static "khaganat/bootstrap/4.0.0-beta.3/css/bootstrap.min.css" %}" integrity="sha384-Zug+QiDoJOrZ5t4lssLdxGhVrurbmBWopoEl+M6BdEfwnCJZtKxi1KgxUyJq13dy" />
     <!-- End bootstrap headers -->
 
     <!-- Begin global headers -->
-    <link rel="shortcut icon" href="{% static "images/favicon.ico" %}" />
-    <link rel="stylesheet" href="{% static "css/khaganat.css" %}" />
+    <link rel="shortcut icon" href="{% static "khaganat/images/favicon.ico" %}" />
+    <link rel="stylesheet" href="{% static "khaganat/css/khaganat.css" %}" />
     <!-- End global headers -->
 
     <!-- Begin custom headers -->
@@ -23,8 +23,8 @@
       <div class="container" id="main-content">
       {% block content %}{% endblock %}
       </div>
-      <script src="{% static "jquery-3.2.1.min.js" %}"></script>
-      <script src="{% static "bootstrap/4.0.0-beta.3/js/bootstrap.bundle.min.js" %}"></script>
-      <script src="{% static "js/khaganat.js" %}"></script>
+      <script src="{% static "khaganat/jquery-3.2.1.min.js" %}"></script>
+      <script src="{% static "khaganat/bootstrap/4.0.0-beta.3/js/bootstrap.bundle.min.js" %}"></script>
+      <script src="{% static "khaganat/js/khaganat.js" %}"></script>
   </body>
 </html>