diff --git a/frontends/etiquette_flask/static/common.css b/frontends/etiquette_flask/static/css/common.css
similarity index 100%
rename from frontends/etiquette_flask/static/common.css
rename to frontends/etiquette_flask/static/css/common.css
diff --git a/frontends/etiquette_flask/static/common.js b/frontends/etiquette_flask/static/js/common.js
similarity index 100%
rename from frontends/etiquette_flask/static/common.js
rename to frontends/etiquette_flask/static/js/common.js
diff --git a/frontends/etiquette_flask/templates/album.html b/frontends/etiquette_flask/templates/album.html
index 8f4fc73..2768de0 100644
--- a/frontends/etiquette_flask/templates/album.html
+++ b/frontends/etiquette_flask/templates/album.html
@@ -7,10 +7,10 @@
     <title>Album {{album.display_name}}</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/static/common.css">
+    <link rel="stylesheet" href="/static/css/common.css">
     <link rel="stylesheet" href="/static/css/clipboard_tray.css">
     <link rel="stylesheet" href="/static/css/photo_card.css">
-    <script src="/static/common.js"></script>
+    <script src="/static/js/common.js"></script>
     <script src="/static/js/editor.js"></script>
     <script src="/static/js/photoclipboard.js"></script>
 
diff --git a/frontends/etiquette_flask/templates/albums.html b/frontends/etiquette_flask/templates/albums.html
index 4fc01db..48dc5cf 100644
--- a/frontends/etiquette_flask/templates/albums.html
+++ b/frontends/etiquette_flask/templates/albums.html
@@ -5,8 +5,8 @@
     <title>Albums</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/static/common.css">
-    <script src="/static/common.js"></script>
+    <link rel="stylesheet" href="/static/css/common.css">
+    <script src="/static/js/common.js"></script>
 
 <style>
 #content_body
diff --git a/frontends/etiquette_flask/templates/bookmarks.html b/frontends/etiquette_flask/templates/bookmarks.html
index 8e2b187..f2d1f21 100644
--- a/frontends/etiquette_flask/templates/bookmarks.html
+++ b/frontends/etiquette_flask/templates/bookmarks.html
@@ -5,8 +5,8 @@
     <title>Bookmarks</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/static/common.css">
-    <script src="/static/common.js"></script>
+    <link rel="stylesheet" href="/static/css/common.css">
+    <script src="/static/js/common.js"></script>
     <script src="/static/js/editor.js"></script>
 
 <style>
diff --git a/frontends/etiquette_flask/templates/clipboard.html b/frontends/etiquette_flask/templates/clipboard.html
index 5beb264..26cccea 100644
--- a/frontends/etiquette_flask/templates/clipboard.html
+++ b/frontends/etiquette_flask/templates/clipboard.html
@@ -6,10 +6,10 @@
     <title>Clipboard</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/static/common.css">
+    <link rel="stylesheet" href="/static/css/common.css">
     <link rel="stylesheet" href="/static/css/photo_card.css">
     <link rel="stylesheet" href="/static/css/clipboard_tray.css">
-    <script src="/static/common.js"></script>
+    <script src="/static/js/common.js"></script>
     <script src="/static/js/photoclipboard.js"></script>
 
 <style>
diff --git a/frontends/etiquette_flask/templates/login.html b/frontends/etiquette_flask/templates/login.html
index f40037d..4669b46 100644
--- a/frontends/etiquette_flask/templates/login.html
+++ b/frontends/etiquette_flask/templates/login.html
@@ -5,8 +5,8 @@
     <title>Login/Register</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/static/common.css">
-    <script src="/static/common.js"></script>
+    <link rel="stylesheet" href="/static/css/common.css">
+    <script src="/static/js/common.js"></script>
 
 <style>
 input
diff --git a/frontends/etiquette_flask/templates/photo.html b/frontends/etiquette_flask/templates/photo.html
index c283d71..74154f4 100644
--- a/frontends/etiquette_flask/templates/photo.html
+++ b/frontends/etiquette_flask/templates/photo.html
@@ -6,8 +6,8 @@
     <title>Photo {{photo.basename}}</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/static/common.css">
-    <script src="/static/common.js"></script>
+    <link rel="stylesheet" href="/static/css/common.css">
+    <script src="/static/js/common.js"></script>
     {% set filename = photo.id + photo.dot_extension %}
     {% set file_link = "/file/" + filename %}
 
diff --git a/frontends/etiquette_flask/templates/root.html b/frontends/etiquette_flask/templates/root.html
index 065d0fc..6d9b621 100644
--- a/frontends/etiquette_flask/templates/root.html
+++ b/frontends/etiquette_flask/templates/root.html
@@ -3,7 +3,7 @@
 <head>
     <title>Etiquette</title>
     <meta charset="UTF-8">
-    <link rel="stylesheet" href="/static/common.css">
+    <link rel="stylesheet" href="/static/css/common.css">
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 
 <style>
diff --git a/frontends/etiquette_flask/templates/search.html b/frontends/etiquette_flask/templates/search.html
index 36a73af..4292f73 100644
--- a/frontends/etiquette_flask/templates/search.html
+++ b/frontends/etiquette_flask/templates/search.html
@@ -8,10 +8,10 @@
     <title>Search</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/static/common.css">
+    <link rel="stylesheet" href="/static/css/common.css">
     <link rel="stylesheet" href="/static/css/photo_card.css">
     <link rel="stylesheet" href="/static/css/clipboard_tray.css">
-    <script src="/static/common.js"></script>
+    <script src="/static/js/common.js"></script>
     <script src="/static/js/photoclipboard.js"></script>
 
 <style>
diff --git a/frontends/etiquette_flask/templates/tags.html b/frontends/etiquette_flask/templates/tags.html
index 83845b8..4cec05e 100644
--- a/frontends/etiquette_flask/templates/tags.html
+++ b/frontends/etiquette_flask/templates/tags.html
@@ -10,8 +10,8 @@
     {% endif %}
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/static/common.css">
-    <script src="/static/common.js"></script>
+    <link rel="stylesheet" href="/static/css/common.css">
+    <script src="/static/js/common.js"></script>
     <script src="/static/js/editor.js"></script>
 
 <style>
diff --git a/frontends/etiquette_flask/templates/template.html b/frontends/etiquette_flask/templates/template.html
index 04843c7..38ff106 100644
--- a/frontends/etiquette_flask/templates/template.html
+++ b/frontends/etiquette_flask/templates/template.html
@@ -5,7 +5,7 @@
     <title>Flasksite</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/static/common.css">
+    <link rel="stylesheet" href="/static/css/common.css">
 
 <style>
 </style>
diff --git a/frontends/etiquette_flask/templates/user.html b/frontends/etiquette_flask/templates/user.html
index c921f42..be211b6 100644
--- a/frontends/etiquette_flask/templates/user.html
+++ b/frontends/etiquette_flask/templates/user.html
@@ -5,7 +5,7 @@
     <title>User {{user.username}}</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/static/common.css">
+    <link rel="stylesheet" href="/static/css/common.css">
 
 <style>
 #content_body