diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 58a4de6..e6a3826 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -10,9 +10,11 @@ module.exports = {
     parserOptions: {
         tsconfigRootDir: __dirname,
         project: [
-            './tsconfig.json',
             './tsconfig.test.json',
-            './tsconfig.frontend.json',
+            './src/tsconfig.json',
+            './src/common/tsconfig.json',
+            './src/assets/ts/tsconfig.json',
+            './src/assets/views/tsconfig.json',
         ]
     },
     extends: [
diff --git a/.gitignore b/.gitignore
index aa0623f..34df5f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
 .idea
 node_modules
-build
 dist
+intermediates
 public
 yarn-error.log
 
 config/local.*
+
+tsconfig.tsbuildinfo
diff --git a/assets/views/auth/auth.njk b/assets/views/auth/auth.njk
deleted file mode 100644
index 9accf33..0000000
--- a/assets/views/auth/auth.njk
+++ /dev/null
@@ -1,112 +0,0 @@
-{% extends 'layouts/base.njk' %}
-{% import 'macros.njk' as macros %}
-
-{% set title = 'Authentication / Registration' %}
-{% set decription = 'Join ' + app.name + ' and share your files!' %}
-{% set h1 = 'Authentication and registration' %}
-
-{% block body %}
-    <div class="container">
-        {% set queryStr = '' %}
-        {% set previousUrl = getPreviousUrl() %}
-        {% if query.redirect_uri | length %}
-            {% set queryStr = '?' + querystring.stringify({redirect_uri: query.redirect_uri}) %}
-        {% elif previousUrl | length %}
-            {% set queryStr = '?' + querystring.stringify({redirect_uri: previousUrl}) %}
-        {% endif %}
-
-        <section class="panel">
-            <h2><i data-feather="log-in"></i> Log in</h2>
-
-            {{ setFormPrefix('login-') }}
-            <form action="{{ route('login') + queryStr }}" method="POST" id="login-form">
-                {{ macros.field(_locals, 'text', 'identifier', query.identifier or '', 'Your email address or username', null, 'required') }}
-
-                {{ macros.field(_locals, 'password', 'password', null, 'Your password', 'Do not fill to log in via magic link.') }}
-
-                {{ macros.field(_locals, 'checkbox', 'persist_session', null, 'Stay logged in on this computer.') }}
-
-                <button type="submit">Authenticate</button>
-
-                {{ macros.csrf(getCsrfToken) }}
-            </form>
-        </section>
-
-        <section class="panel">
-            <h2><i data-feather="user-plus"></i> Register</h2>
-
-            {{ setFormPrefix('register-') }}
-            <form action="{{ route('register') + queryStr }}" method="POST" id="register-form">
-                <input type="hidden" name="auth_method" value="magic_link">
-                {{ macros.csrf(getCsrfToken) }}
-
-                {% if has_username %}
-                    {{ macros.field(_locals, 'text', 'name', null, 'Choose your username', 'This cannot be changed later.', 'pattern="[0-9a-z_-]+" required') }}
-                {% endif %}
-
-                <div id="register-magic_link_method_fields">
-                    {{ macros.field(_locals, 'email', 'identifier', null, 'Your email address', null, 'required') }}
-                    <a href="javascript: void(0);">Use password instead</a>
-                </div>
-
-                <div id="register-password_method_fields" class="hidden">
-                    {{ macros.field(_locals, 'password', 'password', null, 'Choose a password', null, 'required disabled') }}
-                    {{ macros.field(_locals, 'password', 'password_confirmation', null, 'Confirm your password', null, 'required disabled') }}
-                    <a href="javascript: void(0);">Use email address instead</a>
-                </div>
-
-                {{ macros.field(_locals, 'checkbox', 'terms', null, 'I accept the <a href="/terms-of-services" target="_blank">Terms Of Services</a>.' | safe, null, 'required') }}
-
-                <button type="submit" class="primary">Register</button>
-            </form>
-        </section>
-    </div>
-{% endblock %}
-
-{% block scripts %}
-    <script>
-        // Register form dynamics
-        document.addEventListener('DOMContentLoaded', () => {
-            const form = document.getElementById('register-form');
-            const authMethodField = form.querySelector('input[name=auth_method]');
-            const usernameField = form.querySelector('input[name=name]');
-            const magicLinkFields = document.getElementById('register-magic_link_method_fields');
-            const passwordFields = document.getElementById('register-password_method_fields');
-
-            let switchToPassword;
-            magicLinkFields.querySelector('a').addEventListener('click', switchToPassword = () => {
-                authMethodField.value = 'password';
-                usernameField.name = 'identifier';
-
-                magicLinkFields.classList.add('hidden');
-                magicLinkFields.querySelectorAll('input').forEach(el => {
-                    el.disabled = true;
-                });
-
-                passwordFields.classList.remove('hidden');
-                passwordFields.querySelectorAll('input').forEach(el => {
-                    el.disabled = false;
-                });
-            });
-
-            passwordFields.querySelector('a').addEventListener('click', () => {
-                authMethodField.value = 'magic_link';
-                usernameField.name = 'name';
-
-                magicLinkFields.classList.remove('hidden');
-                magicLinkFields.querySelectorAll('input').forEach(el => {
-                    el.disabled = false;
-                });
-
-                passwordFields.classList.add('hidden');
-                passwordFields.querySelectorAll('input').forEach(el => {
-                    el.disabled = true;
-                });
-            });
-
-            if (`{{ _locals.previousFormData()['auth_method'] | default('') }}` === 'password') {
-                switchToPassword();
-            }
-        });
-    </script>
-{% endblock %}
diff --git a/assets/views/macros.njk b/assets/views/macros.njk
deleted file mode 100644
index 8857876..0000000
--- a/assets/views/macros.njk
+++ /dev/null
@@ -1,185 +0,0 @@
-{% macro message(type, content, raw=false, discreet=false) %}
-    <div class="message{{ ' message-discreet' if discreet }}" data-type="{{ type }}">
-        <i class="icon"></i>
-        <span class="content">
-            {{ content|safe if raw else content }}
-        </span>
-    </div>
-{% endmacro %}
-
-{% macro messages(flash) %}
-    {% set flashed = flash() %}
-    {% set display = 0 %}
-
-    {% for type, bag in flashed %}
-        {% if bag|length %}
-            {% set display = 1 %}
-        {% endif %}
-    {% endfor %}
-
-    {% if display %}
-        <div class="messages">
-            {% for type, bag in flashed %}
-                {% for content in bag %}
-                    {{ message(type, content) }}
-                {% endfor %}
-            {% endfor %}
-        </div>
-    {% endif %}
-{% endmacro %}
-
-{% macro csrf(getCsrfToken) %}
-    <input type="hidden" name="csrf" value="{{ getCsrfToken() }}">
-{% endmacro %}
-
-{% macro field(_locals, type, name, value, placeholder, hint, validation_attributes='', extraData='', icon=null) %}
-    {% set validation = _locals.validation() %}
-    {% set validation = validation[name] if validation[name] or null %}
-    {% set previousFormData = _locals.previousFormData() %}
-    {% set value = previousFormData[name] or value or validation.value or '' %}
-    {% set prefix = _locals.getFormPrefix() | default('') %}
-
-    {% if type == 'hidden' %}
-        {% if validation %}
-            {{ message('error', validation.message) }}
-        {% endif %}
-        <input type="hidden" name="{{ name }}" value="{{ value }}">
-    {% else %}
-        <div class="form-field{{ ' inline' if type == 'checkbox' }}">
-            <div class="control">
-                {% if icon != null %}
-                    {% if icon.startsWith('fa') %}
-                        <i class="{{ icon }} feather icon"></i>
-                    {% else %}
-                        <i data-feather="{{ icon }}" class="icon"></i>
-                    {% endif %}
-                {% endif %}
-
-                {% if type == 'duration' %}
-                    <div class="input-group">
-                        {% for f in extraData %}
-                            <div class="time-input">
-                                {% if previousFormData[name] %}
-                                    {% set v = value[f] %}
-                                {% else %}
-                                    {% set v = (value % 60) if f == 's' else (((value - value % 60) / 60 % 60) if f == 'm' else ((value - value % 3600) / 3600 if f == 'h')) %}
-                                {% endif %}
-                                <input type="number" name="{{ name }}[{{ f }}]" id="field-{{ prefix }}{{ name }}-{{ f }}"
-                                       value="{{ v }}"
-                                       min="0" {{ 'max=60' if (f == 's' or f == 'm') }}
-                                        {{ validation_attributes }}>
-                                <label for="field-{{ prefix }}{{ name }}-{{ f }}">{{ f }}</label>
-                            </div>
-                        {% endfor %}
-                    </div>
-                {% elseif type == 'select' %}
-                    <select name="{{ name }}" id="field-{{ prefix }}{{ name }}" {{ validation_attributes|safe }}>
-                        {% for option in extraData %}
-                            <option value="{% if option.display === undefined or option.value !== undefined %}{{ option.value | default(option) }}{% endif %}"
-                                    {{ 'selected' if value == (option.value | default(option)) }}>{{ option.display | default(option) }}</option>
-                        {% endfor %}
-                    </select>
-                    <i data-feather="chevron-down"></i>
-                {% elseif type == 'textarea' %}
-                    <textarea name="{{ name }}" id="field-{{ prefix }}{{ name }}"
-                    {{ validation_attributes|safe }} value="{{ value }}">{{ value }}</textarea>
-                {% else %}
-                    <input type="{{ type }}" name="{{ name }}" id="field-{{ prefix }}{{ name }}"
-                            {% if type != 'checkbox' %} value="{{ value }}" {% endif %}
-                            {{ 'checked' if (type == 'checkbox' and value == 'on') }}
-                            {{ validation_attributes|safe }}>
-                {% endif %}
-
-                <label for="field-{{ prefix }}{{ name }}{{ '-' + extraData[0] if type == 'duration' }}">{{ placeholder }}</label>
-            </div>
-
-            {{ fieldError(_locals, name) }}
-            {% if hint %}
-                <div class="hint"><i data-feather="info"></i> {{ hint }}</div>
-            {% endif %}
-        </div>
-    {% endif %}
-{% endmacro %}
-
-{% macro fieldError(_locals, name) %}
-    {% set validation = _locals.validation() %}
-    {% set validation = validation[name] if validation[name] or null %}
-    {% if validation %}
-        <div class="error"><i data-feather="x-circle"></i> {{ validation.message }}</div>
-    {% endif %}
-{% endmacro %}
-
-{% macro websocket(websocketUrl, listener, reconnectOnClose = 1, checkFunction = 0) %}
-    <script>
-        document.addEventListener('DOMContentLoaded', () => {
-            {% if checkFunction %}
-            if (!{{ checkFunction }}()) return;
-            {% endif %}
-
-            const run = () => {
-                const websocket = new WebSocket('{{ websocketUrl }}');
-                websocket.onopen = (e) => {
-                    console.debug('Websocket connected');
-                };
-                websocket.onmessage = (e) => {
-                    {{ listener }}(websocket, e);
-                };
-                websocket.onerror = (e) => {
-                    console.error('Websocket error', e);
-                };
-                websocket.onclose = (e) => {
-                    console.debug('Websocket closed', e.code, e.reason);
-
-                    {% if reconnectOnClose %}
-                    setTimeout(run, 1000);
-                    {% endif %}
-                };
-            };
-
-            run();
-        });
-    </script>
-{% endmacro %}
-
-{% macro paginate(pagination, routeName, contextSize) %}
-    {% if pagination.hasPrevious() or pagination.hasNext() %}
-        <nav class="pagination">
-            <ul>
-                {% if pagination.hasPrevious() %}
-                    <li><a href="{{ route(routeName, {page: pagination.page - 1}) }}"><i data-feather="chevron-left"></i> Previous</a></li>
-                    {% for i in pagination.previousPages(contextSize) %}
-                        {% if i == -1 %}
-                            <li class="ellipsis">...</li>
-                        {% else %}
-                            <li><a href="{{ route(routeName, {page: i}) }}">{{ i }}</a></li>
-                        {% endif %}
-                    {% endfor %}
-                {% endif %}
-
-                <li class="active"><span>{{ pagination.page }}</span></li>
-
-                {% if pagination.hasNext() %}
-                    {% for i in pagination.nextPages(contextSize) %}
-                        {% if i == -1 %}
-                            <li class="ellipsis">...</li>
-                        {% else %}
-                            <li><a href="{{ route(routeName, {page: i}) }}">{{ i }}</a></li>
-                        {% endif %}
-                    {% endfor %}
-                    <li><a href="{{ route(routeName, {page: pagination.page + 1}) }}">Next <i data-feather="chevron-right"></i></a></li>
-                {% endif %}
-            </ul>
-        </nav>
-    {% endif %}
-{% endmacro %}
-
-{% macro breadcrumb(currentPageTitle, pages=[]) %}
-    <nav aria-label="breadcrumb">
-        <ol class="breadcrumb">
-            {% for page in pages %}
-                <li><a href="{{ page.link }}">{{ page.title }}</a></li>
-            {% endfor %}
-            <li class="active" aria-current="page">{{ currentPageTitle }}</li>
-        </ol>
-    </nav>
-{% endmacro %}
diff --git a/assets/views/magic_link_lobby.njk b/assets/views/magic_link_lobby.njk
deleted file mode 100644
index b86ceb4..0000000
--- a/assets/views/magic_link_lobby.njk
+++ /dev/null
@@ -1,57 +0,0 @@
-{% extends 'layouts/base.njk' %}
-
-{% set h1 = 'Authentication lobby' %}
-{% set title = app.name + ' ' + h1 %}
-
-{% block body %}
-    <div class="container">
-        <div class="panel">
-            {{ macros.message('success', 'We sent a link to ' + email + '. To authenticate, open it from any device.') }}
-            {{ macros.message('info', 'This link will be valid for <span id="countdown"></span> and can only be used once.', true, true) }}
-
-            <p class="center">Waiting for you to open the link...</p>
-        </div>
-    </div>
-{% endblock %}
-
-{% block scripts %}
-    <script>
-        const validUntil = {{ validUntil }}.0;
-
-        function isValid() {
-            return new Date().getTime() < validUntil;
-        }
-
-        function websocketListen(websocket, e) {
-            if (e.data === 'refresh') {
-                window.location.reload();
-            }
-        }
-
-        document.addEventListener('DOMContentLoaded', () => {
-            const countdown = document.getElementById('countdown');
-
-            if (!isValid()) return;
-
-            function animateCountdown() {
-                requestAnimationFrame(() => {
-                    let diff = Math.max(0, validUntil - new Date().getTime());
-                    if (diff === 0) {
-                        return;
-                    }
-
-                    diff /= 1000;
-                    const seconds = Math.floor(diff % 60).toFixed(0);
-                    const minutes = Math.floor((diff - seconds) / 60).toFixed(0);
-
-                    countdown.innerText = `${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
-                    animateCountdown();
-                });
-            }
-
-            animateCountdown();
-        });
-    </script>
-
-    {{ macros.websocket(websocketUrl, 'websocketListen', 1, 'isValid') }}
-{% endblock %}
diff --git a/package.json b/package.json
index eb0b6ca..cd1a8ca 100644
--- a/package.json
+++ b/package.json
@@ -17,10 +17,10 @@
         "test": "jest --verbose --runInBand",
         "clean": "node scripts/clean.js",
         "prepare-sources": "node scripts/prepare-sources.js",
-        "compile": "yarn clean && tsc",
-        "build": "yarn prepare-sources && yarn compile && node . pre-compile-views && node scripts/dist.js",
+        "compile": "yarn clean && yarn prepare-sources && tsc --build",
+        "build": "yarn compile && node . pre-compile-views && node scripts/dist.js",
         "build-production": "NODE_ENV=production yarn build",
-        "dev": "yarn compile && yarn prepare-sources && concurrently -k -n \"Maildev,Typescript,ViewPreCompile,Node\" -p \"[{name}]\" -c \"yellow,blue,red,green\" \"maildev\" \"tsc --watch\" \"nodemon -i public -i build -- pre-compile-views --watch\" \"nodemon -i public -i build\"",
+        "dev": "yarn compile && concurrently -k -n \"Maildev,Typescript,ViewPreCompile,Node\" -p \"[{name}]\" -c \"yellow,blue,red,green\" \"maildev\" \"tsc --build --watch\" \"nodemon -i public -i intermediates -- pre-compile-views --watch\" \"nodemon -i public -i intermediates\"",
         "lint": "eslint .",
         "release": "yarn build && yarn lint && yarn test && cd dist && yarn publish"
     },
diff --git a/scripts/_functions.js b/scripts/_functions.js
new file mode 100644
index 0000000..f58cda8
--- /dev/null
+++ b/scripts/_functions.js
@@ -0,0 +1,18 @@
+import fs from "fs";
+import path from "path";
+
+export function copyRecursively(file, destination) {
+    const target = path.join(destination, path.basename(file));
+    if (fs.statSync(file).isDirectory()) {
+        console.log('mkdir', target);
+
+        fs.mkdirSync(target, {recursive: true});
+        fs.readdirSync(file).forEach(f => {
+            copyRecursively(path.join(file, f), target);
+        });
+    } else {
+        console.log('> cp ', target);
+
+        fs.copyFileSync(file, target);
+    }
+}
diff --git a/scripts/clean.js b/scripts/clean.js
index 6504ce6..427e651 100644
--- a/scripts/clean.js
+++ b/scripts/clean.js
@@ -1,7 +1,7 @@
 import fs from "fs";
 
 [
-    'build',
+    'intermediates',
     'dist',
     'public',
 ].forEach(file => {
diff --git a/scripts/dist.js b/scripts/dist.js
index 25caf83..52722e8 100644
--- a/scripts/dist.js
+++ b/scripts/dist.js
@@ -1,28 +1,12 @@
 import fs from "fs";
 import path from "path";
-
-function copyRecursively(file, destination) {
-    const target = path.join(destination, path.basename(file));
-    if (fs.statSync(file).isDirectory()) {
-        console.log('mkdir', target);
-
-        fs.mkdirSync(target, {recursive: true});
-        fs.readdirSync(file).forEach(f => {
-            copyRecursively(path.join(file, f), target);
-        });
-    } else {
-        console.log('> cp ', target);
-
-        fs.copyFileSync(file, target);
-    }
-}
+import {copyRecursively} from "./_functions.js";
 
 
 [
     'yarn.lock',
     'README.md',
     'config/',
-    'assets/',
 ].forEach(file => {
     copyRecursively(file, 'dist');
 });
diff --git a/scripts/prepare-sources.js b/scripts/prepare-sources.js
index d2ef3f8..92940d1 100644
--- a/scripts/prepare-sources.js
+++ b/scripts/prepare-sources.js
@@ -1,9 +1,24 @@
 import fs from "fs";
+import path from "path";
+import {copyRecursively} from "./_functions.js";
 
 // These folders must exist for nodemon not to loop indefinitely.
 [
-    'build',
     'public',
+    'dist',
+    'intermediates',
+    'intermediates/assets',
 ].forEach(dir => {
     if (!fs.existsSync(dir)) fs.mkdirSync(dir);
 });
+
+// Symlink to build/common
+const symlink = path.resolve('intermediates/common');
+if (!fs.existsSync(symlink)) {
+    fs.symlinkSync(path.resolve('dist/common'), symlink);
+}
+
+// Copy all source files
+fs.readdirSync('src').forEach(file => {
+    copyRecursively(path.join('src', file), 'dist');
+});
diff --git a/src/TestApp.ts b/src/TestApp.ts
index 1832d43..b66a13b 100644
--- a/src/TestApp.ts
+++ b/src/TestApp.ts
@@ -84,7 +84,7 @@ export default class TestApp extends Application {
         this.use(new MaintenanceComponent());
 
         // Dynamic views and routes
-        const intermediateDirectory = 'build';
+        const intermediateDirectory = 'intermediates/assets';
         this.use(new FrontendToolsComponent(
             new AssetCompiler(intermediateDirectory, 'public'),
             new CopyAssetPreCompiler(intermediateDirectory, '', 'json', ['test/assets'], false),
@@ -96,7 +96,7 @@ export default class TestApp extends Application {
 
         // Services
         this.use(new MysqlComponent());
-        this.use(new MailComponent(new MailViewEngine('build', 'test/assets')));
+        this.use(new MailComponent(new MailViewEngine('intermediates/assets', 'test/assets')));
 
         // Session
         this.use(new RedisComponent());
diff --git a/assets/package.json b/src/assets/package.json
similarity index 100%
rename from assets/package.json
rename to src/assets/package.json
diff --git a/assets/ts/stores.ts b/src/assets/ts/stores.ts
similarity index 100%
rename from assets/ts/stores.ts
rename to src/assets/ts/stores.ts
diff --git a/assets/views/auth/account/account.njk b/src/assets/views/auth/account/account.njk
similarity index 96%
rename from assets/views/auth/account/account.njk
rename to src/assets/views/auth/account/account.njk
index c4f55dc..1ba9e79 100644
--- a/assets/views/auth/account/account.njk
+++ b/src/assets/views/auth/account/account.njk
@@ -23,11 +23,11 @@
         </div>
 
         {% if has_name_component %}
-            {% include './name_panel.njk' %}
+            {% include 'views/auth/account/name_panel.njk' %}
         {% endif %}
 
         {% if has_password_component %}
-            {% include './password_panel.njk' %}
+            {% include 'views/auth/account/password_panel.njk' %}
         {% endif %}
 
         <section class="panel">
diff --git a/assets/views/auth/account/name_panel.njk b/src/assets/views/auth/account/name_panel.njk
similarity index 100%
rename from assets/views/auth/account/name_panel.njk
rename to src/assets/views/auth/account/name_panel.njk
diff --git a/assets/views/auth/account/password_panel.njk b/src/assets/views/auth/account/password_panel.njk
similarity index 100%
rename from assets/views/auth/account/password_panel.njk
rename to src/assets/views/auth/account/password_panel.njk
diff --git a/assets/views/backend/accounts_approval.njk b/src/assets/views/backend/accounts_approval.njk
similarity index 100%
rename from assets/views/backend/accounts_approval.njk
rename to src/assets/views/backend/accounts_approval.njk
diff --git a/assets/views/backend/index.njk b/src/assets/views/backend/index.njk
similarity index 100%
rename from assets/views/backend/index.njk
rename to src/assets/views/backend/index.njk
diff --git a/assets/views/errors/400.svelte b/src/assets/views/errors/400.svelte
similarity index 100%
rename from assets/views/errors/400.svelte
rename to src/assets/views/errors/400.svelte
diff --git a/assets/views/errors/401.svelte b/src/assets/views/errors/401.svelte
similarity index 100%
rename from assets/views/errors/401.svelte
rename to src/assets/views/errors/401.svelte
diff --git a/assets/views/errors/403.svelte b/src/assets/views/errors/403.svelte
similarity index 100%
rename from assets/views/errors/403.svelte
rename to src/assets/views/errors/403.svelte
diff --git a/assets/views/errors/404.svelte b/src/assets/views/errors/404.svelte
similarity index 100%
rename from assets/views/errors/404.svelte
rename to src/assets/views/errors/404.svelte
diff --git a/assets/views/errors/429.svelte b/src/assets/views/errors/429.svelte
similarity index 100%
rename from assets/views/errors/429.svelte
rename to src/assets/views/errors/429.svelte
diff --git a/assets/views/errors/500.svelte b/src/assets/views/errors/500.svelte
similarity index 100%
rename from assets/views/errors/500.svelte
rename to src/assets/views/errors/500.svelte
diff --git a/assets/views/errors/503.svelte b/src/assets/views/errors/503.svelte
similarity index 100%
rename from assets/views/errors/503.svelte
rename to src/assets/views/errors/503.svelte
diff --git a/assets/views/errors/Error.svelte b/src/assets/views/errors/Error.svelte
similarity index 96%
rename from assets/views/errors/Error.svelte
rename to src/assets/views/errors/Error.svelte
index e6f67ce..00248a1 100644
--- a/assets/views/errors/Error.svelte
+++ b/src/assets/views/errors/Error.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import {locals} from "../../ts/stores";
+    import {locals} from "../../ts/stores.js";
 
     const previousUrl = $locals.getPreviousUrl();
 
diff --git a/assets/views/layouts/barebone.njk b/src/assets/views/layouts/barebone.njk
similarity index 100%
rename from assets/views/layouts/barebone.njk
rename to src/assets/views/layouts/barebone.njk
diff --git a/assets/views/layouts/svelte_layout.html b/src/assets/views/layouts/svelte_layout.html
similarity index 72%
rename from assets/views/layouts/svelte_layout.html
rename to src/assets/views/layouts/svelte_layout.html
index 599f6c6..d5fca94 100644
--- a/assets/views/layouts/svelte_layout.html
+++ b/src/assets/views/layouts/svelte_layout.html
@@ -9,13 +9,11 @@
         import * as stores from '/js/stores.js';
         const localStore = stores[Object.keys(stores)[0]].locals;
 
-        const locals = %locals%;
+        const localMap = %locals%;
         localStore.set((key, args) => {
-            const localKey = args ?
+            return localMap[args ?
                 `'${key}', \`${args}\``
-                : `'${key}'`;
-            // console.debug(localKey + '=' +  locals[localKey])
-            return locals[localKey];
+                : `'${key}'`];
         });
 
         new View({
diff --git a/assets/views/magic_link.njk b/src/assets/views/magic_link.njk
similarity index 100%
rename from assets/views/magic_link.njk
rename to src/assets/views/magic_link.njk
diff --git a/assets/views/mails/account_review_notice.mnjk b/src/assets/views/mails/account_review_notice.mnjk
similarity index 100%
rename from assets/views/mails/account_review_notice.mnjk
rename to src/assets/views/mails/account_review_notice.mnjk
diff --git a/assets/views/mails/add_email.mnjk b/src/assets/views/mails/add_email.mnjk
similarity index 100%
rename from assets/views/mails/add_email.mnjk
rename to src/assets/views/mails/add_email.mnjk
diff --git a/assets/views/mails/base_layout.mnjk b/src/assets/views/mails/base_layout.mnjk
similarity index 100%
rename from assets/views/mails/base_layout.mnjk
rename to src/assets/views/mails/base_layout.mnjk
diff --git a/assets/views/mails/magic_link.mnjk b/src/assets/views/mails/magic_link.mnjk
similarity index 100%
rename from assets/views/mails/magic_link.mnjk
rename to src/assets/views/mails/magic_link.mnjk
diff --git a/assets/views/mails/pending_account_review.mnjk b/src/assets/views/mails/pending_account_review.mnjk
similarity index 100%
rename from assets/views/mails/pending_account_review.mnjk
rename to src/assets/views/mails/pending_account_review.mnjk
diff --git a/assets/views/mails/remove_password.mnjk b/src/assets/views/mails/remove_password.mnjk
similarity index 100%
rename from assets/views/mails/remove_password.mnjk
rename to src/assets/views/mails/remove_password.mnjk
diff --git a/src/assets/views/tsconfig.json b/src/assets/views/tsconfig.json
new file mode 100644
index 0000000..bc808e8
--- /dev/null
+++ b/src/assets/views/tsconfig.json
@@ -0,0 +1,15 @@
+{
+    "extends": "@tsconfig/svelte/tsconfig.json",
+    "compilerOptions": {
+        "outDir": "public/js",
+        "rootDir": "../../../intermediates/assets",
+    },
+    "include": [
+        "src/assets/ts/**/*"
+    ],
+    "references": [
+        {
+            "path": "../../common"
+        }
+    ]
+}
diff --git a/src/auth/AccountController.ts b/src/auth/AccountController.ts
index 6b5ae4b..1585649 100644
--- a/src/auth/AccountController.ts
+++ b/src/auth/AccountController.ts
@@ -1,13 +1,13 @@
 import config from "config";
 import {Request, Response} from "express";
 
+import Time from "../common/Time.js";
 import Controller from "../Controller.js";
 import ModelFactory from "../db/ModelFactory.js";
 import Validator, {EMAIL_REGEX, InvalidFormatValidationError} from "../db/Validator.js";
 import {BadRequestError, ForbiddenHttpError, NotFoundHttpError} from "../HttpError.js";
 import MailTemplate from "../mail/MailTemplate.js";
 import {ADD_EMAIL_MAIL_TEMPLATE, REMOVE_PASSWORD_MAIL_TEMPLATE} from "../Mails.js";
-import Time from "../Time.js";
 import {RequireAuthMiddleware} from "./AuthComponent.js";
 import AuthMagicLinkActionType from "./magic_link/AuthMagicLinkActionType.js";
 import MagicLinkController from "./magic_link/MagicLinkController.js";
diff --git a/src/Time.ts b/src/common/Time.ts
similarity index 100%
rename from src/Time.ts
rename to src/common/Time.ts
diff --git a/src/common/package.json b/src/common/package.json
new file mode 100644
index 0000000..1cd945a
--- /dev/null
+++ b/src/common/package.json
@@ -0,0 +1,3 @@
+{
+    "type": "commonjs"
+}
diff --git a/src/common/tsconfig.json b/src/common/tsconfig.json
new file mode 100644
index 0000000..fd03de2
--- /dev/null
+++ b/src/common/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "extends": "../../tsconfig.json",
+    "compilerOptions": {
+        "composite": true,
+
+        "module": "CommonJS",
+
+        "baseUrl": "../../dist/common",
+        "rootDir": "./",
+        "sourceRoot": "./",
+        "outDir": "../../dist/common",
+
+        "typeRoots": [
+            "src/types"
+        ],
+    },
+    "include": [
+        "./**/*"
+    ]
+}
diff --git a/src/frontend/AssetPreCompiler.ts b/src/frontend/AssetPreCompiler.ts
index 8176ef8..c87d8b7 100644
--- a/src/frontend/AssetPreCompiler.ts
+++ b/src/frontend/AssetPreCompiler.ts
@@ -34,7 +34,7 @@ export default abstract class AssetPreCompiler {
     ) {
         this.assetPaths = [
             ...additionalFallbackAssetPaths,
-            'assets',
+            'src/assets',
             'node_modules/swaf/assets',
         ].map(p => path.resolve(p, assetType))
             .filter(dir => existsSync(dir));
diff --git a/src/frontend/SvelteViewEngine.ts b/src/frontend/SvelteViewEngine.ts
index 3e37520..97fa456 100644
--- a/src/frontend/SvelteViewEngine.ts
+++ b/src/frontend/SvelteViewEngine.ts
@@ -1,4 +1,4 @@
-import "../../node_modules/svelte/register.js";
+import "./register_svelte/register_svelte.js";
 
 import clearModule from "clear-module";
 import config from "config";
@@ -176,7 +176,7 @@ export default class SvelteViewEngine extends ViewEngine {
             replacedBackendCalls.code,
             sveltePreprocess({
                 typescript: {
-                    tsconfigFile: 'tsconfig.svelte.json',
+                    tsconfigFile: 'src/assets/views/tsconfig.json',
                 },
             }),
             {
@@ -276,7 +276,7 @@ export default class SvelteViewEngine extends ViewEngine {
         });
 
         // Load locals into locals store
-        const localsModulePath = "../../build/ts/stores.js";
+        const localsModulePath = "../../intermediates/assets/ts/stores.js";
         const localsModule = await import(localsModulePath);
         const locals = this.getGlobals().get();
         const localMap = this.compileBackendCalls(backendCalls, locals, true);
diff --git a/src/frontend/TypeScriptPreCompiler.ts b/src/frontend/TypeScriptPreCompiler.ts
index 0333d43..5c56ce3 100644
--- a/src/frontend/TypeScriptPreCompiler.ts
+++ b/src/frontend/TypeScriptPreCompiler.ts
@@ -12,7 +12,7 @@ export default class TypeScriptPreCompiler extends CopyAssetPreCompiler {
 
         this.onPreCompile(async _watch => {
             logger.info('Building ts assets...');
-            await child_process.execSync(`yarn tsc -b tsconfig.frontend.json`, {stdio: [process.stdin, process.stdout, process.stderr]});
+            await child_process.execSync(`yarn tsc -b src/assets/ts/tsconfig.json`, {stdio: [process.stdin, process.stdout, process.stderr]});
         });
     }
 }
diff --git a/src/frontend/register_svelte/package.json b/src/frontend/register_svelte/package.json
new file mode 100644
index 0000000..1cd945a
--- /dev/null
+++ b/src/frontend/register_svelte/package.json
@@ -0,0 +1,3 @@
+{
+    "type": "commonjs"
+}
diff --git a/src/frontend/register_svelte/register_svelte.js b/src/frontend/register_svelte/register_svelte.js
new file mode 100644
index 0000000..7ecaf77
--- /dev/null
+++ b/src/frontend/register_svelte/register_svelte.js
@@ -0,0 +1 @@
+require("svelte/register");
diff --git a/src/tsconfig.json b/src/tsconfig.json
new file mode 100644
index 0000000..851ef5f
--- /dev/null
+++ b/src/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "extends": "../tsconfig.json",
+    "compilerOptions": {
+        "composite": true,
+
+        "baseUrl": "../dist",
+        "rootDir": "./",
+        "sourceRoot": "./",
+        "outDir": "../dist",
+
+        "typeRoots": [
+            "src/types"
+        ]
+    },
+    "include": [
+        "./**/*"
+    ],
+    "exclude": [
+        "./assets/**/*",
+        "./common/**/*"
+    ],
+    "references": [
+        {
+            "path": "./common"
+        }
+    ]
+}
diff --git a/tsconfig.frontend.json b/tsconfig.frontend.json
deleted file mode 100644
index 40ceb4e..0000000
--- a/tsconfig.frontend.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "extends": "./tsconfig.json",
-    "compilerOptions": {
-        "target": "ESNext",
-        "module": "CommonJS",
-        "baseUrl": "build",
-        "rootDir": "build/ts-source",
-        "sourceRoot": "build/ts-source",
-        "outDir": "build/ts",
-        "declaration": false,
-
-        "typeRoots": [],
-        "resolveJsonModule": false
-    },
-    "include": [
-        "build/ts-source/**/*"
-    ]
-}
diff --git a/tsconfig.json b/tsconfig.json
index 81e9132..480ba8f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -7,12 +7,11 @@
 
         "strict": true,
         "allowSyntheticDefaultImports": true,
+        "strictNullChecks": true,
 
         "moduleResolution": "Node",
         "esModuleInterop": true,
         "baseUrl": "dist",
-        "rootDir": "src",
-        "sourceRoot": "src",
         "inlineSourceMap": true,
         "inlineSources": true,
         "outDir": "dist",
@@ -25,9 +24,19 @@
             "es2020"
         ],
         "resolveJsonModule": true,
-        "skipLibCheck": true
+        "skipLibCheck": true,
+        "allowJs": true,
     },
-    "include": [
-        "src/**/*"
+    "include": [],
+    "references": [
+        {
+            "path": "src",
+        },
+        {
+            "path": "src/assets/ts",
+        },
+        {
+            "path": "src/assets/views",
+        }
     ]
 }
diff --git a/tsconfig.svelte.json b/tsconfig.svelte.json
deleted file mode 100644
index 8d18bb6..0000000
--- a/tsconfig.svelte.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "extends": "@tsconfig/svelte/tsconfig.json",
-    "compilerOptions": {
-        "outDir": "public/js",
-        "rootDir": "build",
-    },
-    "include": [
-        "assets/ts/**/*"
-    ],
-}