diff --git a/location_app/app/routes/__init__.py b/location_app/app/routes/__init__.py
index 3c27d74..35d0364 100644
--- a/location_app/app/routes/__init__.py
+++ b/location_app/app/routes/__init__.py
@@ -2,11 +2,11 @@ from .index import index_bl
 from .main import main_bl
 from .map import map_bl
 from .login import login_bl
-from .account import acc_bl
+from .profile import prof_bl
 
 def init_app(app):
     app.register_blueprint(index_bl)
     app.register_blueprint(main_bl, url_prefix="/main")
     app.register_blueprint(map_bl, url_prefix="/map")
     app.register_blueprint(login_bl, url_prefix="/login")
-    app.register_blueprint(acc_bl, url_prefix="/profile")
\ No newline at end of file
+    app.register_blueprint(prof_bl, url_prefix="/profile")
\ No newline at end of file
diff --git a/location_app/app/routes/login.py b/location_app/app/routes/login.py
index 4406fb5..a8dca73 100644
--- a/location_app/app/routes/login.py
+++ b/location_app/app/routes/login.py
@@ -8,17 +8,17 @@ login_bl = Blueprint('login', __name__)
 def index():
     if request.method == "POST":
         print(request.form)
-    return render_template("login_index.html")
+    return render_template("login/index.html")
 
 @login_bl.route("/create_account", methods = ["GET", "POST"])
 def create_account():
     if request.method == "POST":
         print(request.form)
-    return render_template("login_create.html", today = datetime.today().strftime('%Y-%m-%d'))
+    return render_template("login/create.html", today = datetime.today().strftime('%Y-%m-%d'))
 
 
 @login_bl.route("/forgot_password", methods = ["GET", "POST"])
 def forgot_password():
     if request.method == "POST":
         print(request.form)
-    return render_template("login_forgot.html")
\ No newline at end of file
+    return render_template("login/forgot.html")
\ No newline at end of file
diff --git a/location_app/app/routes/main.py b/location_app/app/routes/main.py
index d1ae358..caf921c 100644
--- a/location_app/app/routes/main.py
+++ b/location_app/app/routes/main.py
@@ -6,7 +6,7 @@ main_bl = Blueprint('main', __name__)
 @main_bl.route("/")
 def index():
     session['username'] = "JC"
-    return render_template("main_index.html", locations = data_getter.get_locations_for(session['username']))
+    return render_template("main/index.html", locations = data_getter.get_locations_for(session['username']))
 
 @main_bl.route("/logout")
 def logout():
diff --git a/location_app/app/routes/map.py b/location_app/app/routes/map.py
index 7c4d07b..8c069b6 100644
--- a/location_app/app/routes/map.py
+++ b/location_app/app/routes/map.py
@@ -5,6 +5,6 @@ map_bl = Blueprint('map', __name__)
 
 @map_bl.route("/", methods = ["GET", "POST"])
 def index():
-    return render_template("map_index.html", 
+    return render_template("map/index.html", 
                            locations = data_getter.get_map_locations_for(session['username']),
                            dates = data_getter.get_map_location_dates(session['username']))
\ No newline at end of file
diff --git a/location_app/app/routes/account.py b/location_app/app/routes/profile.py
similarity index 53%
rename from location_app/app/routes/account.py
rename to location_app/app/routes/profile.py
index 8f9730f..b38044d 100644
--- a/location_app/app/routes/account.py
+++ b/location_app/app/routes/profile.py
@@ -1,8 +1,8 @@
 from flask import Blueprint, render_template, request, url_for, escape, redirect, session
 from app.functions.data_tools import data_getter
 
-acc_bl = Blueprint('acc', __name__)
+prof_bl = Blueprint('prof', __name__)
 
-@acc_bl.route("/", methods = ["GET", "POST"])
+@prof_bl.route("/", methods = ["GET", "POST"])
 def index():
-    return render_template("account_index.html")
+    return render_template("profile/index.html")
diff --git a/location_app/app/static/css/main_index.css b/location_app/app/static/css/base_page.css
similarity index 75%
rename from location_app/app/static/css/main_index.css
rename to location_app/app/static/css/base_page.css
index daaba51..8f1f1a5 100644
--- a/location_app/app/static/css/main_index.css
+++ b/location_app/app/static/css/base_page.css
@@ -52,25 +52,4 @@
 }
 .content_main {
     grid-area: c_main;
-}
-.table_main {
-    width: 100%;
-    border-width: 0;
-}
-.table_title {
-    margin: 1vh;
-    font-size: 4vw;
-}
-.table_main th {
-    margin: 1vh;
-    padding: 1vh;
-    font-size: 2vw;
-}
-.table_main td {
-    text-align: center;
-    font-size: 1.4vw;
-    margin: 0.3vh;
-}
-.table_main tr:nth-child(even) {
-    background-color: #3EA4E8;
 }
