diff --git a/templates/emails/mail.twig b/resources/views/emails/mail.twig
similarity index 100%
rename from templates/emails/mail.twig
rename to resources/views/emails/mail.twig
diff --git a/templates/layouts/parts/footer.twig b/templates/layouts/parts/footer.twig
deleted file mode 100644
index cf201281..00000000
--- a/templates/layouts/parts/footer.twig
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="col-md-12">
-    <hr/>
-    <div class="text-center footer" style="margin-bottom: 10px;">
-        {% block eventinfo %}
-            {% if event_config.event_name %}
-                {% if event_config.event_start_date and event_config.event_end_date %}
-                    {{ __('%s, from %s to %s', [
-                        event_config.event_name,
-                        date(event_config.event_start_date).format(__('Y-m-d')),
-                        date(event_config.event_end_date).format(__('Y-m-d'))
-                    ]) }}
-                {% elseif event_config.event_start_date %}
-                    {{ __('%s, starting %s', [
-                        event_config.event_name,
-                        date(event_config.event_start_date).format(__('Y-m-d'))
-                    ]) }}
-                {% else %}
-                    {{ event_config.event_name }}
-                {% endif %} <br>
-            {% elseif event_config.event_start_date and event_config.event_end_date %}
-                {{ __('Event from %s to %s', [
-                    date(event_config.event_start_date).format(__('Y-m-d')),
-                    date(event_config.event_end_date).format(__('Y-m-d'))
-                ]) }} <br>
-            {% endif %}
-        {% endblock %}
-
-        <a href="{{ config('faq_url') }}">{{ __('FAQ') }}</a>
-        · <a href="{{ config('contact_email') }}">
-            <span class="glyphicon glyphicon-envelope"></span> {{ __('Contact') }}
-          </a>
-        · <a href="https://github.com/engelsystem/engelsystem/issues">{{ __('Bugs / Features') }}</a>
-        · <a href="https://github.com/engelsystem/engelsystem/">{{ __('Development Platform') }}</a>
-        · <a href="{{ url('credits') }}">{{ __('Credits') }}</a>
-    </div>
-</div>
diff --git a/templates/layouts/parts/navbar.twig b/templates/layouts/parts/navbar.twig
deleted file mode 100644
index a718fc48..00000000
--- a/templates/layouts/parts/navbar.twig
+++ /dev/null
@@ -1,74 +0,0 @@
-{% import _self as elements %}
-
-{% macro toolbar_item(label, link, active_page, icon) %}
-    <li{% if page() == active_page %} class="active"{% endif %}>
-        <a href="{{ link }}">
-            {% if icon %}<span class="glyphicon {{ icon }}"></span>{% endif %}
-            {{ label|raw }}
-        </a>
-    </li>
-{% endmacro %}
-
-<div class="navbar navbar-default navbar-fixed-top">
-    <div class="container-fluid">
-        {% block navbar %}
-            <div class="navbar-header">
-                <button type="button" class="navbar-toggle collapsed"
-                        data-toggle="collapse" data-target="#navbar-collapse-1">
-                    <span class="sr-only">Toggle navigation</span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </button>
-                <a class="navbar-brand" href="{{ url('/') }}">
-                    <span class="icon-icon_angel"></span> <strong class="visible-lg-inline">ENGELSYSTEM</strong>
-                </a>
-            </div>
-
-            {% block menu %}
-                <div class="collapse navbar-collapse" id="navbar-collapse-1">
-                    {% block menu_items %}
-                        {{ menu() }}
-                    {% endblock %}
-
-                    {% block menu_toolbar %}
-                        <ul class="nav navbar-nav navbar-right">
-
-                            {% if is_user() %}
-                                {{ elements.toolbar_item(menuUserShiftState(user), url('shifts', {'action': 'next'}), '', 'glyphicon-time') }}
-                            {% elseif has_permission_to('register') and config('registration_enabled') %}
-                                {{ elements.toolbar_item(__('Register'), url('register'), 'register', 'glyphicon-plus') }}
-                            {% endif %}
-
-                            {% if has_permission_to('login') %}
-                                {{ elements.toolbar_item(__('Login'), url('login'), 'login', 'glyphicon-log-in') }}
-                            {% endif %}
-
-                            {% if is_user() and has_permission_to('user_messages') %}
-                                {{ elements.toolbar_item(menuUserMessages(), url('user-messages'), 'user-messages', 'glyphicon-envelope') }}
-                            {% endif %}
-
-                            {{ menuUserHints() }}
-
-                            {% if has_permission_to('user_myshifts') %}
-                                {{ elements.toolbar_item(user.Nick, url('users', {'action': 'view'}), 'users', 'icon-icon_angel') }}
-                            {% endif %}
-
-                            {% if has_permission_to('user_settings') or has_permission_to('logout') %}
-                                <li class="dropdown">
-                                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                                        <span class="caret"></span>
-                                    </a>
-                                    <ul class="dropdown-menu" role="menu">
-                                        {{ menuUserSubmenu()|join(" ")|raw }}
-                                    </ul>
-                                </li>
-                            {% endif %}
-
-                        </ul>
-                    {% endblock %}
-                </div>
-            {% endblock %}
-        {% endblock %}
-    </div>
-</div>