diff --git a/frontends/etiquette_flask/etiquette_flask/endpoints/__init__.py b/frontends/etiquette_flask/etiquette_flask/endpoints/__init__.py
index 021dd1f..c09b581 100644
--- a/frontends/etiquette_flask/etiquette_flask/endpoints/__init__.py
+++ b/frontends/etiquette_flask/etiquette_flask/endpoints/__init__.py
@@ -2,6 +2,7 @@ import flask; from flask import request
 import random
 
 from . import album_endpoints
+from . import basic_endpoints
 from . import bookmark_endpoints
 from . import common
 from . import photo_endpoints
@@ -9,27 +10,8 @@ from . import tag_endpoints
 from . import user_endpoints
 
 site = common.site
-session_manager = common.session_manager
 
 
-@site.route('/')
-@session_manager.give_token
-def root():
-    motd = random.choice(common.P.config['motd_strings'])
-    session = session_manager.get(request)
-    return flask.render_template('root.html', motd=motd, session=session)
-
-@site.route('/favicon.ico')
-@site.route('/favicon.png')
-def favicon():
-    return flask.send_file(common.FAVICON_PATH.absolute_path)
-
-@site.route('/apitest')
-@session_manager.give_token
-def apitest():
-    response = flask.Response('testing')
-    return response
-
 if __name__ == '__main__':
     #site.run(threaded=True)
     pass
diff --git a/frontends/etiquette_flask/etiquette_flask/endpoints/basic_endpoints.py b/frontends/etiquette_flask/etiquette_flask/endpoints/basic_endpoints.py
new file mode 100644
index 0000000..e5e9ebe
--- /dev/null
+++ b/frontends/etiquette_flask/etiquette_flask/endpoints/basic_endpoints.py
@@ -0,0 +1,27 @@
+import flask; from flask import request
+
+from . import common
+
+site = common.site
+session_manager = common.session_manager
+
+
+####################################################################################################
+
+@site.route('/')
+@session_manager.give_token
+def root():
+    motd = random.choice(common.P.config['motd_strings'])
+    session = session_manager.get(request)
+    return flask.render_template('root.html', motd=motd, session=session)
+
+@site.route('/favicon.ico')
+@site.route('/favicon.png')
+def favicon():
+    return flask.send_file(common.FAVICON_PATH.absolute_path)
+
+@site.route('/apitest')
+@session_manager.give_token
+def apitest():
+    response = flask.Response('testing')
+    return response