\ No newline at end of file
diff --git a/location_app/app/static/css/login_create.css b/location_app/app/static/css/login/create.css
similarity index 100%
rename from location_app/app/static/css/login_create.css
rename to location_app/app/static/css/login/create.css
diff --git a/location_app/app/static/css/login_forgot.css b/location_app/app/static/css/login/forgot.css
similarity index 100%
rename from location_app/app/static/css/login_forgot.css
rename to location_app/app/static/css/login/forgot.css
diff --git a/location_app/app/static/css/login_index.css b/location_app/app/static/css/login/index.css
similarity index 100%
rename from location_app/app/static/css/login_index.css
rename to location_app/app/static/css/login/index.css
diff --git a/location_app/app/static/css/main/index.css b/location_app/app/static/css/main/index.css
new file mode 100644
index 0000000..e812c73
--- /dev/null
+++ b/location_app/app/static/css/main/index.css
@@ -0,0 +1,21 @@
+.table_main {
+    width: 100%;
+    border-width: 0;
+}
+.table_title {
+    margin: 1vh;
+    font-size: 4vw;
+}
+.table_main th {
+    margin: 1vh;
+    padding: 1vh;
+    font-size: 2vw;
+}
+.table_main td {
+    text-align: center;
+    font-size: 1.4vw;
+    margin: 0.3vh;
+}
+.table_main tr:nth-child(even) {
+    background-color: #3EA4E8;
+}
\ No newline at end of file
diff --git a/location_app/app/static/css/animations.css b/location_app/app/static/css/map/index.css
similarity index 100%
rename from location_app/app/static/css/animations.css
rename to location_app/app/static/css/map/index.css
diff --git a/location_app/app/static/css/map_index.css b/location_app/app/static/css/map_index.css
deleted file mode 100644
index e69de29..0000000
diff --git a/location_app/app/static/js/test.js b/location_app/app/static/js/map/test.js
similarity index 100%
rename from location_app/app/static/js/test.js
rename to location_app/app/static/js/map/test.js
diff --git a/location_app/app/templates/_template.html b/location_app/app/templates/_template.html
deleted file mode 100644
index 30e6843..0000000
--- a/location_app/app/templates/_template.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends 'base.html' %}
-
-
-{% block title %} " Insert title here " {% endblock %}
-
-
-{% block css %} 
-
-                       " Insert css here "
-
-{% endblock %}
-
-
-{% block body %} 
-
-                       " Insert body here "
-
-{% endblock %}
-
diff --git a/location_app/app/templates/base_page.html b/location_app/app/templates/base_page.html
index 922b27a..226fbee 100644
--- a/location_app/app/templates/base_page.html
+++ b/location_app/app/templates/base_page.html
@@ -7,7 +7,7 @@
 
 <!-- CSS -->
 {% block basecss %}
-<link href="{{ url_for('static', filename='css/main_index.css') }}" rel="stylesheet" />
+<link href="{{ url_for('static', filename='css/base_page.css') }}" rel="stylesheet" />
 {% block css %}{% endblock %}
 {% endblock %}
 
diff --git a/location_app/app/templates/login_create.html b/location_app/app/templates/login/create.html
similarity index 97%
rename from location_app/app/templates/login_create.html
rename to location_app/app/templates/login/create.html
index 82fb923..7bd0a74 100644
--- a/location_app/app/templates/login_create.html
+++ b/location_app/app/templates/login/create.html
@@ -9,7 +9,7 @@
 
 <!-- CSS -->
 {% block basecss %}
-<link href="{{ url_for('static', filename='css/login_create.css') }}" rel="stylesheet" />
+<link href="{{ url_for('static', filename='css/login/create.css') }}" rel="stylesheet" />
 {% endblock %}
 
 <!-- BODY -->
