Rearrange html files to folders

webapp/templates/kaehmy/kaehmy.html

@@ -1,10 +1,10 @@
-{% extends "kaehmy_base.html" %}
+{% extends "kaehmy/kaehmy_base.html" %}
 
 {% load bootstrap3 %}
 {% load i18n %}
 
 {% block navigation %}
-    {% include "kaehmy_navigation.html" %}
+    {% include "kaehmy/kaehmy_navigation.html" %}
 {% endblock %}
 
 {% block content %}

webapp/templates/kaehmy/kaehmy_base.html

@@ -30,12 +30,12 @@
 
         {% block header %}
         <div class="kaehmy_header">
-            {% include "kaehmy_header.html" %}
+            {% include "kaehmy/kaehmy_header.html" %}
         </div>
         {% endblock header %}
 
         {% block navigation %}
-            {% include "kaehmy_navigation.html" %}
+            {% include "kaehmy/kaehmy_navigation.html" %}
         {% endblock %}
 
         <div class="kaehmy-content">
@@ -44,7 +44,7 @@
         </div>
         <div class="footer">
             {% block footer %}
-                {% include "kaehmy_footer.html" %}
+                {% include "kaehmy/kaehmy_footer.html" %}
             {% endblock footer %}
         </div>
     </body>

webapp/templates/kaehmy/kaehmy_error.html

@@ -1,4 +1,4 @@
-{% extends "kaehmy_base.html" %}
+{% extends "kaehmy/kaehmy_base.html" %}
 
 {% load static %}
 {% load i18n %}

webapp/templates/kaehmy/kaehmy_export.html

@@ -1,4 +1,4 @@
-{% extends "kaehmy_base.html" %}
+{% extends "kaehmy/kaehmy_base.html" %}
 
 {% load static %}
 {% load i18n %}

webapp/templates/kaehmy/kaehmy_list.html

@@ -1,10 +1,10 @@
-{% extends "kaehmy_base.html" %}
+{% extends "kaehmy/kaehmy_base.html" %}
 
 {% load static %}
 {% load i18n %}
 
 {% block navigation %}
-    {% include "kaehmy_navigation.html" %}
+    {% include "kaehmy/kaehmy_navigation.html" %}
 {% endblock %}
 
 {% block content %}
@@ -97,7 +97,7 @@
 
             <div class="collapse" id="collapse_{{ application.id }}">                    
                 {% for message in application.messages.all %}
-                    {% include "kaehmy_message.html" with messages=message.messages.all %}
+                    {% include "kaehmy/kaehmy_message.html" with messages=message.messages.all %}
                 {% endfor %}
             </div>
         </div>

webapp/templates/kaehmy/kaehmy_message.html

@@ -13,7 +13,7 @@
         </div>
         <div>
             {% for message in messages %}
-                {% include "kaehmy_message.html" with messages=message.messages.all %}
+                {% include "kaehmy/kaehmy_message.html" with messages=message.messages.all %}
             {% endfor %}
         </div>
         

webapp/templates/kaehmy/kaehmy_statistics.html

@@ -1,10 +1,10 @@
-{% extends "kaehmy_base.html" %}
+{% extends "kaehmy/kaehmy_base.html" %}
 
 {% load bootstrap3 %}
 {% load i18n %}
 
 {% block navigation %}
-    {% include "kaehmy_navigation.html" %}
+    {% include "kaehmy/kaehmy_navigation.html" %}
 {% endblock %}
 
 {% block content %}

webapp/views.py

@@ -151,7 +151,7 @@ def contact_view(request, *args, **kwargs):
 def ohlhafv_view(request, *args, **kwargs):
     """Render Ohlhafv form page."""
     form = OhlhafvForm()
-    return render(request, 'ohlhafv.html', {'form': form})
+    return render(request, 'ohlhafv/ohlhafv.html', {'form': form})
 
 
 @ensure_csrf_cookie
@@ -186,7 +186,7 @@ def ohlhafv_list(request, *args, **kwargs):
         'table': table_html,
         'challenge_count': len(challenges),
     }
-    return render(request, 'ohlhafv_list.html', context)
+    return render(request, 'ohlhafv/ohlhafv_list.html', context)
 
 
 @ensure_csrf_cookie
@@ -214,7 +214,7 @@ def kaehmy_list_view(request, *args, **kwargs):
         'application_count': len(applications),
         'filter_options': filter_options
     }
-    return render(request, 'kaehmy_list.html', context)
+    return render(request, 'kaehmy/kaehmy_list.html', context)
 
 
 @ensure_csrf_cookie
@@ -242,7 +242,7 @@ def kaehmy_comment(request, *args, **kwargs):
         context = {
             'error': form.errors
         }
-        return render(request, 'kaehmy_error.html', context)
+        return render(request, 'kaehmy/kaehmy_error.html', context)
 
 
 @require_http_methods(["GET"])
@@ -267,14 +267,14 @@ def kaehmy_statistics_view(request, *args, **kwargs):
         'application_count': len(applications),
         'role_list': role_list
     }
-    return render(request, 'kaehmy_statistics.html', context)
+    return render(request, 'kaehmy/kaehmy_statistics.html', context)
 
 
 @require_http_methods(["GET"])
 def kaehmy_view(request, *args, **kwargs):
     """Render Kaehmy form page."""
     form = KaehmyForm_Form()
-    return render(request, 'kaehmy.html', {'form': form})
+    return render(request, 'kaehmy/kaehmy.html', {'form': form})
 
 
 @ensure_csrf_cookie
@@ -320,7 +320,7 @@ def kaehmy_submit(request, *args, **kwargs):
         context = {
             'error': form.errors
         }
-        return render(request, 'kaehmy_error.html', context)
+        return render(request, 'kaehmy/kaehmy_error.html', context)
     return HttpResponseRedirect('/kaehmy')
 
 
@@ -344,4 +344,4 @@ def kaehmy_export_view(request, *args, **kwargs):
         'non_board_table': make_table(non_board),
         'board_table': make_table(board),
     }
-    return render(request, 'kaehmy_export.html', context)
+    return render(request, 'kaehmy/kaehmy_export.html', context)