diff --git a/location_app/app/templates/login_forgot.html b/location_app/app/templates/login/forgot.html
similarity index 94%
rename from location_app/app/templates/login_forgot.html
rename to location_app/app/templates/login/forgot.html
index e67d82b..a31cff5 100644
--- a/location_app/app/templates/login_forgot.html
+++ b/location_app/app/templates/login/forgot.html
@@ -9,7 +9,7 @@
 
 <!-- CSS -->
 {% block basecss %}
-<link href="{{ url_for('static', filename='css/login_forgot.css') }}" rel="stylesheet" />
+<link href="{{ url_for('static', filename='css/login/forgot.css') }}" rel="stylesheet" />
 {% endblock %}
 
 <!-- BODY -->
diff --git a/location_app/app/templates/login_index.html b/location_app/app/templates/login/index.html
similarity index 82%
rename from location_app/app/templates/login_index.html
rename to location_app/app/templates/login/index.html
index 6bb1c6e..095da58 100644
--- a/location_app/app/templates/login_index.html
+++ b/location_app/app/templates/login/index.html
@@ -9,7 +9,7 @@
 
 <!-- CSS -->
 {% block basecss %}
-<link href="{{ url_for('static', filename='css/login_index.css') }}" rel="stylesheet" />
+<link href="{{ url_for('static', filename='css/login/index.css') }}" rel="stylesheet" />
 {% endblock %}
 
 <!-- BODY -->
@@ -37,10 +37,10 @@
                         <button class="login_button" type="submit">Login</button>
                     </div>
                     <div class="fpass_area">
-                        <a href="{{url_for('login.forgot_password')}}">Forgot password?</a>
+                        <a class="fpass_text" href="{{url_for('login.forgot_password')}}">Forgot password?</a>
                     </div>
                     <div class="cacc_area">
-                        <a href="{{url_for('login.create_account')}}">Create Account</a>
+                        <a class="cacc_text" href="{{url_for('login.create_account')}}">Create Account</a>
                     </div>
                 </div>
             </form>
diff --git a/location_app/app/templates/main_index.html b/location_app/app/templates/main/index.html
similarity index 95%
rename from location_app/app/templates/main_index.html
rename to location_app/app/templates/main/index.html
index dfe179f..cd35434 100644
--- a/location_app/app/templates/main_index.html
+++ b/location_app/app/templates/main/index.html
@@ -9,7 +9,7 @@
 
 <!-- CSS -->
 {% block css %}
-<link href="{{ url_for('static', filename='css/main_index.css') }}" rel="stylesheet" />
+<link href="{{ url_for('static', filename='css/main/index.css') }}" rel="stylesheet" />
 {% endblock %}
 
 <!-- BUTTON -->
diff --git a/location_app/app/templates/map_index.html b/location_app/app/templates/map/index.html
similarity index 84%
rename from location_app/app/templates/map_index.html
rename to location_app/app/templates/map/index.html
index acaa179..ec094a2 100644
--- a/location_app/app/templates/map_index.html
+++ b/location_app/app/templates/map/index.html
@@ -6,15 +6,15 @@
 {% block js %}
 
 <script src="https://openlayers.org/en/v4.6.5/build/ol.js" type="text/javascript"></script>
-<script type="text/javascript" src="{{ url_for('static', filename='js/test.js') }}"></script> 
+<script type="text/javascript" src="{{ url_for('static', filename='js/map/test.js') }}"></script> 
 
 {% endblock %}
 
 <!-- CSS -->
 {% block css %}
 
-<link rel="stylesheet" href="https://openlayers.org/en/v4.6.5/css/ol.css" type="text/css">
-<link href="{{ url_for('static', filename='css/map_index.css') }}" rel="stylesheet" />
+<link rel="stylesheet" type="text/css" href="https://openlayers.org/en/v4.6.5/css/ol.css"/>
+<link rel="stylesheet" href="{{ url_for('static', filename='css/map/index.css') }}"/>
 
 {% endblock %}
 
diff --git a/location_app/app/templates/account_index.html b/location_app/app/templates/profile/index.html
similarity index 100%
rename from location_app/app/templates/account_index.html
rename to location_app/app/templates/profile/index.html