582 files changed, 246 insertions, 188 deletions

diff --git a/gulpfile.ts b/gulpfile.ts
index 9c61e3a1cb..11f34c9629 100644
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -22,7 +22,7 @@ import * as replace from 'gulp-replace';
 import * as htmlmin from 'gulp-htmlmin';
 const uglifyes = require('uglify-es');
 
-import { fa } from './src/common/build/fa';
+import { fa } from './src/build/fa';
 import version from './src/version';
 import config from './src/conf';
 
@@ -39,7 +39,7 @@ if (isDebug) {
 
 const constants = require('./src/const.json');
 
-require('./src/web/docs/gulpfile.ts');
+require('./src/server/web/docs/gulpfile.ts');
 
 gulp.task('build', [
 	'build:js',
@@ -52,7 +52,7 @@ gulp.task('build', [
 gulp.task('rebuild', ['clean', 'build']);
 
 gulp.task('build:js', () =>
-	gulp.src(['./src/**/*.js', '!./src/web/**/*.js'])
+	gulp.src(['./src/**/*.js', '!./src/server/web/**/*.js'])
 		.pipe(gulp.dest('./built/'))
 );
 
@@ -71,7 +71,7 @@ gulp.task('build:copy', () =>
 	gulp.src([
 		'./build/Release/crypto_key.node',
 		'./src/**/assets/**/*',
-		'!./src/web/app/**/assets/**/*'
+		'!./src/server/web/app/**/assets/**/*'
 	]).pipe(gulp.dest('./built/'))
 );
 
@@ -121,7 +121,7 @@ gulp.task('build:client', [
 ]);
 
 gulp.task('build:client:script', () =>
-	gulp.src(['./src/web/app/boot.js', './src/web/app/safe.js'])
+	gulp.src(['./src/server/web/app/boot.js', './src/server/web/app/safe.js'])
 		.pipe(replace('VERSION', JSON.stringify(version)))
 		.pipe(replace('API', JSON.stringify(config.api_url)))
 		.pipe(replace('ENV', JSON.stringify(env)))
@@ -129,15 +129,15 @@ gulp.task('build:client:script', () =>
 		.pipe(isProduction ? uglify({
 			toplevel: true
 		} as any) : gutil.noop())
-		.pipe(gulp.dest('./built/web/assets/')) as any
+		.pipe(gulp.dest('./built/server/web/assets/')) as any
 );
 
 gulp.task('build:client:styles', () =>
-	gulp.src('./src/web/app/init.css')
+	gulp.src('./src/server/web/app/init.css')
 		.pipe(isProduction
 			? (cssnano as any)()
 			: gutil.noop())
-		.pipe(gulp.dest('./built/web/assets/'))
+		.pipe(gulp.dest('./built/server/web/assets/'))
 );
 
 gulp.task('copy:client', [
@@ -145,14 +145,14 @@ gulp.task('copy:client', [
 ], () =>
 		gulp.src([
 			'./assets/**/*',
-			'./src/web/assets/**/*',
-			'./src/web/app/*/assets/**/*'
+			'./src/server/web/assets/**/*',
+			'./src/server/web/app/*/assets/**/*'
 		])
 			.pipe(isProduction ? (imagemin as any)() : gutil.noop())
 			.pipe(rename(path => {
 				path.dirname = path.dirname.replace('assets', '.');
 			}))
-			.pipe(gulp.dest('./built/web/assets/'))
+			.pipe(gulp.dest('./built/server/web/assets/'))
 );
 
 gulp.task('build:client:pug', [
@@ -160,13 +160,13 @@ gulp.task('build:client:pug', [
 	'build:client:script',
 	'build:client:styles'
 ], () =>
-		gulp.src('./src/web/app/base.pug')
+		gulp.src('./src/server/web/app/base.pug')
 			.pipe(pug({
 				locals: {
 					themeColor: constants.themeColor,
 					facss: fa.dom.css(),
 					//hljscss: fs.readFileSync('./node_modules/highlight.js/styles/default.css', 'utf8')
-					hljscss: fs.readFileSync('./src/web/assets/code-highlight.css', 'utf8')
+					hljscss: fs.readFileSync('./src/server/web/assets/code-highlight.css', 'utf8')
 				}
 			}))
 			.pipe(htmlmin({
@@ -201,5 +201,5 @@ gulp.task('build:client:pug', [
 				// CSSも圧縮する
 				minifyCSS: true
 			}))
-			.pipe(gulp.dest('./built/web/app/'))
+			.pipe(gulp.dest('./built/server/web/app/'))
 );
diff --git a/package.json b/package.json
index d9ed80b470..290fb00d7e 100644
--- a/package.json
+++ b/package.json
@@ -135,6 +135,7 @@
 		"is-url": "1.2.3",
 		"js-yaml": "3.11.0",
 		"jsdom": "^11.6.2",
+		"kue": "^0.11.6",
 		"license-checker": "18.0.0",
 		"loader-utils": "1.1.0",
 		"mecab-async": "0.1.2",
@@ -149,6 +150,7 @@
 		"nan": "^2.10.0",
 		"node-sass": "4.7.2",
 		"node-sass-json-importer": "3.1.5",
+		"nopt": "^4.0.1",
 		"nprogress": "0.2.0",
 		"object-assign-deep": "0.3.1",
 		"on-build-webpack": "0.1.0",
diff --git a/src/common/build/fa.ts b/src/build/fa.ts
index 0c21be9504..0c21be9504 100644
--- a/src/common/build/fa.ts
+++ b/src/build/fa.ts
diff --git a/src/common/build/i18n.ts b/src/build/i18n.ts
index 5e3c0381a9..b9b7403214 100644
--- a/src/common/build/i18n.ts
+++ b/src/build/i18n.ts
@@ -2,7 +2,7 @@
  * Replace i18n texts
  */
 
-import locale from '../../../locales';
+import locale from '../../locales';
 
 export default class Replacer {
 	private lang: string;
diff --git a/src/common/build/license.ts b/src/build/license.ts
index e5c264df8a..d36af665cd 100644
--- a/src/common/build/license.ts
+++ b/src/build/license.ts
@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 
-const license = fs.readFileSync(__dirname + '/../../../LICENSE', 'utf-8');
+const license = fs.readFileSync(__dirname + '/../../LICENSE', 'utf-8');
 
 const licenseHtml = license
 	.replace(/\r\n/g, '\n')
diff --git a/src/index.ts b/src/index.ts
index 218455d6f4..bd9b094d98 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -24,6 +24,8 @@ import stats from './utils/stats';
 import { Config, path as configPath } from './config';
 import loadConfig from './config';
 
+import parseOpt from './parse-opt';
+
 const clusterLog = debug('misskey:cluster');
 const ev = new Xev();
 
@@ -36,20 +38,22 @@ main();
  * Init process
  */
 function main() {
+	const opt = parseOpt(process.argv, 2);
+
 	if (cluster.isMaster) {
-		masterMain();
+		masterMain(opt);
 
 		ev.mount();
 		stats();
 	} else {
-		workerMain();
+		workerMain(opt);
 	}
 }
 
 /**
  * Init master process
  */
-async function masterMain() {
+async function masterMain(opt) {
 	let config: Config;
 
 	try {
@@ -69,19 +73,35 @@ async function masterMain() {
 	}
 
 	spawnWorkers(() => {
-		Logger.info(chalk.bold.green(
-			`Now listening on port ${chalk.underline(config.port.toString())}`));
+		if (!opt['only-processor']) {
+			Logger.info(chalk.bold.green(
+				`Now listening on port ${chalk.underline(config.port.toString())}`));
 
-		Logger.info(chalk.bold.green(config.url));
+			Logger.info(chalk.bold.green(config.url));
+		}
+
+		if (!opt['only-server']) {
+			Logger.info(chalk.bold.green('Now processing jobs'));
+		}
 	});
 }
 
 /**
  * Init worker process
  */
-function workerMain() {
-	// start server
-	require('./server');
+async function workerMain(opt) {
+	if (!opt['only-processor']) {
+		// start server
+		await require('./server').default();
+	}
+
+	if (!opt['only-server']) {
+		// start processor
+		require('./processor').default();
+	}
+
+	// Send a 'ready' message to parent process
+	process.send('ready');
 }
 
 /**
diff --git a/src/parse-opt.ts b/src/parse-opt.ts
new file mode 100644
index 0000000000..61dc60c6cd
--- /dev/null
+++ b/src/parse-opt.ts
@@ -0,0 +1,17 @@
+const nopt = require('nopt');
+
+export default (vector, index) => {
+	const parsed = nopt({
+		'only-processor': Boolean,
+		'only-server': Boolean
+	}, {
+		p: ['--only-processor'],
+		s: ['--only-server']
+	}, vector, index);
+
+	if (parsed['only-processor'] && parsed['only-server']) {
+		throw 'only-processor option and only-server option cannot be set at the same time';
+	}
+
+	return parsed;
+};
diff --git a/src/processor/index.ts b/src/processor/index.ts
new file mode 100644
index 0000000000..f06cf24e87
--- /dev/null
+++ b/src/processor/index.ts
@@ -0,0 +1,4 @@
+import queue from '../queue';
+import reportGitHubFailure from './report-github-failure';
+
+export default () => queue.process('gitHubFailureReport', reportGitHubFailure);
diff --git a/src/processor/report-github-failure.ts b/src/processor/report-github-failure.ts
new file mode 100644
index 0000000000..f42071142e
--- /dev/null
+++ b/src/processor/report-github-failure.ts
@@ -0,0 +1,29 @@
+import * as request from 'request';
+import User from '../server/api/models/user';
+const createPost = require('../server/api/endpoints/posts/create');
+
+export default ({ data }, done) => {
+	const asyncBot = User.findOne({ _id: data.userId });
+
+	// Fetch parent status
+	request({
+		url: `${data.parentUrl}/statuses`,
+		headers: {
+			'User-Agent': 'misskey'
+		}
+	}, async (err, res, body) => {
+		if (err) {
+			console.error(err);
+			return;
+		}
+		const parentStatuses = JSON.parse(body);
+		const parentState = parentStatuses[0].state;
+		const stillFailed = parentState == 'failure' || parentState == 'error';
+		const text = stillFailed ?
+			`**⚠️BUILD STILL FAILED⚠️**: ?[${data.message}](${data.htmlUrl})` :
+			`**🚨BUILD FAILED🚨**: →→→?[${data.message}](${data.htmlUrl})←←←`;
+
+		createPost({ text }, await asyncBot);
+		done();
+	});
+};
diff --git a/src/queue.ts b/src/queue.ts
new file mode 100644
index 0000000000..6089e0a7f1
--- /dev/null
+++ b/src/queue.ts
@@ -0,0 +1,10 @@
+import { createQueue } from 'kue';
+import config from './conf';
+
+export default createQueue({
+	redis: {
+		port: config.redis.port,
+		host: config.redis.host,
+		auth: config.redis.pass
+	}
+});
diff --git a/src/api/api-handler.ts b/src/server/api/api-handler.ts
index fb603a0e2a..fb603a0e2a 100644
--- a/src/api/api-handler.ts
+++ b/src/server/api/api-handler.ts
diff --git a/src/api/authenticate.ts b/src/server/api/authenticate.ts
index 537c3d1e1f..537c3d1e1f 100644
--- a/src/api/authenticate.ts
+++ b/src/server/api/authenticate.ts
diff --git a/src/api/bot/core.ts b/src/server/api/bot/core.ts
index 77a68aaee6..77a68aaee6 100644
--- a/src/api/bot/core.ts
+++ b/src/server/api/bot/core.ts
diff --git a/src/api/bot/interfaces/line.ts b/src/server/api/bot/interfaces/line.ts
index 8036b2fde4..5b3e9107f6 100644
--- a/src/api/bot/interfaces/line.ts
+++ b/src/server/api/bot/interfaces/line.ts
@@ -3,9 +3,9 @@ import * as express from 'express';
 import * as request from 'request';
 import * as crypto from 'crypto';
 import User from '../../models/user';
-import config from '../../../conf';
+import config from '../../../../conf';
 import BotCore from '../core';
-import _redis from '../../../db/redis';
+import _redis from '../../../../db/redis';
 import prominence = require('prominence');
 import getAcct from '../../../common/user/get-acct';
 import parseAcct from '../../../common/user/parse-acct';
diff --git a/src/api/common/drive/add-file.ts b/src/server/api/common/drive/add-file.ts
index c4f2f212ac..5f3c69c15a 100644
--- a/src/api/common/drive/add-file.ts
+++ b/src/server/api/common/drive/add-file.ts
@@ -15,7 +15,7 @@ import DriveFolder from '../../models/drive-folder';
 import { pack } from '../../models/drive-file';
 import event, { publishDriveStream } from '../../event';
 import getAcct from '../../../common/user/get-acct';
-import config from '../../../conf';
+import config from '../../../../conf';
 
 const gm = _gm.subClass({
 	imageMagick: true
diff --git a/src/api/common/drive/upload_from_url.ts b/src/server/api/common/drive/upload_from_url.ts
index 5dd9695936..5dd9695936 100644
--- a/src/api/common/drive/upload_from_url.ts
+++ b/src/server/api/common/drive/upload_from_url.ts
diff --git a/src/api/common/generate-native-user-token.ts b/src/server/api/common/generate-native-user-token.ts
index 2082b89a5a..2082b89a5a 100644
--- a/src/api/common/generate-native-user-token.ts
+++ b/src/server/api/common/generate-native-user-token.ts
diff --git a/src/api/common/get-friends.ts b/src/server/api/common/get-friends.ts
index db6313816d..db6313816d 100644
--- a/src/api/common/get-friends.ts
+++ b/src/server/api/common/get-friends.ts
diff --git a/src/api/common/get-host-lower.ts b/src/server/api/common/get-host-lower.ts
index fc4b30439e..fc4b30439e 100644
--- a/src/api/common/get-host-lower.ts
+++ b/src/server/api/common/get-host-lower.ts
diff --git a/src/api/common/is-native-token.ts b/src/server/api/common/is-native-token.ts
index 0769a4812e..0769a4812e 100644
--- a/src/api/common/is-native-token.ts
+++ b/src/server/api/common/is-native-token.ts
diff --git a/src/api/common/notify.ts b/src/server/api/common/notify.ts
index ae5669b84c..ae5669b84c 100644
--- a/src/api/common/notify.ts
+++ b/src/server/api/common/notify.ts
diff --git a/src/api/common/push-sw.ts b/src/server/api/common/push-sw.ts
index 2993c760ee..b33715eb18 100644
--- a/src/api/common/push-sw.ts
+++ b/src/server/api/common/push-sw.ts
@@ -1,7 +1,7 @@
 const push = require('web-push');
 import * as mongo from 'mongodb';
 import Subscription from '../models/sw-subscription';
-import config from '../../conf';
+import config from '../../../conf';
 
 if (config.sw) {
 	// アプリケーションの連絡先と、サーバーサイドの鍵ペアの情報を登録
diff --git a/src/api/common/read-messaging-message.ts b/src/server/api/common/read-messaging-message.ts
index 8e5e5b2b68..8e5e5b2b68 100644
--- a/src/api/common/read-messaging-message.ts
+++ b/src/server/api/common/read-messaging-message.ts
diff --git a/src/api/common/read-notification.ts b/src/server/api/common/read-notification.ts
index 3009cc5d08..3009cc5d08 100644
--- a/src/api/common/read-notification.ts
+++ b/src/server/api/common/read-notification.ts
diff --git a/src/api/common/signin.ts b/src/server/api/common/signin.ts
index 04c2cdac81..a11ea56c0c 100644
--- a/src/api/common/signin.ts
+++ b/src/server/api/common/signin.ts
@@ -1,4 +1,4 @@
-import config from '../../conf';
+import config from '../../../conf';
 
 export default function(res, user, redirect: boolean) {
 	const expires = 1000 * 60 * 60 * 24 * 365; // One Year
diff --git a/src/api/common/text/core/syntax-highlighter.ts b/src/server/api/common/text/core/syntax-highlighter.ts
index c0396b1fc6..c0396b1fc6 100644
--- a/src/api/common/text/core/syntax-highlighter.ts
+++ b/src/server/api/common/text/core/syntax-highlighter.ts
diff --git a/src/api/common/text/elements/bold.ts b/src/server/api/common/text/elements/bold.ts
index ce25764457..ce25764457 100644
--- a/src/api/common/text/elements/bold.ts
+++ b/src/server/api/common/text/elements/bold.ts
diff --git a/src/api/common/text/elements/code.ts b/src/server/api/common/text/elements/code.ts
index 4821e95fe2..4821e95fe2 100644
--- a/src/api/common/text/elements/code.ts
+++ b/src/server/api/common/text/elements/code.ts
diff --git a/src/api/common/text/elements/emoji.ts b/src/server/api/common/text/elements/emoji.ts
index e24231a223..e24231a223 100644
--- a/src/api/common/text/elements/emoji.ts
+++ b/src/server/api/common/text/elements/emoji.ts
diff --git a/src/api/common/text/elements/hashtag.ts b/src/server/api/common/text/elements/hashtag.ts
index ee57b140b8..ee57b140b8 100644
--- a/src/api/common/text/elements/hashtag.ts
+++ b/src/server/api/common/text/elements/hashtag.ts
diff --git a/src/api/common/text/elements/inline-code.ts b/src/server/api/common/text/elements/inline-code.ts
index 9f9ef51a2b..9f9ef51a2b 100644
--- a/src/api/common/text/elements/inline-code.ts
+++ b/src/server/api/common/text/elements/inline-code.ts
diff --git a/src/api/common/text/elements/link.ts b/src/server/api/common/text/elements/link.ts
index 35563ddc3d..35563ddc3d 100644
--- a/src/api/common/text/elements/link.ts
+++ b/src/server/api/common/text/elements/link.ts
diff --git a/src/api/common/text/elements/mention.ts b/src/server/api/common/text/elements/mention.ts
index 2025dfdaad..2025dfdaad 100644
--- a/src/api/common/text/elements/mention.ts
+++ b/src/server/api/common/text/elements/mention.ts
diff --git a/src/api/common/text/elements/quote.ts b/src/server/api/common/text/elements/quote.ts
index cc8cfffdc4..cc8cfffdc4 100644
--- a/src/api/common/text/elements/quote.ts
+++ b/src/server/api/common/text/elements/quote.ts
diff --git a/src/api/common/text/elements/url.ts b/src/server/api/common/text/elements/url.ts
index 1003aff9c3..1003aff9c3 100644
--- a/src/api/common/text/elements/url.ts
+++ b/src/server/api/common/text/elements/url.ts
diff --git a/src/api/common/text/index.ts b/src/server/api/common/text/index.ts
index 1e2398dc38..1e2398dc38 100644
--- a/src/api/common/text/index.ts
+++ b/src/server/api/common/text/index.ts
diff --git a/src/api/common/watch-post.ts b/src/server/api/common/watch-post.ts
index 1a50f0edaa..1a50f0edaa 100644
--- a/src/api/common/watch-post.ts
+++ b/src/server/api/common/watch-post.ts
diff --git a/src/api/endpoints.ts b/src/server/api/endpoints.ts
index c7100bd036..c7100bd036 100644
--- a/src/api/endpoints.ts
+++ b/src/server/api/endpoints.ts
diff --git a/src/api/endpoints/aggregation/posts.ts b/src/server/api/endpoints/aggregation/posts.ts
index 9d8bccbdb2..9d8bccbdb2 100644
--- a/src/api/endpoints/aggregation/posts.ts
+++ b/src/server/api/endpoints/aggregation/posts.ts
diff --git a/src/api/endpoints/aggregation/posts/reaction.ts b/src/server/api/endpoints/aggregation/posts/reaction.ts
index eb99b9d088..eb99b9d088 100644
--- a/src/api/endpoints/aggregation/posts/reaction.ts
+++ b/src/server/api/endpoints/aggregation/posts/reaction.ts
diff --git a/src/api/endpoints/aggregation/posts/reactions.ts b/src/server/api/endpoints/aggregation/posts/reactions.ts
index 790b523be9..790b523be9 100644
--- a/src/api/endpoints/aggregation/posts/reactions.ts
+++ b/src/server/api/endpoints/aggregation/posts/reactions.ts
diff --git a/src/api/endpoints/aggregation/posts/reply.ts b/src/server/api/endpoints/aggregation/posts/reply.ts
index b114c34e1e..b114c34e1e 100644
--- a/src/api/endpoints/aggregation/posts/reply.ts
+++ b/src/server/api/endpoints/aggregation/posts/reply.ts
diff --git a/src/api/endpoints/aggregation/posts/repost.ts b/src/server/api/endpoints/aggregation/posts/repost.ts
index 217159caa7..217159caa7 100644
--- a/src/api/endpoints/aggregation/posts/repost.ts
+++ b/src/server/api/endpoints/aggregation/posts/repost.ts
diff --git a/src/api/endpoints/aggregation/users.ts b/src/server/api/endpoints/aggregation/users.ts
index e38ce92ff9..e38ce92ff9 100644
--- a/src/api/endpoints/aggregation/users.ts
+++ b/src/server/api/endpoints/aggregation/users.ts
diff --git a/src/api/endpoints/aggregation/users/activity.ts b/src/server/api/endpoints/aggregation/users/activity.ts
index 102a71d7cb..102a71d7cb 100644
--- a/src/api/endpoints/aggregation/users/activity.ts
+++ b/src/server/api/endpoints/aggregation/users/activity.ts
diff --git a/src/api/endpoints/aggregation/users/followers.ts b/src/server/api/endpoints/aggregation/users/followers.ts
index 3022b2b002..3022b2b002 100644
--- a/src/api/endpoints/aggregation/users/followers.ts
+++ b/src/server/api/endpoints/aggregation/users/followers.ts
diff --git a/src/api/endpoints/aggregation/users/following.ts b/src/server/api/endpoints/aggregation/users/following.ts
index 92da7e6921..92da7e6921 100644
--- a/src/api/endpoints/aggregation/users/following.ts
+++ b/src/server/api/endpoints/aggregation/users/following.ts
diff --git a/src/api/endpoints/aggregation/users/post.ts b/src/server/api/endpoints/aggregation/users/post.ts
index c6a75eee39..c6a75eee39 100644
--- a/src/api/endpoints/aggregation/users/post.ts
+++ b/src/server/api/endpoints/aggregation/users/post.ts
diff --git a/src/api/endpoints/aggregation/users/reaction.ts b/src/server/api/endpoints/aggregation/users/reaction.ts
index 0a082ed1b7..0a082ed1b7 100644
--- a/src/api/endpoints/aggregation/users/reaction.ts
+++ b/src/server/api/endpoints/aggregation/users/reaction.ts
diff --git a/src/api/endpoints/app/create.ts b/src/server/api/endpoints/app/create.ts
index 0f688792a7..0f688792a7 100644
--- a/src/api/endpoints/app/create.ts
+++ b/src/server/api/endpoints/app/create.ts
diff --git a/src/api/endpoints/app/name_id/available.ts b/src/server/api/endpoints/app/name_id/available.ts
index 3d2c710322..3d2c710322 100644
--- a/src/api/endpoints/app/name_id/available.ts
+++ b/src/server/api/endpoints/app/name_id/available.ts
diff --git a/src/api/endpoints/app/show.ts b/src/server/api/endpoints/app/show.ts
index 8bc3dda42c..8bc3dda42c 100644
--- a/src/api/endpoints/app/show.ts
+++ b/src/server/api/endpoints/app/show.ts
diff --git a/src/api/endpoints/auth/accept.ts b/src/server/api/endpoints/auth/accept.ts
index 4ee20a6d25..4ee20a6d25 100644
--- a/src/api/endpoints/auth/accept.ts
+++ b/src/server/api/endpoints/auth/accept.ts
diff --git a/src/api/endpoints/auth/session/generate.ts b/src/server/api/endpoints/auth/session/generate.ts
index 510382247e..dc6a045b6e 100644
--- a/src/api/endpoints/auth/session/generate.ts
+++ b/src/server/api/endpoints/auth/session/generate.ts
@@ -5,7 +5,7 @@ import * as uuid from 'uuid';
 import $ from 'cafy';
 import App from '../../../models/app';
 import AuthSess from '../../../models/auth-session';
-import config from '../../../../conf';
+import config from '../../../../../conf';
 
 /**
  * @swagger
diff --git a/src/api/endpoints/auth/session/show.ts b/src/server/api/endpoints/auth/session/show.ts
index 73ac3185f6..73ac3185f6 100644
--- a/src/api/endpoints/auth/session/show.ts
+++ b/src/server/api/endpoints/auth/session/show.ts
diff --git a/src/api/endpoints/auth/session/userkey.ts b/src/server/api/endpoints/auth/session/userkey.ts
index fc989bf8c2..fc989bf8c2 100644
--- a/src/api/endpoints/auth/session/userkey.ts
+++ b/src/server/api/endpoints/auth/session/userkey.ts
diff --git a/src/api/endpoints/channels.ts b/src/server/api/endpoints/channels.ts
index b9a7d1b788..b9a7d1b788 100644
--- a/src/api/endpoints/channels.ts
+++ b/src/server/api/endpoints/channels.ts
diff --git a/src/api/endpoints/channels/create.ts b/src/server/api/endpoints/channels/create.ts
index 695b4515b3..695b4515b3 100644
--- a/src/api/endpoints/channels/create.ts
+++ b/src/server/api/endpoints/channels/create.ts
diff --git a/src/api/endpoints/channels/posts.ts b/src/server/api/endpoints/channels/posts.ts
index d722589c20..d722589c20 100644
--- a/src/api/endpoints/channels/posts.ts
+++ b/src/server/api/endpoints/channels/posts.ts
diff --git a/src/api/endpoints/channels/show.ts b/src/server/api/endpoints/channels/show.ts
index 332da64675..332da64675 100644
--- a/src/api/endpoints/channels/show.ts
+++ b/src/server/api/endpoints/channels/show.ts
diff --git a/src/api/endpoints/channels/unwatch.ts b/src/server/api/endpoints/channels/unwatch.ts
index 19d3be118a..19d3be118a 100644
--- a/src/api/endpoints/channels/unwatch.ts
+++ b/src/server/api/endpoints/channels/unwatch.ts
diff --git a/src/api/endpoints/channels/watch.ts b/src/server/api/endpoints/channels/watch.ts
index 030e0dd411..030e0dd411 100644
--- a/src/api/endpoints/channels/watch.ts
+++ b/src/server/api/endpoints/channels/watch.ts
diff --git a/src/api/endpoints/drive.ts b/src/server/api/endpoints/drive.ts
index d92473633a..d92473633a 100644
--- a/src/api/endpoints/drive.ts
+++ b/src/server/api/endpoints/drive.ts
diff --git a/src/api/endpoints/drive/files.ts b/src/server/api/endpoints/drive/files.ts
index 89915331ea..89915331ea 100644
--- a/src/api/endpoints/drive/files.ts
+++ b/src/server/api/endpoints/drive/files.ts
diff --git a/src/api/endpoints/drive/files/create.ts b/src/server/api/endpoints/drive/files/create.ts
index db801b61fe..db801b61fe 100644
--- a/src/api/endpoints/drive/files/create.ts
+++ b/src/server/api/endpoints/drive/files/create.ts
diff --git a/src/api/endpoints/drive/files/find.ts b/src/server/api/endpoints/drive/files/find.ts
index e026afe936..e026afe936 100644
--- a/src/api/endpoints/drive/files/find.ts
+++ b/src/server/api/endpoints/drive/files/find.ts
diff --git a/src/api/endpoints/drive/files/show.ts b/src/server/api/endpoints/drive/files/show.ts
index 21664f7ba4..21664f7ba4 100644
--- a/src/api/endpoints/drive/files/show.ts
+++ b/src/server/api/endpoints/drive/files/show.ts
diff --git a/src/api/endpoints/drive/files/update.ts b/src/server/api/endpoints/drive/files/update.ts
index 83da462113..83da462113 100644
--- a/src/api/endpoints/drive/files/update.ts
+++ b/src/server/api/endpoints/drive/files/update.ts
diff --git a/src/api/endpoints/drive/files/upload_from_url.ts b/src/server/api/endpoints/drive/files/upload_from_url.ts
index 346633c616..346633c616 100644
--- a/src/api/endpoints/drive/files/upload_from_url.ts
+++ b/src/server/api/endpoints/drive/files/upload_from_url.ts
diff --git a/src/api/endpoints/drive/folders.ts b/src/server/api/endpoints/drive/folders.ts
index 428bde3507..428bde3507 100644
--- a/src/api/endpoints/drive/folders.ts
+++ b/src/server/api/endpoints/drive/folders.ts
diff --git a/src/api/endpoints/drive/folders/create.ts b/src/server/api/endpoints/drive/folders/create.ts
index 03f396ddc9..03f396ddc9 100644
--- a/src/api/endpoints/drive/folders/create.ts
+++ b/src/server/api/endpoints/drive/folders/create.ts
diff --git a/src/api/endpoints/drive/folders/find.ts b/src/server/api/endpoints/drive/folders/find.ts
index fc84766bc8..fc84766bc8 100644
--- a/src/api/endpoints/drive/folders/find.ts
+++ b/src/server/api/endpoints/drive/folders/find.ts
diff --git a/src/api/endpoints/drive/folders/show.ts b/src/server/api/endpoints/drive/folders/show.ts
index e07d14d20d..e07d14d20d 100644
--- a/src/api/endpoints/drive/folders/show.ts
+++ b/src/server/api/endpoints/drive/folders/show.ts
diff --git a/src/api/endpoints/drive/folders/update.ts b/src/server/api/endpoints/drive/folders/update.ts
index d3df8bdae5..d3df8bdae5 100644
--- a/src/api/endpoints/drive/folders/update.ts
+++ b/src/server/api/endpoints/drive/folders/update.ts
diff --git a/src/api/endpoints/drive/stream.ts b/src/server/api/endpoints/drive/stream.ts
index 8352c7dd4c..8352c7dd4c 100644
--- a/src/api/endpoints/drive/stream.ts
+++ b/src/server/api/endpoints/drive/stream.ts
diff --git a/src/api/endpoints/following/create.ts b/src/server/api/endpoints/following/create.ts
index 767b837b35..767b837b35 100644
--- a/src/api/endpoints/following/create.ts
+++ b/src/server/api/endpoints/following/create.ts
diff --git a/src/api/endpoints/following/delete.ts b/src/server/api/endpoints/following/delete.ts
index 64b9a8cecb..64b9a8cecb 100644
--- a/src/api/endpoints/following/delete.ts
+++ b/src/server/api/endpoints/following/delete.ts
diff --git a/src/api/endpoints/i.ts b/src/server/api/endpoints/i.ts
index 32b0382faf..32b0382faf 100644
--- a/src/api/endpoints/i.ts
+++ b/src/server/api/endpoints/i.ts
diff --git a/src/api/endpoints/i/2fa/done.ts b/src/server/api/endpoints/i/2fa/done.ts
index 0f1db73829..0f1db73829 100644
--- a/src/api/endpoints/i/2fa/done.ts
+++ b/src/server/api/endpoints/i/2fa/done.ts
diff --git a/src/api/endpoints/i/2fa/register.ts b/src/server/api/endpoints/i/2fa/register.ts
index 24abfcdfc5..e2cc1487b8 100644
--- a/src/api/endpoints/i/2fa/register.ts
+++ b/src/server/api/endpoints/i/2fa/register.ts
@@ -6,7 +6,7 @@ import * as bcrypt from 'bcryptjs';
 import * as speakeasy from 'speakeasy';
 import * as QRCode from 'qrcode';
 import User from '../../../models/user';
-import config from '../../../../conf';
+import config from '../../../../../conf';
 
 module.exports = async (params, user) => new Promise(async (res, rej) => {
 	// Get 'password' parameter
diff --git a/src/api/endpoints/i/2fa/unregister.ts b/src/server/api/endpoints/i/2fa/unregister.ts
index c43f9ccc44..c43f9ccc44 100644
--- a/src/api/endpoints/i/2fa/unregister.ts
+++ b/src/server/api/endpoints/i/2fa/unregister.ts
diff --git a/src/api/endpoints/i/appdata/get.ts b/src/server/api/endpoints/i/appdata/get.ts
index 571208d46c..571208d46c 100644
--- a/src/api/endpoints/i/appdata/get.ts
+++ b/src/server/api/endpoints/i/appdata/get.ts
diff --git a/src/api/endpoints/i/appdata/set.ts b/src/server/api/endpoints/i/appdata/set.ts
index 2804a14cb3..2804a14cb3 100644
--- a/src/api/endpoints/i/appdata/set.ts
+++ b/src/server/api/endpoints/i/appdata/set.ts
diff --git a/src/api/endpoints/i/authorized_apps.ts b/src/server/api/endpoints/i/authorized_apps.ts
index 40ce7a68c8..40ce7a68c8 100644
--- a/src/api/endpoints/i/authorized_apps.ts
+++ b/src/server/api/endpoints/i/authorized_apps.ts
diff --git a/src/api/endpoints/i/change_password.ts b/src/server/api/endpoints/i/change_password.ts
index 88fb36b1fb..88fb36b1fb 100644
--- a/src/api/endpoints/i/change_password.ts
+++ b/src/server/api/endpoints/i/change_password.ts
diff --git a/src/api/endpoints/i/favorites.ts b/src/server/api/endpoints/i/favorites.ts
index eb464cf0f0..eb464cf0f0 100644
--- a/src/api/endpoints/i/favorites.ts
+++ b/src/server/api/endpoints/i/favorites.ts
diff --git a/src/api/endpoints/i/notifications.ts b/src/server/api/endpoints/i/notifications.ts
index 688039a0dd..688039a0dd 100644
--- a/src/api/endpoints/i/notifications.ts
+++ b/src/server/api/endpoints/i/notifications.ts
diff --git a/src/api/endpoints/i/pin.ts b/src/server/api/endpoints/i/pin.ts
index ff546fc2bd..ff546fc2bd 100644
--- a/src/api/endpoints/i/pin.ts
+++ b/src/server/api/endpoints/i/pin.ts
diff --git a/src/api/endpoints/i/regenerate_token.ts b/src/server/api/endpoints/i/regenerate_token.ts
index 9ac7b55071..9ac7b55071 100644
--- a/src/api/endpoints/i/regenerate_token.ts
+++ b/src/server/api/endpoints/i/regenerate_token.ts
diff --git a/src/api/endpoints/i/signin_history.ts b/src/server/api/endpoints/i/signin_history.ts
index 859e81653d..859e81653d 100644
--- a/src/api/endpoints/i/signin_history.ts
+++ b/src/server/api/endpoints/i/signin_history.ts
diff --git a/src/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts
index db8a3f25bd..3d52de2cc5 100644
--- a/src/api/endpoints/i/update.ts
+++ b/src/server/api/endpoints/i/update.ts
@@ -4,7 +4,7 @@
 import $ from 'cafy';
 import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack } from '../../models/user';
 import event from '../../event';
-import config from '../../../conf';
+import config from '../../../../conf';
 
 /**
  * Update myself
diff --git a/src/api/endpoints/i/update_client_setting.ts b/src/server/api/endpoints/i/update_client_setting.ts
index c772ed5dc3..c772ed5dc3 100644
--- a/src/api/endpoints/i/update_client_setting.ts
+++ b/src/server/api/endpoints/i/update_client_setting.ts
diff --git a/src/api/endpoints/i/update_home.ts b/src/server/api/endpoints/i/update_home.ts
index 9ce44e25ee..9ce44e25ee 100644
--- a/src/api/endpoints/i/update_home.ts
+++ b/src/server/api/endpoints/i/update_home.ts
diff --git a/src/api/endpoints/i/update_mobile_home.ts b/src/server/api/endpoints/i/update_mobile_home.ts
index 1daddf42b9..1daddf42b9 100644
--- a/src/api/endpoints/i/update_mobile_home.ts
+++ b/src/server/api/endpoints/i/update_mobile_home.ts
diff --git a/src/api/endpoints/messaging/history.ts b/src/server/api/endpoints/messaging/history.ts
index 1683ca7a89..1683ca7a89 100644
--- a/src/api/endpoints/messaging/history.ts
+++ b/src/server/api/endpoints/messaging/history.ts
diff --git a/src/api/endpoints/messaging/messages.ts b/src/server/api/endpoints/messaging/messages.ts
index 67ba5e9d6d..67ba5e9d6d 100644
--- a/src/api/endpoints/messaging/messages.ts
+++ b/src/server/api/endpoints/messaging/messages.ts
diff --git a/src/api/endpoints/messaging/messages/create.ts b/src/server/api/endpoints/messaging/messages/create.ts
index 1b8a5f59e6..5184b2bd34 100644
--- a/src/api/endpoints/messaging/messages/create.ts
+++ b/src/server/api/endpoints/messaging/messages/create.ts
@@ -11,7 +11,7 @@ import DriveFile from '../../../models/drive-file';
 import { pack } from '../../../models/messaging-message';
 import publishUserStream from '../../../event';
 import { publishMessagingStream, publishMessagingIndexStream, pushSw } from '../../../event';
-import config from '../../../../conf';
+import config from '../../../../../conf';
 
 /**
  * Create a message
diff --git a/src/api/endpoints/messaging/unread.ts b/src/server/api/endpoints/messaging/unread.ts
index c4326e1d22..c4326e1d22 100644
--- a/src/api/endpoints/messaging/unread.ts
+++ b/src/server/api/endpoints/messaging/unread.ts
diff --git a/src/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts
index 1370ead3c5..10625ec66f 100644
--- a/src/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@@ -2,8 +2,8 @@
  * Module dependencies
  */
 import * as os from 'os';
-import version from '../../version';
-import config from '../../conf';
+import version from '../../../version';
+import config from '../../../conf';
 import Meta from '../models/meta';
 
 /**
diff --git a/src/api/endpoints/mute/create.ts b/src/server/api/endpoints/mute/create.ts
index f99b40d32e..f99b40d32e 100644
--- a/src/api/endpoints/mute/create.ts
+++ b/src/server/api/endpoints/mute/create.ts
diff --git a/src/api/endpoints/mute/delete.ts b/src/server/api/endpoints/mute/delete.ts
index 36e2fd101a..36e2fd101a 100644
--- a/src/api/endpoints/mute/delete.ts
+++ b/src/server/api/endpoints/mute/delete.ts
diff --git a/src/api/endpoints/mute/list.ts b/src/server/api/endpoints/mute/list.ts
index 19e3b157e6..19e3b157e6 100644
--- a/src/api/endpoints/mute/list.ts
+++ b/src/server/api/endpoints/mute/list.ts
diff --git a/src/api/endpoints/my/apps.ts b/src/server/api/endpoints/my/apps.ts
index b236190506..b236190506 100644
--- a/src/api/endpoints/my/apps.ts
+++ b/src/server/api/endpoints/my/apps.ts
diff --git a/src/api/endpoints/notifications/get_unread_count.ts b/src/server/api/endpoints/notifications/get_unread_count.ts
index 845d6b29ce..845d6b29ce 100644
--- a/src/api/endpoints/notifications/get_unread_count.ts
+++ b/src/server/api/endpoints/notifications/get_unread_count.ts
diff --git a/src/api/endpoints/notifications/mark_as_read_all.ts b/src/server/api/endpoints/notifications/mark_as_read_all.ts
index 3550e344c4..3550e344c4 100644
--- a/src/api/endpoints/notifications/mark_as_read_all.ts
+++ b/src/server/api/endpoints/notifications/mark_as_read_all.ts
diff --git a/src/api/endpoints/othello/games.ts b/src/server/api/endpoints/othello/games.ts
index 2a6bbb4043..2a6bbb4043 100644
--- a/src/api/endpoints/othello/games.ts
+++ b/src/server/api/endpoints/othello/games.ts
diff --git a/src/api/endpoints/othello/games/show.ts b/src/server/api/endpoints/othello/games/show.ts
index 2b0db4dd00..2b0db4dd00 100644
--- a/src/api/endpoints/othello/games/show.ts
+++ b/src/server/api/endpoints/othello/games/show.ts
diff --git a/src/api/endpoints/othello/invitations.ts b/src/server/api/endpoints/othello/invitations.ts
index 02fb421fbc..02fb421fbc 100644
--- a/src/api/endpoints/othello/invitations.ts
+++ b/src/server/api/endpoints/othello/invitations.ts
diff --git a/src/api/endpoints/othello/match.ts b/src/server/api/endpoints/othello/match.ts
index b73e105ef0..b73e105ef0 100644
--- a/src/api/endpoints/othello/match.ts
+++ b/src/server/api/endpoints/othello/match.ts
diff --git a/src/api/endpoints/othello/match/cancel.ts b/src/server/api/endpoints/othello/match/cancel.ts
index 6f751ef835..6f751ef835 100644
--- a/src/api/endpoints/othello/match/cancel.ts
+++ b/src/server/api/endpoints/othello/match/cancel.ts
diff --git a/src/api/endpoints/posts.ts b/src/server/api/endpoints/posts.ts
index 7df744d2a3..7df744d2a3 100644
--- a/src/api/endpoints/posts.ts
+++ b/src/server/api/endpoints/posts.ts
diff --git a/src/api/endpoints/posts/categorize.ts b/src/server/api/endpoints/posts/categorize.ts
index 0c85c2b4e0..0c85c2b4e0 100644
--- a/src/api/endpoints/posts/categorize.ts
+++ b/src/server/api/endpoints/posts/categorize.ts
diff --git a/src/api/endpoints/posts/context.ts b/src/server/api/endpoints/posts/context.ts
index 5ba3758975..5ba3758975 100644
--- a/src/api/endpoints/posts/context.ts
+++ b/src/server/api/endpoints/posts/context.ts
diff --git a/src/api/endpoints/posts/create.ts b/src/server/api/endpoints/posts/create.ts
index 286e18bb76..bc9af843b6 100644
--- a/src/api/endpoints/posts/create.ts
+++ b/src/server/api/endpoints/posts/create.ts
@@ -18,7 +18,7 @@ import watch from '../../common/watch-post';
 import event, { pushSw, publishChannelStream } from '../../event';
 import getAcct from '../../../common/user/get-acct';
 import parseAcct from '../../../common/user/parse-acct';
-import config from '../../../conf';
+import config from '../../../../conf';
 
 /**
  * Create a post
diff --git a/src/api/endpoints/posts/favorites/create.ts b/src/server/api/endpoints/posts/favorites/create.ts
index f9dee271b5..f9dee271b5 100644
--- a/src/api/endpoints/posts/favorites/create.ts
+++ b/src/server/api/endpoints/posts/favorites/create.ts
diff --git a/src/api/endpoints/posts/favorites/delete.ts b/src/server/api/endpoints/posts/favorites/delete.ts
index c4fe7d3234..c4fe7d3234 100644
--- a/src/api/endpoints/posts/favorites/delete.ts
+++ b/src/server/api/endpoints/posts/favorites/delete.ts
diff --git a/src/api/endpoints/posts/mentions.ts b/src/server/api/endpoints/posts/mentions.ts
index 7127db0ad1..7127db0ad1 100644
--- a/src/api/endpoints/posts/mentions.ts
+++ b/src/server/api/endpoints/posts/mentions.ts
diff --git a/src/api/endpoints/posts/polls/recommendation.ts b/src/server/api/endpoints/posts/polls/recommendation.ts
index 4a3fa3f55e..4a3fa3f55e 100644
--- a/src/api/endpoints/posts/polls/recommendation.ts
+++ b/src/server/api/endpoints/posts/polls/recommendation.ts
diff --git a/src/api/endpoints/posts/polls/vote.ts b/src/server/api/endpoints/posts/polls/vote.ts
index 16ce76a6fa..16ce76a6fa 100644
--- a/src/api/endpoints/posts/polls/vote.ts
+++ b/src/server/api/endpoints/posts/polls/vote.ts
diff --git a/src/api/endpoints/posts/reactions.ts b/src/server/api/endpoints/posts/reactions.ts
index feb140ab41..feb140ab41 100644
--- a/src/api/endpoints/posts/reactions.ts
+++ b/src/server/api/endpoints/posts/reactions.ts
diff --git a/src/api/endpoints/posts/reactions/create.ts b/src/server/api/endpoints/posts/reactions/create.ts
index f77afed40c..f77afed40c 100644
--- a/src/api/endpoints/posts/reactions/create.ts
+++ b/src/server/api/endpoints/posts/reactions/create.ts
diff --git a/src/api/endpoints/posts/reactions/delete.ts b/src/server/api/endpoints/posts/reactions/delete.ts
index 922c57ab18..922c57ab18 100644
--- a/src/api/endpoints/posts/reactions/delete.ts
+++ b/src/server/api/endpoints/posts/reactions/delete.ts
diff --git a/src/api/endpoints/posts/replies.ts b/src/server/api/endpoints/posts/replies.ts
index 613c4fa24c..613c4fa24c 100644
--- a/src/api/endpoints/posts/replies.ts
+++ b/src/server/api/endpoints/posts/replies.ts
diff --git a/src/api/endpoints/posts/reposts.ts b/src/server/api/endpoints/posts/reposts.ts
index 89ab0e3d55..89ab0e3d55 100644
--- a/src/api/endpoints/posts/reposts.ts
+++ b/src/server/api/endpoints/posts/reposts.ts
diff --git a/src/api/endpoints/posts/search.ts b/src/server/api/endpoints/posts/search.ts
index a36d1178a5..a36d1178a5 100644
--- a/src/api/endpoints/posts/search.ts
+++ b/src/server/api/endpoints/posts/search.ts
diff --git a/src/api/endpoints/posts/show.ts b/src/server/api/endpoints/posts/show.ts
index 3839490597..3839490597 100644
--- a/src/api/endpoints/posts/show.ts
+++ b/src/server/api/endpoints/posts/show.ts
diff --git a/src/api/endpoints/posts/timeline.ts b/src/server/api/endpoints/posts/timeline.ts
index c41cfdb8bd..c41cfdb8bd 100644
--- a/src/api/endpoints/posts/timeline.ts
+++ b/src/server/api/endpoints/posts/timeline.ts
diff --git a/src/api/endpoints/posts/trend.ts b/src/server/api/endpoints/posts/trend.ts
index caded92bf5..caded92bf5 100644
--- a/src/api/endpoints/posts/trend.ts
+++ b/src/server/api/endpoints/posts/trend.ts
diff --git a/src/api/endpoints/stats.ts b/src/server/api/endpoints/stats.ts
index a6084cd17a..a6084cd17a 100644
--- a/src/api/endpoints/stats.ts
+++ b/src/server/api/endpoints/stats.ts
diff --git a/src/api/endpoints/sw/register.ts b/src/server/api/endpoints/sw/register.ts
index 99406138db..99406138db 100644
--- a/src/api/endpoints/sw/register.ts
+++ b/src/server/api/endpoints/sw/register.ts
diff --git a/src/api/endpoints/username/available.ts b/src/server/api/endpoints/username/available.ts
index aac7fadf5a..aac7fadf5a 100644
--- a/src/api/endpoints/username/available.ts
+++ b/src/server/api/endpoints/username/available.ts
diff --git a/src/api/endpoints/users.ts b/src/server/api/endpoints/users.ts
index 4acc13c281..4acc13c281 100644
--- a/src/api/endpoints/users.ts
+++ b/src/server/api/endpoints/users.ts
diff --git a/src/api/endpoints/users/followers.ts b/src/server/api/endpoints/users/followers.ts
index b0fb83c683..b0fb83c683 100644
--- a/src/api/endpoints/users/followers.ts
+++ b/src/server/api/endpoints/users/followers.ts
diff --git a/src/api/endpoints/users/following.ts b/src/server/api/endpoints/users/following.ts
index 8e88431e92..8e88431e92 100644
--- a/src/api/endpoints/users/following.ts
+++ b/src/server/api/endpoints/users/following.ts
diff --git a/src/api/endpoints/users/get_frequently_replied_users.ts b/src/server/api/endpoints/users/get_frequently_replied_users.ts
index 87f4f77a5b..87f4f77a5b 100644
--- a/src/api/endpoints/users/get_frequently_replied_users.ts
+++ b/src/server/api/endpoints/users/get_frequently_replied_users.ts
diff --git a/src/api/endpoints/users/posts.ts b/src/server/api/endpoints/users/posts.ts
index 3c84bf0d80..3c84bf0d80 100644
--- a/src/api/endpoints/users/posts.ts
+++ b/src/server/api/endpoints/users/posts.ts
diff --git a/src/api/endpoints/users/recommendation.ts b/src/server/api/endpoints/users/recommendation.ts
index 45d90f422b..45d90f422b 100644
--- a/src/api/endpoints/users/recommendation.ts
+++ b/src/server/api/endpoints/users/recommendation.ts
diff --git a/src/api/endpoints/users/search.ts b/src/server/api/endpoints/users/search.ts
index 39e2ff9890..3c81576440 100644
--- a/src/api/endpoints/users/search.ts
+++ b/src/server/api/endpoints/users/search.ts
@@ -4,7 +4,7 @@
 import * as mongo from 'mongodb';
 import $ from 'cafy';
 import User, { pack } from '../../models/user';
-import config from '../../../conf';
+import config from '../../../../conf';
 const escapeRegexp = require('escape-regexp');
 
 /**
diff --git a/src/api/endpoints/users/search_by_username.ts b/src/server/api/endpoints/users/search_by_username.ts
index 9c5e1905aa..9c5e1905aa 100644
--- a/src/api/endpoints/users/search_by_username.ts
+++ b/src/server/api/endpoints/users/search_by_username.ts
diff --git a/src/api/endpoints/users/show.ts b/src/server/api/endpoints/users/show.ts
index 78df23f339..78df23f339 100644
--- a/src/api/endpoints/users/show.ts
+++ b/src/server/api/endpoints/users/show.ts
diff --git a/src/api/event.ts b/src/server/api/event.ts
index 4c9cc18e4d..98bf161137 100644
--- a/src/api/event.ts
+++ b/src/server/api/event.ts
@@ -1,7 +1,7 @@
 import * as mongo from 'mongodb';
 import * as redis from 'redis';
 import swPush from './common/push-sw';
-import config from '../conf';
+import config from '../../conf';
 
 type ID = string | mongo.ObjectID;
 
diff --git a/src/api/limitter.ts b/src/server/api/limitter.ts
index 9d2c42d335..33337fbb1b 100644
--- a/src/api/limitter.ts
+++ b/src/server/api/limitter.ts
@@ -1,6 +1,6 @@
 import * as Limiter from 'ratelimiter';
 import * as debug from 'debug';
-import limiterDB from '../db/redis';
+import limiterDB from '../../db/redis';
 import { Endpoint } from './endpoints';
 import { IAuthContext } from './authenticate';
 import getAcct from '../common/user/get-acct';
diff --git a/src/api/models/access-token.ts b/src/server/api/models/access-token.ts
index 9985be5013..2bf91f3093 100644
--- a/src/api/models/access-token.ts
+++ b/src/server/api/models/access-token.ts
@@ -1,4 +1,4 @@
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 
 const collection = db.get('access_tokens');
 
diff --git a/src/api/models/app.ts b/src/server/api/models/app.ts
index 34e9867db7..17db82ecac 100644
--- a/src/api/models/app.ts
+++ b/src/server/api/models/app.ts
@@ -1,8 +1,8 @@
 import * as mongo from 'mongodb';
 import deepcopy = require('deepcopy');
 import AccessToken from './access-token';
-import db from '../../db/mongodb';
-import config from '../../conf';
+import db from '../../../db/mongodb';
+import config from '../../../conf';
 
 const App = db.get<IApp>('apps');
 App.createIndex('name_id');
diff --git a/src/api/models/appdata.ts b/src/server/api/models/appdata.ts
index 3e68354fa4..dda3c98934 100644
--- a/src/api/models/appdata.ts
+++ b/src/server/api/models/appdata.ts
@@ -1,3 +1,3 @@
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 
 export default db.get('appdata') as any; // fuck type definition
diff --git a/src/api/models/auth-session.ts b/src/server/api/models/auth-session.ts
index 997ec61c20..a79d901df5 100644
--- a/src/api/models/auth-session.ts
+++ b/src/server/api/models/auth-session.ts
@@ -1,6 +1,6 @@
 import * as mongo from 'mongodb';
 import deepcopy = require('deepcopy');
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 import { pack as packApp } from './app';
 
 const AuthSession = db.get('auth_sessions');
diff --git a/src/api/models/channel-watching.ts b/src/server/api/models/channel-watching.ts
index 6184ae408d..4c6fae28d3 100644
--- a/src/api/models/channel-watching.ts
+++ b/src/server/api/models/channel-watching.ts
@@ -1,3 +1,3 @@
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 
 export default db.get('channel_watching') as any; // fuck type definition
diff --git a/src/api/models/channel.ts b/src/server/api/models/channel.ts
index 815d53593c..97999bd9e2 100644
--- a/src/api/models/channel.ts
+++ b/src/server/api/models/channel.ts
@@ -2,7 +2,7 @@ import * as mongo from 'mongodb';
 import deepcopy = require('deepcopy');
 import { IUser } from './user';
 import Watching from './channel-watching';
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 
 const Channel = db.get<IChannel>('channels');
 export default Channel;
diff --git a/src/api/models/drive-file.ts b/src/server/api/models/drive-file.ts
index 2a46d8dc4d..851a79a0e7 100644
--- a/src/api/models/drive-file.ts
+++ b/src/server/api/models/drive-file.ts
@@ -1,8 +1,8 @@
 import * as mongodb from 'mongodb';
 import deepcopy = require('deepcopy');
 import { pack as packFolder } from './drive-folder';
-import config from '../../conf';
-import monkDb, { nativeDbConn } from '../../db/mongodb';
+import config from '../../../conf';
+import monkDb, { nativeDbConn } from '../../../db/mongodb';
 
 const DriveFile = monkDb.get<IDriveFile>('drive_files.files');
 
diff --git a/src/api/models/drive-folder.ts b/src/server/api/models/drive-folder.ts
index 54b45049b9..505556376a 100644
--- a/src/api/models/drive-folder.ts
+++ b/src/server/api/models/drive-folder.ts
@@ -1,6 +1,6 @@
 import * as mongo from 'mongodb';
 import deepcopy = require('deepcopy');
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 import DriveFile from './drive-file';
 
 const DriveFolder = db.get<IDriveFolder>('drive_folders');
diff --git a/src/api/models/drive-tag.ts b/src/server/api/models/drive-tag.ts
index 991c935e81..d1c68365a3 100644
--- a/src/api/models/drive-tag.ts
+++ b/src/server/api/models/drive-tag.ts
@@ -1,3 +1,3 @@
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 
 export default db.get('drive_tags') as any; // fuck type definition
diff --git a/src/api/models/favorite.ts b/src/server/api/models/favorite.ts
index e01d9e343c..3142617643 100644
--- a/src/api/models/favorite.ts
+++ b/src/server/api/models/favorite.ts
@@ -1,3 +1,3 @@
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 
 export default db.get('favorites') as any; // fuck type definition
diff --git a/src/api/models/following.ts b/src/server/api/models/following.ts
index cb3db9b539..92d7b6d31b 100644
--- a/src/api/models/following.ts
+++ b/src/server/api/models/following.ts
@@ -1,3 +1,3 @@
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 
 export default db.get('following') as any; // fuck type definition
diff --git a/src/api/models/messaging-history.ts b/src/server/api/models/messaging-history.ts
index c06987e451..ea9f317eee 100644
--- a/src/api/models/messaging-history.ts
+++ b/src/server/api/models/messaging-history.ts
@@ -1,3 +1,3 @@
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 
 export default db.get('messaging_histories') as any; // fuck type definition
diff --git a/src/api/models/messaging-message.ts b/src/server/api/models/messaging-message.ts
index fcb356c5ca..be484d635f 100644
--- a/src/api/models/messaging-message.ts
+++ b/src/server/api/models/messaging-message.ts
@@ -2,7 +2,7 @@ import * as mongo from 'mongodb';
 import deepcopy = require('deepcopy');
 import { pack as packUser } from './user';
 import { pack as packFile } from './drive-file';
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 import parse from '../common/text';
 
 const MessagingMessage = db.get<IMessagingMessage>('messaging_messages');
diff --git a/src/api/models/meta.ts b/src/server/api/models/meta.ts
index c7dba8fcba..ee1ada18fa 100644
--- a/src/api/models/meta.ts
+++ b/src/server/api/models/meta.ts
@@ -1,4 +1,4 @@
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 
 export default db.get('meta') as any; // fuck type definition
 
diff --git a/src/api/models/mute.ts b/src/server/api/models/mute.ts
index 16018b82f7..02f652c30b 100644
--- a/src/api/models/mute.ts
+++ b/src/server/api/models/mute.ts
@@ -1,3 +1,3 @@
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 
 export default db.get('mute') as any; // fuck type definition
diff --git a/src/api/models/notification.ts b/src/server/api/models/notification.ts
index fa7049d312..bcb25534dc 100644
--- a/src/api/models/notification.ts
+++ b/src/server/api/models/notification.ts
@@ -1,6 +1,6 @@
 import * as mongo from 'mongodb';
 import deepcopy = require('deepcopy');
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 import { IUser, pack as packUser } from './user';
 import { pack as packPost } from './post';
 
diff --git a/src/api/models/othello-game.ts b/src/server/api/models/othello-game.ts
index 01c6ca6c00..97508e46da 100644
--- a/src/api/models/othello-game.ts
+++ b/src/server/api/models/othello-game.ts
@@ -1,6 +1,6 @@
 import * as mongo from 'mongodb';
 import deepcopy = require('deepcopy');
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 import { IUser, pack as packUser } from './user';
 
 const Game = db.get<IGame>('othello_games');
diff --git a/src/api/models/othello-matching.ts b/src/server/api/models/othello-matching.ts
index 5cc39cae13..3c29e6a00c 100644
--- a/src/api/models/othello-matching.ts
+++ b/src/server/api/models/othello-matching.ts
@@ -1,6 +1,6 @@
 import * as mongo from 'mongodb';
 import deepcopy = require('deepcopy');
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 import { IUser, pack as packUser } from './user';
 
 const Matching = db.get<IMatching>('othello_matchings');
diff --git a/src/api/models/poll-vote.ts b/src/server/api/models/poll-vote.ts
index af77a2643e..c6638ccf1c 100644
--- a/src/api/models/poll-vote.ts
+++ b/src/server/api/models/poll-vote.ts
@@ -1,3 +1,3 @@
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 
 export default db.get('poll_votes') as any; // fuck type definition
diff --git a/src/api/models/post-reaction.ts b/src/server/api/models/post-reaction.ts
index 639a70e006..5cd122d76b 100644
--- a/src/api/models/post-reaction.ts
+++ b/src/server/api/models/post-reaction.ts
@@ -1,6 +1,6 @@
 import * as mongo from 'mongodb';
 import deepcopy = require('deepcopy');
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 import Reaction from './post-reaction';
 import { pack as packUser } from './user';
 
diff --git a/src/api/models/post-watching.ts b/src/server/api/models/post-watching.ts
index 41d37e2703..9a4163c8dc 100644
--- a/src/api/models/post-watching.ts
+++ b/src/server/api/models/post-watching.ts
@@ -1,3 +1,3 @@
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 
 export default db.get('post_watching') as any; // fuck type definition
diff --git a/src/api/models/post.ts b/src/server/api/models/post.ts
index c37c8371c0..3f648e08cd 100644
--- a/src/api/models/post.ts
+++ b/src/server/api/models/post.ts
@@ -1,7 +1,7 @@
 import * as mongo from 'mongodb';
 import deepcopy = require('deepcopy');
 import rap from '@prezzemolo/rap';
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 import { IUser, pack as packUser } from './user';
 import { pack as packApp } from './app';
 import { pack as packChannel } from './channel';
diff --git a/src/api/models/signin.ts b/src/server/api/models/signin.ts
index 262c8707ed..5cffb3c310 100644
--- a/src/api/models/signin.ts
+++ b/src/server/api/models/signin.ts
@@ -1,6 +1,6 @@
 import * as mongo from 'mongodb';
 import deepcopy = require('deepcopy');
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 
 const Signin = db.get<ISignin>('signin');
 export default Signin;
diff --git a/src/api/models/sw-subscription.ts b/src/server/api/models/sw-subscription.ts
index ecca04cb91..4506a982f2 100644
--- a/src/api/models/sw-subscription.ts
+++ b/src/server/api/models/sw-subscription.ts
@@ -1,3 +1,3 @@
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 
 export default db.get('sw_subscriptions') as any; // fuck type definition
diff --git a/src/api/models/user.ts b/src/server/api/models/user.ts
index e73c95faf2..8e7d50baa3 100644
--- a/src/api/models/user.ts
+++ b/src/server/api/models/user.ts
@@ -1,12 +1,12 @@
 import * as mongo from 'mongodb';
 import deepcopy = require('deepcopy');
 import rap from '@prezzemolo/rap';
-import db from '../../db/mongodb';
+import db from '../../../db/mongodb';
 import { IPost, pack as packPost } from './post';
 import Following from './following';
 import Mute from './mute';
 import getFriends from '../common/get-friends';
-import config from '../../conf';
+import config from '../../../conf';
 
 const User = db.get<IUser>('users');
 
diff --git a/src/api/private/signin.ts b/src/server/api/private/signin.ts
index 00dcb8afc8..bbc9908991 100644
--- a/src/api/private/signin.ts
+++ b/src/server/api/private/signin.ts
@@ -5,7 +5,7 @@ import { default as User, ILocalAccount, IUser } from '../models/user';
 import Signin, { pack } from '../models/signin';
 import event from '../event';
 import signin from '../common/signin';
-import config from '../../conf';
+import config from '../../../conf';
 
 export default async (req: express.Request, res: express.Response) => {
 	res.header('Access-Control-Allow-Origin', config.url);
diff --git a/src/api/private/signup.ts b/src/server/api/private/signup.ts
index 96e0495709..9f55393313 100644
--- a/src/api/private/signup.ts
+++ b/src/server/api/private/signup.ts
@@ -1,11 +1,11 @@
 import * as uuid from 'uuid';
 import * as express from 'express';
 import * as bcrypt from 'bcryptjs';
-import { generate as generateKeypair } from '../../crypto_key';
+import { generate as generateKeypair } from '../../../crypto_key';
 import recaptcha = require('recaptcha-promise');
 import User, { IUser, validateUsername, validatePassword, pack } from '../models/user';
 import generateUserToken from '../common/generate-native-user-token';
-import config from '../../conf';
+import config from '../../../conf';
 
 recaptcha.init({
 	secret_key: config.recaptcha.secret_key
diff --git a/src/api/reply.ts b/src/server/api/reply.ts
index e47fc85b9b..e47fc85b9b 100644
--- a/src/api/reply.ts
+++ b/src/server/api/reply.ts
diff --git a/src/api/server.ts b/src/server/api/server.ts
index e89d196096..e89d196096 100644
--- a/src/api/server.ts
+++ b/src/server/api/server.ts
diff --git a/src/api/service/github.ts b/src/server/api/service/github.ts
index 1c78267c0f..a33d359753 100644
--- a/src/api/service/github.ts
+++ b/src/server/api/service/github.ts
@@ -1,9 +1,9 @@
 import * as EventEmitter from 'events';
 import * as express from 'express';
-import * as request from 'request';
 const crypto = require('crypto');
 import User from '../models/user';
-import config from '../../conf';
+import config from '../../../conf';
+import queue from '../../../queue';
 
 module.exports = async (app: express.Application) => {
 	if (config.github_bot == null) return;
@@ -25,12 +25,12 @@ module.exports = async (app: express.Application) => {
 		// req.headers['x-hub-signature'] および
 		// req.headers['x-github-event'] は常に string ですが、型定義の都合上
 		// string | string[] になっているので string を明示しています
-		if ((new Buffer(req.headers['x-hub-signature'] as string)).equals(new Buffer(`sha1=${crypto.createHmac('sha1', config.github_bot.hook_secret).update(JSON.stringify(req.body)).digest('hex')}`))) {
+//		if ((new Buffer(req.headers['x-hub-signature'] as string)).equals(new Buffer(`sha1=${crypto.createHmac('sha1', config.github_bot.hook_secret).update(JSON.stringify(req.body)).digest('hex')}`))) {
 			handler.emit(req.headers['x-github-event'] as string, req.body);
 			res.sendStatus(200);
-		} else {
-			res.sendStatus(400);
-		}
+//		} else {
+//			res.sendStatus(400);
+//		}
 	});
 
 	handler.on('status', event => {
@@ -41,26 +41,12 @@ module.exports = async (app: express.Application) => {
 				const commit = event.commit;
 				const parent = commit.parents[0];
 
-				// Fetch parent status
-				request({
-					url: `${parent.url}/statuses`,
-					headers: {
-						'User-Agent': 'misskey'
-					}
-				}, (err, res, body) => {
-					if (err) {
-						console.error(err);
-						return;
-					}
-					const parentStatuses = JSON.parse(body);
-					const parentState = parentStatuses[0].state;
-					const stillFailed = parentState == 'failure' || parentState == 'error';
-					if (stillFailed) {
-						post(`**⚠️BUILD STILL FAILED⚠️**: ?[${commit.commit.message}](${commit.html_url})`);
-					} else {
-						post(`**🚨BUILD FAILED🚨**: →→→?[${commit.commit.message}](${commit.html_url})←←←`);
-					}
-				});
+				queue.create('gitHubFailureReport', {
+					userId: bot._id,
+					parentUrl: parent.url,
+					htmlUrl: commit.html_url,
+					message: commit.commit.message,
+				}).save();
 				break;
 		}
 	});
diff --git a/src/api/service/twitter.ts b/src/server/api/service/twitter.ts
index c1f2e48a63..861f63ed67 100644
--- a/src/api/service/twitter.ts
+++ b/src/server/api/service/twitter.ts
@@ -4,10 +4,10 @@ import * as uuid from 'uuid';
 // import * as Twitter from 'twitter';
 // const Twitter = require('twitter');
 import autwh from 'autwh';
-import redis from '../../db/redis';
+import redis from '../../../db/redis';
 import User, { pack } from '../models/user';
 import event from '../event';
-import config from '../../conf';
+import config from '../../../conf';
 import signin from '../common/signin';
 
 module.exports = (app: express.Application) => {
diff --git a/src/api/stream/channel.ts b/src/server/api/stream/channel.ts
index d67d77cbf4..d67d77cbf4 100644
--- a/src/api/stream/channel.ts
+++ b/src/server/api/stream/channel.ts
diff --git a/src/api/stream/drive.ts b/src/server/api/stream/drive.ts
index c97ab80dcc..c97ab80dcc 100644
--- a/src/api/stream/drive.ts
+++ b/src/server/api/stream/drive.ts
diff --git a/src/api/stream/home.ts b/src/server/api/stream/home.ts
index 1ef0f33b4b..1ef0f33b4b 100644
--- a/src/api/stream/home.ts
+++ b/src/server/api/stream/home.ts
diff --git a/src/api/stream/messaging-index.ts b/src/server/api/stream/messaging-index.ts
index c1b2fbc806..c1b2fbc806 100644
--- a/src/api/stream/messaging-index.ts
+++ b/src/server/api/stream/messaging-index.ts
diff --git a/src/api/stream/messaging.ts b/src/server/api/stream/messaging.ts
index a4a12426a3..a4a12426a3 100644
--- a/src/api/stream/messaging.ts
+++ b/src/server/api/stream/messaging.ts
diff --git a/src/api/stream/othello-game.ts b/src/server/api/stream/othello-game.ts
index 1c846f27ae..1c846f27ae 100644
--- a/src/api/stream/othello-game.ts
+++ b/src/server/api/stream/othello-game.ts
diff --git a/src/api/stream/othello.ts b/src/server/api/stream/othello.ts
index bd3b4a7637..bd3b4a7637 100644
--- a/src/api/stream/othello.ts
+++ b/src/server/api/stream/othello.ts
diff --git a/src/api/stream/requests.ts b/src/server/api/stream/requests.ts
index d7bb5e6c5c..d7bb5e6c5c 100644
--- a/src/api/stream/requests.ts
+++ b/src/server/api/stream/requests.ts
diff --git a/src/api/stream/server.ts b/src/server/api/stream/server.ts
index 4ca2ad1b10..4ca2ad1b10 100644
--- a/src/api/stream/server.ts
+++ b/src/server/api/stream/server.ts
diff --git a/src/api/streaming.ts b/src/server/api/streaming.ts
index a6759e414c..95f444e00b 100644
--- a/src/api/streaming.ts
+++ b/src/server/api/streaming.ts
@@ -1,7 +1,7 @@
 import * as http from 'http';
 import * as websocket from 'websocket';
 import * as redis from 'redis';
-import config from '../conf';
+import config from '../../conf';
 import { default as User, IUser } from './models/user';
 import AccessToken from './models/access-token';
 import isNativeToken from './common/is-native-token';
diff --git a/src/common/get-notification-summary.ts b/src/server/common/get-notification-summary.ts
index 03db722c84..03db722c84 100644
--- a/src/common/get-notification-summary.ts
+++ b/src/server/common/get-notification-summary.ts
diff --git a/src/common/get-post-summary.ts b/src/server/common/get-post-summary.ts
index 6e8f65708e..6e8f65708e 100644
--- a/src/common/get-post-summary.ts
+++ b/src/server/common/get-post-summary.ts
diff --git a/src/common/get-reaction-emoji.ts b/src/server/common/get-reaction-emoji.ts
index c661205379..c661205379 100644
--- a/src/common/get-reaction-emoji.ts
+++ b/src/server/common/get-reaction-emoji.ts
diff --git a/src/common/othello/ai/back.ts b/src/server/common/othello/ai/back.ts
index 27dbc39529..c20c6fed25 100644
--- a/src/common/othello/ai/back.ts
+++ b/src/server/common/othello/ai/back.ts
@@ -8,7 +8,7 @@
 
 import * as request from 'request-promise-native';
 import Othello, { Color } from '../core';
-import conf from '../../../conf';
+import conf from '../../../../conf';
 
 let game;
 let form;
diff --git a/src/common/othello/ai/front.ts b/src/server/common/othello/ai/front.ts
index d892afbeda..af0b748fc0 100644
--- a/src/common/othello/ai/front.ts
+++ b/src/server/common/othello/ai/front.ts
@@ -10,7 +10,7 @@ import * as childProcess from 'child_process';
 const WebSocket = require('ws');
 import * as ReconnectingWebSocket from 'reconnecting-websocket';
 import * as request from 'request-promise-native';
-import conf from '../../../conf';
+import conf from '../../../../conf';
 
 // 設定 ////////////////////////////////////////////////////////
 
diff --git a/src/common/othello/ai/index.ts b/src/server/common/othello/ai/index.ts
index 5cd1db82da..5cd1db82da 100644
--- a/src/common/othello/ai/index.ts
+++ b/src/server/common/othello/ai/index.ts
diff --git a/src/common/othello/core.ts b/src/server/common/othello/core.ts
index 217066d375..217066d375 100644
--- a/src/common/othello/core.ts
+++ b/src/server/common/othello/core.ts
diff --git a/src/common/othello/maps.ts b/src/server/common/othello/maps.ts
index 68e5a446f1..68e5a446f1 100644
--- a/src/common/othello/maps.ts
+++ b/src/server/common/othello/maps.ts
diff --git a/src/common/user/get-acct.ts b/src/server/common/user/get-acct.ts
index 9afb03d88b..9afb03d88b 100644
--- a/src/common/user/get-acct.ts
+++ b/src/server/common/user/get-acct.ts
diff --git a/src/common/user/get-summary.ts b/src/server/common/user/get-summary.ts
index f9b7125e30..f9b7125e30 100644
--- a/src/common/user/get-summary.ts
+++ b/src/server/common/user/get-summary.ts
diff --git a/src/common/user/parse-acct.ts b/src/server/common/user/parse-acct.ts
index ef1f55405d..ef1f55405d 100644
--- a/src/common/user/parse-acct.ts
+++ b/src/server/common/user/parse-acct.ts
diff --git a/src/file/assets/avatar.jpg b/src/server/file/assets/avatar.jpg
index 3c803f568e..3c803f568e 100644
--- a/src/file/assets/avatar.jpg
+++ b/src/server/file/assets/avatar.jpg
diff --git a/src/file/assets/bad-egg.png b/src/server/file/assets/bad-egg.png
index a7c5930bd4..a7c5930bd4 100644
--- a/src/file/assets/bad-egg.png
+++ b/src/server/file/assets/bad-egg.png
diff --git a/src/file/assets/dummy.png b/src/server/file/assets/dummy.png
index 39332b0c1b..39332b0c1b 100644
--- a/src/file/assets/dummy.png
+++ b/src/server/file/assets/dummy.png
diff --git a/src/file/assets/not-an-image.png b/src/server/file/assets/not-an-image.png
index bf98b293f7..bf98b293f7 100644
--- a/src/file/assets/not-an-image.png
+++ b/src/server/file/assets/not-an-image.png
diff --git a/src/file/assets/thumbnail-not-available.png b/src/server/file/assets/thumbnail-not-available.png
index f960ce4d00..f960ce4d00 100644
--- a/src/file/assets/thumbnail-not-available.png
+++ b/src/server/file/assets/thumbnail-not-available.png
diff --git a/src/file/server.ts b/src/server/file/server.ts
index 3bda5b14fe..3bda5b14fe 100644
--- a/src/file/server.ts
+++ b/src/server/file/server.ts
diff --git a/src/server.ts b/src/server/index.ts
index 0e030002a8..3908b8a52c 100644
--- a/src/server.ts
+++ b/src/server/index.ts
@@ -5,13 +5,12 @@
 import * as fs from 'fs';
 import * as http from 'http';
 import * as https from 'https';
-import * as cluster from 'cluster';
 import * as express from 'express';
 import * as morgan from 'morgan';
 import Accesses from 'accesses';
 
 import log from './log-request';
-import config from './conf';
+import config from '../conf';
 
 /**
  * Init app
@@ -56,10 +55,7 @@ app.use('/api', require('./api/server'));
 app.use('/files', require('./file/server'));
 app.use(require('./web/server'));
 
-/**
- * Create server
- */
-const server = (() => {
+function createServer() {
 	if (config.https) {
 		const certs = {};
 		Object.keys(config.https).forEach(k => {
@@ -69,24 +65,18 @@ const server = (() => {
 	} else {
 		return http.createServer(app);
 	}
-})();
+}
 
-/**
- * Steaming
- */
-require('./api/streaming')(server);
+export default () => new Promise(resolve => {
+	const server = createServer();
 
-/**
- * Server listen
- */
-server.listen(config.port, () => {
-	if (cluster.isWorker) {
-		// Send a 'ready' message to parent process
-		process.send('ready');
-	}
-});
+	/**
+	 * Steaming
+	 */
+	require('./api/streaming')(server);
 
-/**
- * Export app for testing
- */
-module.exports = app;
+	/**
+	 * Server listen
+	 */
+	server.listen(config.port, resolve);
+});
diff --git a/src/log-request.ts b/src/server/log-request.ts
index e431aa271d..e431aa271d 100644
--- a/src/log-request.ts
+++ b/src/server/log-request.ts
diff --git a/src/web/app/animation.styl b/src/server/web/app/animation.styl
index 8f121b313b..8f121b313b 100644
--- a/src/web/app/animation.styl
+++ b/src/server/web/app/animation.styl
diff --git a/src/web/app/app.styl b/src/server/web/app/app.styl
index 431b9daa65..431b9daa65 100644
--- a/src/web/app/app.styl
+++ b/src/server/web/app/app.styl
diff --git a/src/web/app/app.vue b/src/server/web/app/app.vue
index 7a46e7dea0..7a46e7dea0 100644
--- a/src/web/app/app.vue
+++ b/src/server/web/app/app.vue
diff --git a/src/web/app/auth/assets/logo.svg b/src/server/web/app/auth/assets/logo.svg
index 19b8a2737e..19b8a2737e 100644
--- a/src/web/app/auth/assets/logo.svg
+++ b/src/server/web/app/auth/assets/logo.svg
diff --git a/src/web/app/auth/script.ts b/src/server/web/app/auth/script.ts
index 31c758ebc2..31c758ebc2 100644
--- a/src/web/app/auth/script.ts
+++ b/src/server/web/app/auth/script.ts
diff --git a/src/web/app/auth/style.styl b/src/server/web/app/auth/style.styl
index bd25e1b572..bd25e1b572 100644
--- a/src/web/app/auth/style.styl
+++ b/src/server/web/app/auth/style.styl
diff --git a/src/web/app/auth/views/form.vue b/src/server/web/app/auth/views/form.vue
index d86ed58b38..d86ed58b38 100644
--- a/src/web/app/auth/views/form.vue
+++ b/src/server/web/app/auth/views/form.vue
diff --git a/src/web/app/auth/views/index.vue b/src/server/web/app/auth/views/index.vue
index 17e5cc6108..17e5cc6108 100644
--- a/src/web/app/auth/views/index.vue
+++ b/src/server/web/app/auth/views/index.vue
diff --git a/src/web/app/base.pug b/src/server/web/app/base.pug
index d7c7f0aed4..60eb1539ec 100644
--- a/src/web/app/base.pug
+++ b/src/server/web/app/base.pug
@@ -14,12 +14,12 @@ html
 		title Misskey
 
 		style
-			include ./../../../built/web/assets/init.css
+			include ./../../../../built/server/web/assets/init.css
 		script
-			include ./../../../built/web/assets/boot.js
+			include ./../../../../built/server/web/assets/boot.js
 
 		script
-			include ./../../../built/web/assets/safe.js
+			include ./../../../../built/server/web/assets/safe.js
 
 		//- FontAwesome style
 		style #{facss}
diff --git a/src/web/app/boot.js b/src/server/web/app/boot.js
index 0846e4bd55..0846e4bd55 100644
--- a/src/web/app/boot.js
+++ b/src/server/web/app/boot.js
diff --git a/src/web/app/ch/script.ts b/src/server/web/app/ch/script.ts
index 4c6b6dfd1b..4c6b6dfd1b 100644
--- a/src/web/app/ch/script.ts
+++ b/src/server/web/app/ch/script.ts
diff --git a/src/web/app/ch/style.styl b/src/server/web/app/ch/style.styl
index 21ca648cbe..21ca648cbe 100644
--- a/src/web/app/ch/style.styl
+++ b/src/server/web/app/ch/style.styl
diff --git a/src/web/app/ch/tags/channel.tag b/src/server/web/app/ch/tags/channel.tag
index dc4b8e1426..dc4b8e1426 100644
--- a/src/web/app/ch/tags/channel.tag
+++ b/src/server/web/app/ch/tags/channel.tag
diff --git a/src/web/app/ch/tags/header.tag b/src/server/web/app/ch/tags/header.tag
index 901123d63b..901123d63b 100644
--- a/src/web/app/ch/tags/header.tag
+++ b/src/server/web/app/ch/tags/header.tag
diff --git a/src/web/app/ch/tags/index.tag b/src/server/web/app/ch/tags/index.tag
index 88df2ec45d..88df2ec45d 100644
--- a/src/web/app/ch/tags/index.tag
+++ b/src/server/web/app/ch/tags/index.tag
diff --git a/src/web/app/ch/tags/index.ts b/src/server/web/app/ch/tags/index.ts
index 12ffdaeb84..12ffdaeb84 100644
--- a/src/web/app/ch/tags/index.ts
+++ b/src/server/web/app/ch/tags/index.ts
diff --git a/src/web/app/common/define-widget.ts b/src/server/web/app/common/define-widget.ts
index d8d29873a4..d8d29873a4 100644
--- a/src/web/app/common/define-widget.ts
+++ b/src/server/web/app/common/define-widget.ts
diff --git a/src/web/app/common/mios.ts b/src/server/web/app/common/mios.ts
index 2c6c9988e7..2c6c9988e7 100644
--- a/src/web/app/common/mios.ts
+++ b/src/server/web/app/common/mios.ts
diff --git a/src/web/app/common/scripts/check-for-update.ts b/src/server/web/app/common/scripts/check-for-update.ts
index 81c1eb9812..81c1eb9812 100644
--- a/src/web/app/common/scripts/check-for-update.ts
+++ b/src/server/web/app/common/scripts/check-for-update.ts
diff --git a/src/web/app/common/scripts/compose-notification.ts b/src/server/web/app/common/scripts/compose-notification.ts
index e1dbd3bc13..e1dbd3bc13 100644
--- a/src/web/app/common/scripts/compose-notification.ts
+++ b/src/server/web/app/common/scripts/compose-notification.ts
diff --git a/src/web/app/common/scripts/contains.ts b/src/server/web/app/common/scripts/contains.ts
index a5071b3f25..a5071b3f25 100644
--- a/src/web/app/common/scripts/contains.ts
+++ b/src/server/web/app/common/scripts/contains.ts
diff --git a/src/web/app/common/scripts/copy-to-clipboard.ts b/src/server/web/app/common/scripts/copy-to-clipboard.ts
index 3d2741f8d7..3d2741f8d7 100644
--- a/src/web/app/common/scripts/copy-to-clipboard.ts
+++ b/src/server/web/app/common/scripts/copy-to-clipboard.ts
diff --git a/src/web/app/common/scripts/date-stringify.ts b/src/server/web/app/common/scripts/date-stringify.ts
index e51de8833d..e51de8833d 100644
--- a/src/web/app/common/scripts/date-stringify.ts
+++ b/src/server/web/app/common/scripts/date-stringify.ts
diff --git a/src/web/app/common/scripts/fuck-ad-block.ts b/src/server/web/app/common/scripts/fuck-ad-block.ts
index 9bcf7deeff..9bcf7deeff 100644
--- a/src/web/app/common/scripts/fuck-ad-block.ts
+++ b/src/server/web/app/common/scripts/fuck-ad-block.ts
diff --git a/src/web/app/common/scripts/gcd.ts b/src/server/web/app/common/scripts/gcd.ts
index 9a19f9da66..9a19f9da66 100644
--- a/src/web/app/common/scripts/gcd.ts
+++ b/src/server/web/app/common/scripts/gcd.ts
diff --git a/src/web/app/common/scripts/get-kao.ts b/src/server/web/app/common/scripts/get-kao.ts
index 2168c5be88..2168c5be88 100644
--- a/src/web/app/common/scripts/get-kao.ts
+++ b/src/server/web/app/common/scripts/get-kao.ts
diff --git a/src/web/app/common/scripts/get-median.ts b/src/server/web/app/common/scripts/get-median.ts
index 91a415d5b2..91a415d5b2 100644
--- a/src/web/app/common/scripts/get-median.ts
+++ b/src/server/web/app/common/scripts/get-median.ts
diff --git a/src/web/app/common/scripts/loading.ts b/src/server/web/app/common/scripts/loading.ts
index c48e626648..c48e626648 100644
--- a/src/web/app/common/scripts/loading.ts
+++ b/src/server/web/app/common/scripts/loading.ts
diff --git a/src/web/app/common/scripts/parse-search-query.ts b/src/server/web/app/common/scripts/parse-search-query.ts
index 512791ecb0..512791ecb0 100644
--- a/src/web/app/common/scripts/parse-search-query.ts
+++ b/src/server/web/app/common/scripts/parse-search-query.ts
diff --git a/src/web/app/common/scripts/streaming/channel.ts b/src/server/web/app/common/scripts/streaming/channel.ts
index cab5f4edb4..cab5f4edb4 100644
--- a/src/web/app/common/scripts/streaming/channel.ts
+++ b/src/server/web/app/common/scripts/streaming/channel.ts
diff --git a/src/web/app/common/scripts/streaming/drive.ts b/src/server/web/app/common/scripts/streaming/drive.ts
index f11573685e..f11573685e 100644
--- a/src/web/app/common/scripts/streaming/drive.ts
+++ b/src/server/web/app/common/scripts/streaming/drive.ts
diff --git a/src/web/app/common/scripts/streaming/home.ts b/src/server/web/app/common/scripts/streaming/home.ts
index ffcf6e5360..ffcf6e5360 100644
--- a/src/web/app/common/scripts/streaming/home.ts
+++ b/src/server/web/app/common/scripts/streaming/home.ts
diff --git a/src/web/app/common/scripts/streaming/messaging-index.ts b/src/server/web/app/common/scripts/streaming/messaging-index.ts
index 24f0ce0c9f..24f0ce0c9f 100644
--- a/src/web/app/common/scripts/streaming/messaging-index.ts
+++ b/src/server/web/app/common/scripts/streaming/messaging-index.ts
diff --git a/src/web/app/common/scripts/streaming/messaging.ts b/src/server/web/app/common/scripts/streaming/messaging.ts
index 4c593deb31..4c593deb31 100644
--- a/src/web/app/common/scripts/streaming/messaging.ts
+++ b/src/server/web/app/common/scripts/streaming/messaging.ts
diff --git a/src/web/app/common/scripts/streaming/othello-game.ts b/src/server/web/app/common/scripts/streaming/othello-game.ts
index f34ef35147..f34ef35147 100644
--- a/src/web/app/common/scripts/streaming/othello-game.ts
+++ b/src/server/web/app/common/scripts/streaming/othello-game.ts
diff --git a/src/web/app/common/scripts/streaming/othello.ts b/src/server/web/app/common/scripts/streaming/othello.ts
index 8c6f4b9c3c..8c6f4b9c3c 100644
--- a/src/web/app/common/scripts/streaming/othello.ts
+++ b/src/server/web/app/common/scripts/streaming/othello.ts
diff --git a/src/web/app/common/scripts/streaming/requests.ts b/src/server/web/app/common/scripts/streaming/requests.ts
index 5bec30143f..5bec30143f 100644
--- a/src/web/app/common/scripts/streaming/requests.ts
+++ b/src/server/web/app/common/scripts/streaming/requests.ts
diff --git a/src/web/app/common/scripts/streaming/server.ts b/src/server/web/app/common/scripts/streaming/server.ts
index 3d35ef4d9d..3d35ef4d9d 100644
--- a/src/web/app/common/scripts/streaming/server.ts
+++ b/src/server/web/app/common/scripts/streaming/server.ts
diff --git a/src/web/app/common/scripts/streaming/stream-manager.ts b/src/server/web/app/common/scripts/streaming/stream-manager.ts
index 568b8b0372..568b8b0372 100644
--- a/src/web/app/common/scripts/streaming/stream-manager.ts
+++ b/src/server/web/app/common/scripts/streaming/stream-manager.ts
diff --git a/src/web/app/common/scripts/streaming/stream.ts b/src/server/web/app/common/scripts/streaming/stream.ts
index 3912186ad3..3912186ad3 100644
--- a/src/web/app/common/scripts/streaming/stream.ts
+++ b/src/server/web/app/common/scripts/streaming/stream.ts
diff --git a/src/web/app/common/views/components/autocomplete.vue b/src/server/web/app/common/views/components/autocomplete.vue
index 8afa291e3c..8afa291e3c 100644
--- a/src/web/app/common/views/components/autocomplete.vue
+++ b/src/server/web/app/common/views/components/autocomplete.vue
diff --git a/src/web/app/common/views/components/connect-failed.troubleshooter.vue b/src/server/web/app/common/views/components/connect-failed.troubleshooter.vue
index cadbd36ba4..cadbd36ba4 100644
--- a/src/web/app/common/views/components/connect-failed.troubleshooter.vue
+++ b/src/server/web/app/common/views/components/connect-failed.troubleshooter.vue
diff --git a/src/web/app/common/views/components/connect-failed.vue b/src/server/web/app/common/views/components/connect-failed.vue
index 185250dbd8..185250dbd8 100644
--- a/src/web/app/common/views/components/connect-failed.vue
+++ b/src/server/web/app/common/views/components/connect-failed.vue
diff --git a/src/web/app/common/views/components/ellipsis.vue b/src/server/web/app/common/views/components/ellipsis.vue
index 07349902de..07349902de 100644
--- a/src/web/app/common/views/components/ellipsis.vue
+++ b/src/server/web/app/common/views/components/ellipsis.vue
diff --git a/src/web/app/common/views/components/file-type-icon.vue b/src/server/web/app/common/views/components/file-type-icon.vue
index b7e868d1f7..b7e868d1f7 100644
--- a/src/web/app/common/views/components/file-type-icon.vue
+++ b/src/server/web/app/common/views/components/file-type-icon.vue
diff --git a/src/web/app/common/views/components/forkit.vue b/src/server/web/app/common/views/components/forkit.vue
index 6f334b965a..6f334b965a 100644
--- a/src/web/app/common/views/components/forkit.vue
+++ b/src/server/web/app/common/views/components/forkit.vue
diff --git a/src/web/app/common/views/components/index.ts b/src/server/web/app/common/views/components/index.ts
index b58ba37ecb..b58ba37ecb 100644
--- a/src/web/app/common/views/components/index.ts
+++ b/src/server/web/app/common/views/components/index.ts
diff --git a/src/web/app/common/views/components/media-list.vue b/src/server/web/app/common/views/components/media-list.vue
index 64172ad0b4..64172ad0b4 100644
--- a/src/web/app/common/views/components/media-list.vue
+++ b/src/server/web/app/common/views/components/media-list.vue
diff --git a/src/web/app/common/views/components/messaging-room.form.vue b/src/server/web/app/common/views/components/messaging-room.form.vue
index 01886b19c8..01886b19c8 100644
--- a/src/web/app/common/views/components/messaging-room.form.vue
+++ b/src/server/web/app/common/views/components/messaging-room.form.vue
diff --git a/src/web/app/common/views/components/messaging-room.message.vue b/src/server/web/app/common/views/components/messaging-room.message.vue
index 5f2eb1ba86..5f2eb1ba86 100644
--- a/src/web/app/common/views/components/messaging-room.message.vue
+++ b/src/server/web/app/common/views/components/messaging-room.message.vue
diff --git a/src/web/app/common/views/components/messaging-room.vue b/src/server/web/app/common/views/components/messaging-room.vue
index 6ff808b617..6ff808b617 100644
--- a/src/web/app/common/views/components/messaging-room.vue
+++ b/src/server/web/app/common/views/components/messaging-room.vue
diff --git a/src/web/app/common/views/components/messaging.vue b/src/server/web/app/common/views/components/messaging.vue
index 88574b94d1..88574b94d1 100644
--- a/src/web/app/common/views/components/messaging.vue
+++ b/src/server/web/app/common/views/components/messaging.vue
diff --git a/src/web/app/common/views/components/nav.vue b/src/server/web/app/common/views/components/nav.vue
index 8ce75d3529..8ce75d3529 100644
--- a/src/web/app/common/views/components/nav.vue
+++ b/src/server/web/app/common/views/components/nav.vue
diff --git a/src/web/app/common/views/components/othello.game.vue b/src/server/web/app/common/views/components/othello.game.vue
index 414d819a55..414d819a55 100644
--- a/src/web/app/common/views/components/othello.game.vue
+++ b/src/server/web/app/common/views/components/othello.game.vue
diff --git a/src/web/app/common/views/components/othello.gameroom.vue b/src/server/web/app/common/views/components/othello.gameroom.vue
index 38a25f6686..38a25f6686 100644
--- a/src/web/app/common/views/components/othello.gameroom.vue
+++ b/src/server/web/app/common/views/components/othello.gameroom.vue
diff --git a/src/web/app/common/views/components/othello.room.vue b/src/server/web/app/common/views/components/othello.room.vue
index 3965414836..3965414836 100644
--- a/src/web/app/common/views/components/othello.room.vue
+++ b/src/server/web/app/common/views/components/othello.room.vue
diff --git a/src/web/app/common/views/components/othello.vue b/src/server/web/app/common/views/components/othello.vue
index d650322341..d650322341 100644
--- a/src/web/app/common/views/components/othello.vue
+++ b/src/server/web/app/common/views/components/othello.vue
diff --git a/src/web/app/common/views/components/poll-editor.vue b/src/server/web/app/common/views/components/poll-editor.vue
index 47d901d7b1..47d901d7b1 100644
--- a/src/web/app/common/views/components/poll-editor.vue
+++ b/src/server/web/app/common/views/components/poll-editor.vue
diff --git a/src/web/app/common/views/components/poll.vue b/src/server/web/app/common/views/components/poll.vue
index 8156c8bc58..8156c8bc58 100644
--- a/src/web/app/common/views/components/poll.vue
+++ b/src/server/web/app/common/views/components/poll.vue
diff --git a/src/web/app/common/views/components/post-html.ts b/src/server/web/app/common/views/components/post-html.ts
index 98da86617d..98da86617d 100644
--- a/src/web/app/common/views/components/post-html.ts
+++ b/src/server/web/app/common/views/components/post-html.ts
diff --git a/src/web/app/common/views/components/post-menu.vue b/src/server/web/app/common/views/components/post-menu.vue
index a53680e55a..a53680e55a 100644
--- a/src/web/app/common/views/components/post-menu.vue
+++ b/src/server/web/app/common/views/components/post-menu.vue
diff --git a/src/web/app/common/views/components/reaction-icon.vue b/src/server/web/app/common/views/components/reaction-icon.vue
index 7d24f4f9e9..7d24f4f9e9 100644
--- a/src/web/app/common/views/components/reaction-icon.vue
+++ b/src/server/web/app/common/views/components/reaction-icon.vue
diff --git a/src/web/app/common/views/components/reaction-picker.vue b/src/server/web/app/common/views/components/reaction-picker.vue
index df8100f2fc..df8100f2fc 100644
--- a/src/web/app/common/views/components/reaction-picker.vue
+++ b/src/server/web/app/common/views/components/reaction-picker.vue
diff --git a/src/web/app/common/views/components/reactions-viewer.vue b/src/server/web/app/common/views/components/reactions-viewer.vue
index f6a27d9139..f6a27d9139 100644
--- a/src/web/app/common/views/components/reactions-viewer.vue
+++ b/src/server/web/app/common/views/components/reactions-viewer.vue
diff --git a/src/web/app/common/views/components/signin.vue b/src/server/web/app/common/views/components/signin.vue
index 2434684085..2434684085 100644
--- a/src/web/app/common/views/components/signin.vue
+++ b/src/server/web/app/common/views/components/signin.vue
diff --git a/src/web/app/common/views/components/signup.vue b/src/server/web/app/common/views/components/signup.vue
index c2e78aa8a3..c2e78aa8a3 100644
--- a/src/web/app/common/views/components/signup.vue
+++ b/src/server/web/app/common/views/components/signup.vue
diff --git a/src/web/app/common/views/components/special-message.vue b/src/server/web/app/common/views/components/special-message.vue
index 2fd4d6515e..2fd4d6515e 100644
--- a/src/web/app/common/views/components/special-message.vue
+++ b/src/server/web/app/common/views/components/special-message.vue
diff --git a/src/web/app/common/views/components/stream-indicator.vue b/src/server/web/app/common/views/components/stream-indicator.vue
index 1f18fa76ed..1f18fa76ed 100644
--- a/src/web/app/common/views/components/stream-indicator.vue
+++ b/src/server/web/app/common/views/components/stream-indicator.vue
diff --git a/src/web/app/common/views/components/switch.vue b/src/server/web/app/common/views/components/switch.vue
index 19a4adc3de..19a4adc3de 100644
--- a/src/web/app/common/views/components/switch.vue
+++ b/src/server/web/app/common/views/components/switch.vue
diff --git a/src/web/app/common/views/components/time.vue b/src/server/web/app/common/views/components/time.vue
index 6e0d2b0dcb..6e0d2b0dcb 100644
--- a/src/web/app/common/views/components/time.vue
+++ b/src/server/web/app/common/views/components/time.vue
diff --git a/src/web/app/common/views/components/timer.vue b/src/server/web/app/common/views/components/timer.vue
index a3c4f01b77..a3c4f01b77 100644
--- a/src/web/app/common/views/components/timer.vue
+++ b/src/server/web/app/common/views/components/timer.vue
diff --git a/src/web/app/common/views/components/twitter-setting.vue b/src/server/web/app/common/views/components/twitter-setting.vue
index 15968d20a6..15968d20a6 100644
--- a/src/web/app/common/views/components/twitter-setting.vue
+++ b/src/server/web/app/common/views/components/twitter-setting.vue
diff --git a/src/web/app/common/views/components/uploader.vue b/src/server/web/app/common/views/components/uploader.vue
index 73006b16e9..73006b16e9 100644
--- a/src/web/app/common/views/components/uploader.vue
+++ b/src/server/web/app/common/views/components/uploader.vue
diff --git a/src/web/app/common/views/components/url-preview.vue b/src/server/web/app/common/views/components/url-preview.vue
index e91e510550..e91e510550 100644
--- a/src/web/app/common/views/components/url-preview.vue
+++ b/src/server/web/app/common/views/components/url-preview.vue
diff --git a/src/web/app/common/views/components/url.vue b/src/server/web/app/common/views/components/url.vue
index 14d4fc82f3..14d4fc82f3 100644
--- a/src/web/app/common/views/components/url.vue
+++ b/src/server/web/app/common/views/components/url.vue
diff --git a/src/web/app/common/views/components/welcome-timeline.vue b/src/server/web/app/common/views/components/welcome-timeline.vue
index 7586e9264e..7586e9264e 100644
--- a/src/web/app/common/views/components/welcome-timeline.vue
+++ b/src/server/web/app/common/views/components/welcome-timeline.vue
diff --git a/src/web/app/common/views/directives/autocomplete.ts b/src/server/web/app/common/views/directives/autocomplete.ts
index 3440c4212a..3440c4212a 100644
--- a/src/web/app/common/views/directives/autocomplete.ts
+++ b/src/server/web/app/common/views/directives/autocomplete.ts
diff --git a/src/web/app/common/views/directives/index.ts b/src/server/web/app/common/views/directives/index.ts
index 268f07a950..268f07a950 100644
--- a/src/web/app/common/views/directives/index.ts
+++ b/src/server/web/app/common/views/directives/index.ts
diff --git a/src/web/app/common/views/filters/bytes.ts b/src/server/web/app/common/views/filters/bytes.ts
index 3afb11e9ae..3afb11e9ae 100644
--- a/src/web/app/common/views/filters/bytes.ts
+++ b/src/server/web/app/common/views/filters/bytes.ts
diff --git a/src/web/app/common/views/filters/index.ts b/src/server/web/app/common/views/filters/index.ts
index 3a1d1ac235..3a1d1ac235 100644
--- a/src/web/app/common/views/filters/index.ts
+++ b/src/server/web/app/common/views/filters/index.ts
diff --git a/src/web/app/common/views/filters/number.ts b/src/server/web/app/common/views/filters/number.ts
index d9f48229dd..d9f48229dd 100644
--- a/src/web/app/common/views/filters/number.ts
+++ b/src/server/web/app/common/views/filters/number.ts
diff --git a/src/web/app/common/views/widgets/access-log.vue b/src/server/web/app/common/views/widgets/access-log.vue
index f7bb17d833..f7bb17d833 100644
--- a/src/web/app/common/views/widgets/access-log.vue
+++ b/src/server/web/app/common/views/widgets/access-log.vue
diff --git a/src/web/app/common/views/widgets/broadcast.vue b/src/server/web/app/common/views/widgets/broadcast.vue
index bf41a5fc67..bf41a5fc67 100644
--- a/src/web/app/common/views/widgets/broadcast.vue
+++ b/src/server/web/app/common/views/widgets/broadcast.vue
diff --git a/src/web/app/common/views/widgets/calendar.vue b/src/server/web/app/common/views/widgets/calendar.vue
index 03f69a7597..03f69a7597 100644
--- a/src/web/app/common/views/widgets/calendar.vue
+++ b/src/server/web/app/common/views/widgets/calendar.vue
diff --git a/src/web/app/common/views/widgets/donation.vue b/src/server/web/app/common/views/widgets/donation.vue
index e218df06e1..e218df06e1 100644
--- a/src/web/app/common/views/widgets/donation.vue
+++ b/src/server/web/app/common/views/widgets/donation.vue
diff --git a/src/web/app/common/views/widgets/index.ts b/src/server/web/app/common/views/widgets/index.ts
index e41030e85a..e41030e85a 100644
--- a/src/web/app/common/views/widgets/index.ts
+++ b/src/server/web/app/common/views/widgets/index.ts
diff --git a/src/web/app/common/views/widgets/nav.vue b/src/server/web/app/common/views/widgets/nav.vue
index 7bd5a7832f..7bd5a7832f 100644
--- a/src/web/app/common/views/widgets/nav.vue
+++ b/src/server/web/app/common/views/widgets/nav.vue
diff --git a/src/web/app/common/views/widgets/photo-stream.vue b/src/server/web/app/common/views/widgets/photo-stream.vue
index baafd40662..baafd40662 100644
--- a/src/web/app/common/views/widgets/photo-stream.vue
+++ b/src/server/web/app/common/views/widgets/photo-stream.vue
diff --git a/src/web/app/common/views/widgets/rss.vue b/src/server/web/app/common/views/widgets/rss.vue
index 4d74b2f7a4..4d74b2f7a4 100644
--- a/src/web/app/common/views/widgets/rss.vue
+++ b/src/server/web/app/common/views/widgets/rss.vue
diff --git a/src/web/app/common/views/widgets/server.cpu-memory.vue b/src/server/web/app/common/views/widgets/server.cpu-memory.vue
index d75a142568..d75a142568 100644
--- a/src/web/app/common/views/widgets/server.cpu-memory.vue
+++ b/src/server/web/app/common/views/widgets/server.cpu-memory.vue
diff --git a/src/web/app/common/views/widgets/server.cpu.vue b/src/server/web/app/common/views/widgets/server.cpu.vue
index 596c856da8..596c856da8 100644
--- a/src/web/app/common/views/widgets/server.cpu.vue
+++ b/src/server/web/app/common/views/widgets/server.cpu.vue
diff --git a/src/web/app/common/views/widgets/server.disk.vue b/src/server/web/app/common/views/widgets/server.disk.vue
index 2af1982a96..2af1982a96 100644
--- a/src/web/app/common/views/widgets/server.disk.vue
+++ b/src/server/web/app/common/views/widgets/server.disk.vue
diff --git a/src/web/app/common/views/widgets/server.info.vue b/src/server/web/app/common/views/widgets/server.info.vue
index d243629506..d243629506 100644
--- a/src/web/app/common/views/widgets/server.info.vue
+++ b/src/server/web/app/common/views/widgets/server.info.vue
diff --git a/src/web/app/common/views/widgets/server.memory.vue b/src/server/web/app/common/views/widgets/server.memory.vue
index 834a62671d..834a62671d 100644
--- a/src/web/app/common/views/widgets/server.memory.vue
+++ b/src/server/web/app/common/views/widgets/server.memory.vue
diff --git a/src/web/app/common/views/widgets/server.pie.vue b/src/server/web/app/common/views/widgets/server.pie.vue
index ce2cff1d00..ce2cff1d00 100644
--- a/src/web/app/common/views/widgets/server.pie.vue
+++ b/src/server/web/app/common/views/widgets/server.pie.vue
diff --git a/src/web/app/common/views/widgets/server.uptimes.vue b/src/server/web/app/common/views/widgets/server.uptimes.vue
index 06713d83ce..06713d83ce 100644
--- a/src/web/app/common/views/widgets/server.uptimes.vue
+++ b/src/server/web/app/common/views/widgets/server.uptimes.vue
diff --git a/src/web/app/common/views/widgets/server.vue b/src/server/web/app/common/views/widgets/server.vue
index 3d5248998f..3d5248998f 100644
--- a/src/web/app/common/views/widgets/server.vue
+++ b/src/server/web/app/common/views/widgets/server.vue
diff --git a/src/web/app/common/views/widgets/slideshow.vue b/src/server/web/app/common/views/widgets/slideshow.vue
index e9451663e2..e9451663e2 100644
--- a/src/web/app/common/views/widgets/slideshow.vue
+++ b/src/server/web/app/common/views/widgets/slideshow.vue
diff --git a/src/web/app/common/views/widgets/tips.vue b/src/server/web/app/common/views/widgets/tips.vue
index bdecc068e1..bdecc068e1 100644
--- a/src/web/app/common/views/widgets/tips.vue
+++ b/src/server/web/app/common/views/widgets/tips.vue
diff --git a/src/web/app/common/views/widgets/version.vue b/src/server/web/app/common/views/widgets/version.vue
index 5072d9b74a..5072d9b74a 100644
--- a/src/web/app/common/views/widgets/version.vue
+++ b/src/server/web/app/common/views/widgets/version.vue
diff --git a/src/web/app/config.ts b/src/server/web/app/config.ts
index 8ea6f70101..8ea6f70101 100644
--- a/src/web/app/config.ts
+++ b/src/server/web/app/config.ts
diff --git a/src/web/app/desktop/api/choose-drive-file.ts b/src/server/web/app/desktop/api/choose-drive-file.ts
index fbda600e6e..fbda600e6e 100644
--- a/src/web/app/desktop/api/choose-drive-file.ts
+++ b/src/server/web/app/desktop/api/choose-drive-file.ts
diff --git a/src/web/app/desktop/api/choose-drive-folder.ts b/src/server/web/app/desktop/api/choose-drive-folder.ts
index 9b33a20d9a..9b33a20d9a 100644
--- a/src/web/app/desktop/api/choose-drive-folder.ts
+++ b/src/server/web/app/desktop/api/choose-drive-folder.ts
diff --git a/src/web/app/desktop/api/contextmenu.ts b/src/server/web/app/desktop/api/contextmenu.ts
index b70d7122d3..b70d7122d3 100644
--- a/src/web/app/desktop/api/contextmenu.ts
+++ b/src/server/web/app/desktop/api/contextmenu.ts
diff --git a/src/web/app/desktop/api/dialog.ts b/src/server/web/app/desktop/api/dialog.ts
index 07935485b0..07935485b0 100644
--- a/src/web/app/desktop/api/dialog.ts
+++ b/src/server/web/app/desktop/api/dialog.ts
diff --git a/src/web/app/desktop/api/input.ts b/src/server/web/app/desktop/api/input.ts
index ce26a8112f..ce26a8112f 100644
--- a/src/web/app/desktop/api/input.ts
+++ b/src/server/web/app/desktop/api/input.ts
diff --git a/src/web/app/desktop/api/notify.ts b/src/server/web/app/desktop/api/notify.ts
index 1f89f40ce6..1f89f40ce6 100644
--- a/src/web/app/desktop/api/notify.ts
+++ b/src/server/web/app/desktop/api/notify.ts
diff --git a/src/web/app/desktop/api/post.ts b/src/server/web/app/desktop/api/post.ts
index cf49615df3..cf49615df3 100644
--- a/src/web/app/desktop/api/post.ts
+++ b/src/server/web/app/desktop/api/post.ts
diff --git a/src/web/app/desktop/api/update-avatar.ts b/src/server/web/app/desktop/api/update-avatar.ts
index 8f748d853c..8f748d853c 100644
--- a/src/web/app/desktop/api/update-avatar.ts
+++ b/src/server/web/app/desktop/api/update-avatar.ts
diff --git a/src/web/app/desktop/api/update-banner.ts b/src/server/web/app/desktop/api/update-banner.ts
index 9ed48b2670..9ed48b2670 100644
--- a/src/web/app/desktop/api/update-banner.ts
+++ b/src/server/web/app/desktop/api/update-banner.ts
diff --git a/src/web/app/desktop/assets/grid.svg b/src/server/web/app/desktop/assets/grid.svg
index d1d72cd8ce..d1d72cd8ce 100644
--- a/src/web/app/desktop/assets/grid.svg
+++ b/src/server/web/app/desktop/assets/grid.svg
diff --git a/src/web/app/desktop/assets/header-logo-white.svg b/src/server/web/app/desktop/assets/header-logo-white.svg
index 8082edb30d..8082edb30d 100644
--- a/src/web/app/desktop/assets/header-logo-white.svg
+++ b/src/server/web/app/desktop/assets/header-logo-white.svg
diff --git a/src/web/app/desktop/assets/header-logo.svg b/src/server/web/app/desktop/assets/header-logo.svg
index 3a2207954a..3a2207954a 100644
--- a/src/web/app/desktop/assets/header-logo.svg
+++ b/src/server/web/app/desktop/assets/header-logo.svg
diff --git a/src/web/app/desktop/assets/index.jpg b/src/server/web/app/desktop/assets/index.jpg
index 10c412efe2..10c412efe2 100644
--- a/src/web/app/desktop/assets/index.jpg
+++ b/src/server/web/app/desktop/assets/index.jpg
diff --git a/src/web/app/desktop/assets/remove.png b/src/server/web/app/desktop/assets/remove.png
index 8b1f4c06c9..8b1f4c06c9 100644
--- a/src/web/app/desktop/assets/remove.png
+++ b/src/server/web/app/desktop/assets/remove.png
diff --git a/src/web/app/desktop/script.ts b/src/server/web/app/desktop/script.ts
index b95e168544..b95e168544 100644
--- a/src/web/app/desktop/script.ts
+++ b/src/server/web/app/desktop/script.ts
diff --git a/src/web/app/desktop/style.styl b/src/server/web/app/desktop/style.styl
index 49f71fbde7..49f71fbde7 100644
--- a/src/web/app/desktop/style.styl
+++ b/src/server/web/app/desktop/style.styl
diff --git a/src/web/app/desktop/ui.styl b/src/server/web/app/desktop/ui.styl
index 5a8d1718e2..5a8d1718e2 100644
--- a/src/web/app/desktop/ui.styl
+++ b/src/server/web/app/desktop/ui.styl
diff --git a/src/web/app/desktop/views/components/activity.calendar.vue b/src/server/web/app/desktop/views/components/activity.calendar.vue
index 72233e9aca..72233e9aca 100644
--- a/src/web/app/desktop/views/components/activity.calendar.vue
+++ b/src/server/web/app/desktop/views/components/activity.calendar.vue
diff --git a/src/web/app/desktop/views/components/activity.chart.vue b/src/server/web/app/desktop/views/components/activity.chart.vue
index 5057786ed4..5057786ed4 100644
--- a/src/web/app/desktop/views/components/activity.chart.vue
+++ b/src/server/web/app/desktop/views/components/activity.chart.vue
diff --git a/src/web/app/desktop/views/components/activity.vue b/src/server/web/app/desktop/views/components/activity.vue
index 33b53eb700..33b53eb700 100644
--- a/src/web/app/desktop/views/components/activity.vue
+++ b/src/server/web/app/desktop/views/components/activity.vue
diff --git a/src/web/app/desktop/views/components/analog-clock.vue b/src/server/web/app/desktop/views/components/analog-clock.vue
index 81eec81598..81eec81598 100644
--- a/src/web/app/desktop/views/components/analog-clock.vue
+++ b/src/server/web/app/desktop/views/components/analog-clock.vue
diff --git a/src/web/app/desktop/views/components/calendar.vue b/src/server/web/app/desktop/views/components/calendar.vue
index 71aab2e8a5..71aab2e8a5 100644
--- a/src/web/app/desktop/views/components/calendar.vue
+++ b/src/server/web/app/desktop/views/components/calendar.vue
diff --git a/src/web/app/desktop/views/components/choose-file-from-drive-window.vue b/src/server/web/app/desktop/views/components/choose-file-from-drive-window.vue
index 9a1e9c958a..9a1e9c958a 100644
--- a/src/web/app/desktop/views/components/choose-file-from-drive-window.vue
+++ b/src/server/web/app/desktop/views/components/choose-file-from-drive-window.vue
diff --git a/src/web/app/desktop/views/components/choose-folder-from-drive-window.vue b/src/server/web/app/desktop/views/components/choose-folder-from-drive-window.vue
index f99533176d..f99533176d 100644
--- a/src/web/app/desktop/views/components/choose-folder-from-drive-window.vue
+++ b/src/server/web/app/desktop/views/components/choose-folder-from-drive-window.vue
diff --git a/src/web/app/desktop/views/components/context-menu.menu.vue b/src/server/web/app/desktop/views/components/context-menu.menu.vue
index 6359dbf1b4..6359dbf1b4 100644
--- a/src/web/app/desktop/views/components/context-menu.menu.vue
+++ b/src/server/web/app/desktop/views/components/context-menu.menu.vue
diff --git a/src/web/app/desktop/views/components/context-menu.vue b/src/server/web/app/desktop/views/components/context-menu.vue
index 8bd9945840..8bd9945840 100644
--- a/src/web/app/desktop/views/components/context-menu.vue
+++ b/src/server/web/app/desktop/views/components/context-menu.vue
diff --git a/src/web/app/desktop/views/components/crop-window.vue b/src/server/web/app/desktop/views/components/crop-window.vue
index eb6a55d959..eb6a55d959 100644
--- a/src/web/app/desktop/views/components/crop-window.vue
+++ b/src/server/web/app/desktop/views/components/crop-window.vue
diff --git a/src/web/app/desktop/views/components/dialog.vue b/src/server/web/app/desktop/views/components/dialog.vue
index fa17e4a9d2..fa17e4a9d2 100644
--- a/src/web/app/desktop/views/components/dialog.vue
+++ b/src/server/web/app/desktop/views/components/dialog.vue
diff --git a/src/web/app/desktop/views/components/drive-window.vue b/src/server/web/app/desktop/views/components/drive-window.vue
index 3a072f4794..3a072f4794 100644
--- a/src/web/app/desktop/views/components/drive-window.vue
+++ b/src/server/web/app/desktop/views/components/drive-window.vue
diff --git a/src/web/app/desktop/views/components/drive.file.vue b/src/server/web/app/desktop/views/components/drive.file.vue
index 924ff7052d..924ff7052d 100644
--- a/src/web/app/desktop/views/components/drive.file.vue
+++ b/src/server/web/app/desktop/views/components/drive.file.vue
diff --git a/src/web/app/desktop/views/components/drive.folder.vue b/src/server/web/app/desktop/views/components/drive.folder.vue
index a8a9a01370..a8a9a01370 100644
--- a/src/web/app/desktop/views/components/drive.folder.vue
+++ b/src/server/web/app/desktop/views/components/drive.folder.vue
diff --git a/src/web/app/desktop/views/components/drive.nav-folder.vue b/src/server/web/app/desktop/views/components/drive.nav-folder.vue
index dfbf116bff..dfbf116bff 100644
--- a/src/web/app/desktop/views/components/drive.nav-folder.vue
+++ b/src/server/web/app/desktop/views/components/drive.nav-folder.vue
diff --git a/src/web/app/desktop/views/components/drive.vue b/src/server/web/app/desktop/views/components/drive.vue
index 0fafa8cf23..0fafa8cf23 100644
--- a/src/web/app/desktop/views/components/drive.vue
+++ b/src/server/web/app/desktop/views/components/drive.vue
diff --git a/src/web/app/desktop/views/components/ellipsis-icon.vue b/src/server/web/app/desktop/views/components/ellipsis-icon.vue
index c54a7db29d..c54a7db29d 100644
--- a/src/web/app/desktop/views/components/ellipsis-icon.vue
+++ b/src/server/web/app/desktop/views/components/ellipsis-icon.vue
diff --git a/src/web/app/desktop/views/components/follow-button.vue b/src/server/web/app/desktop/views/components/follow-button.vue
index fc4f871888..fc4f871888 100644
--- a/src/web/app/desktop/views/components/follow-button.vue
+++ b/src/server/web/app/desktop/views/components/follow-button.vue
diff --git a/src/web/app/desktop/views/components/followers-window.vue b/src/server/web/app/desktop/views/components/followers-window.vue
index d41d356f9b..d41d356f9b 100644
--- a/src/web/app/desktop/views/components/followers-window.vue
+++ b/src/server/web/app/desktop/views/components/followers-window.vue
diff --git a/src/web/app/desktop/views/components/followers.vue b/src/server/web/app/desktop/views/components/followers.vue
index 4541a00072..4541a00072 100644
--- a/src/web/app/desktop/views/components/followers.vue
+++ b/src/server/web/app/desktop/views/components/followers.vue
diff --git a/src/web/app/desktop/views/components/following-window.vue b/src/server/web/app/desktop/views/components/following-window.vue
index c516b3b17b..c516b3b17b 100644
--- a/src/web/app/desktop/views/components/following-window.vue
+++ b/src/server/web/app/desktop/views/components/following-window.vue
diff --git a/src/web/app/desktop/views/components/following.vue b/src/server/web/app/desktop/views/components/following.vue
index e0b9f11695..e0b9f11695 100644
--- a/src/web/app/desktop/views/components/following.vue
+++ b/src/server/web/app/desktop/views/components/following.vue
diff --git a/src/web/app/desktop/views/components/friends-maker.vue b/src/server/web/app/desktop/views/components/friends-maker.vue
index eed15e0773..eed15e0773 100644
--- a/src/web/app/desktop/views/components/friends-maker.vue
+++ b/src/server/web/app/desktop/views/components/friends-maker.vue
diff --git a/src/web/app/desktop/views/components/game-window.vue b/src/server/web/app/desktop/views/components/game-window.vue
index 3c8bf40e12..3c8bf40e12 100644
--- a/src/web/app/desktop/views/components/game-window.vue
+++ b/src/server/web/app/desktop/views/components/game-window.vue
diff --git a/src/web/app/desktop/views/components/home.vue b/src/server/web/app/desktop/views/components/home.vue
index a4ce1ef94b..a4ce1ef94b 100644
--- a/src/web/app/desktop/views/components/home.vue
+++ b/src/server/web/app/desktop/views/components/home.vue
diff --git a/src/web/app/desktop/views/components/index.ts b/src/server/web/app/desktop/views/components/index.ts
index 3798bf6d2d..3798bf6d2d 100644
--- a/src/web/app/desktop/views/components/index.ts
+++ b/src/server/web/app/desktop/views/components/index.ts
diff --git a/src/web/app/desktop/views/components/input-dialog.vue b/src/server/web/app/desktop/views/components/input-dialog.vue
index e939fc1903..e939fc1903 100644
--- a/src/web/app/desktop/views/components/input-dialog.vue
+++ b/src/server/web/app/desktop/views/components/input-dialog.vue
diff --git a/src/web/app/desktop/views/components/media-image-dialog.vue b/src/server/web/app/desktop/views/components/media-image-dialog.vue
index dec140d1c9..dec140d1c9 100644
--- a/src/web/app/desktop/views/components/media-image-dialog.vue
+++ b/src/server/web/app/desktop/views/components/media-image-dialog.vue
diff --git a/src/web/app/desktop/views/components/media-image.vue b/src/server/web/app/desktop/views/components/media-image.vue
index bc02d0f9be..bc02d0f9be 100644
--- a/src/web/app/desktop/views/components/media-image.vue
+++ b/src/server/web/app/desktop/views/components/media-image.vue
diff --git a/src/web/app/desktop/views/components/media-video-dialog.vue b/src/server/web/app/desktop/views/components/media-video-dialog.vue
index cbf862cd1c..cbf862cd1c 100644
--- a/src/web/app/desktop/views/components/media-video-dialog.vue
+++ b/src/server/web/app/desktop/views/components/media-video-dialog.vue
diff --git a/src/web/app/desktop/views/components/media-video.vue b/src/server/web/app/desktop/views/components/media-video.vue
index 4fd955a821..4fd955a821 100644
--- a/src/web/app/desktop/views/components/media-video.vue
+++ b/src/server/web/app/desktop/views/components/media-video.vue
diff --git a/src/web/app/desktop/views/components/mentions.vue b/src/server/web/app/desktop/views/components/mentions.vue
index 47066e813f..47066e813f 100644
--- a/src/web/app/desktop/views/components/mentions.vue
+++ b/src/server/web/app/desktop/views/components/mentions.vue
diff --git a/src/web/app/desktop/views/components/messaging-room-window.vue b/src/server/web/app/desktop/views/components/messaging-room-window.vue
index 3735267811..3735267811 100644
--- a/src/web/app/desktop/views/components/messaging-room-window.vue
+++ b/src/server/web/app/desktop/views/components/messaging-room-window.vue
diff --git a/src/web/app/desktop/views/components/messaging-window.vue b/src/server/web/app/desktop/views/components/messaging-window.vue
index ac27465987..ac27465987 100644
--- a/src/web/app/desktop/views/components/messaging-window.vue
+++ b/src/server/web/app/desktop/views/components/messaging-window.vue
diff --git a/src/web/app/desktop/views/components/notifications.vue b/src/server/web/app/desktop/views/components/notifications.vue
index b48ffc1746..b48ffc1746 100644
--- a/src/web/app/desktop/views/components/notifications.vue
+++ b/src/server/web/app/desktop/views/components/notifications.vue
diff --git a/src/web/app/desktop/views/components/post-detail.sub.vue b/src/server/web/app/desktop/views/components/post-detail.sub.vue
index 59d8db04ce..59d8db04ce 100644
--- a/src/web/app/desktop/views/components/post-detail.sub.vue
+++ b/src/server/web/app/desktop/views/components/post-detail.sub.vue
diff --git a/src/web/app/desktop/views/components/post-detail.vue b/src/server/web/app/desktop/views/components/post-detail.vue
index f09bf4cbd5..f09bf4cbd5 100644
--- a/src/web/app/desktop/views/components/post-detail.vue
+++ b/src/server/web/app/desktop/views/components/post-detail.vue
diff --git a/src/web/app/desktop/views/components/post-form-window.vue b/src/server/web/app/desktop/views/components/post-form-window.vue
index d0b115e852..d0b115e852 100644
--- a/src/web/app/desktop/views/components/post-form-window.vue
+++ b/src/server/web/app/desktop/views/components/post-form-window.vue
diff --git a/src/web/app/desktop/views/components/post-form.vue b/src/server/web/app/desktop/views/components/post-form.vue
index 78f6d445af..78f6d445af 100644
--- a/src/web/app/desktop/views/components/post-form.vue
+++ b/src/server/web/app/desktop/views/components/post-form.vue
diff --git a/src/web/app/desktop/views/components/post-preview.vue b/src/server/web/app/desktop/views/components/post-preview.vue
index 808220c0e0..808220c0e0 100644
--- a/src/web/app/desktop/views/components/post-preview.vue
+++ b/src/server/web/app/desktop/views/components/post-preview.vue
diff --git a/src/web/app/desktop/views/components/posts.post.sub.vue b/src/server/web/app/desktop/views/components/posts.post.sub.vue
index 120700877c..120700877c 100644
--- a/src/web/app/desktop/views/components/posts.post.sub.vue
+++ b/src/server/web/app/desktop/views/components/posts.post.sub.vue
diff --git a/src/web/app/desktop/views/components/posts.post.vue b/src/server/web/app/desktop/views/components/posts.post.vue
index 6b4d3d2789..6b4d3d2789 100644
--- a/src/web/app/desktop/views/components/posts.post.vue
+++ b/src/server/web/app/desktop/views/components/posts.post.vue
diff --git a/src/web/app/desktop/views/components/posts.vue b/src/server/web/app/desktop/views/components/posts.vue
index ffceff8762..ffceff8762 100644
--- a/src/web/app/desktop/views/components/posts.vue
+++ b/src/server/web/app/desktop/views/components/posts.vue
diff --git a/src/web/app/desktop/views/components/progress-dialog.vue b/src/server/web/app/desktop/views/components/progress-dialog.vue
index a4292e1aec..a4292e1aec 100644
--- a/src/web/app/desktop/views/components/progress-dialog.vue
+++ b/src/server/web/app/desktop/views/components/progress-dialog.vue
diff --git a/src/web/app/desktop/views/components/repost-form-window.vue b/src/server/web/app/desktop/views/components/repost-form-window.vue
index 7db5adbff3..7db5adbff3 100644
--- a/src/web/app/desktop/views/components/repost-form-window.vue
+++ b/src/server/web/app/desktop/views/components/repost-form-window.vue
diff --git a/src/web/app/desktop/views/components/repost-form.vue b/src/server/web/app/desktop/views/components/repost-form.vue
index f2774b817c..f2774b817c 100644
--- a/src/web/app/desktop/views/components/repost-form.vue
+++ b/src/server/web/app/desktop/views/components/repost-form.vue
diff --git a/src/web/app/desktop/views/components/settings-window.vue b/src/server/web/app/desktop/views/components/settings-window.vue
index d5be177dcc..d5be177dcc 100644
--- a/src/web/app/desktop/views/components/settings-window.vue
+++ b/src/server/web/app/desktop/views/components/settings-window.vue
diff --git a/src/web/app/desktop/views/components/settings.2fa.vue b/src/server/web/app/desktop/views/components/settings.2fa.vue
index 85f2d6ba5e..85f2d6ba5e 100644
--- a/src/web/app/desktop/views/components/settings.2fa.vue
+++ b/src/server/web/app/desktop/views/components/settings.2fa.vue
diff --git a/src/web/app/desktop/views/components/settings.api.vue b/src/server/web/app/desktop/views/components/settings.api.vue
index 0d5921ab7f..0d5921ab7f 100644
--- a/src/web/app/desktop/views/components/settings.api.vue
+++ b/src/server/web/app/desktop/views/components/settings.api.vue
diff --git a/src/web/app/desktop/views/components/settings.apps.vue b/src/server/web/app/desktop/views/components/settings.apps.vue
index 0503b03abd..0503b03abd 100644
--- a/src/web/app/desktop/views/components/settings.apps.vue
+++ b/src/server/web/app/desktop/views/components/settings.apps.vue
diff --git a/src/web/app/desktop/views/components/settings.drive.vue b/src/server/web/app/desktop/views/components/settings.drive.vue
index 8bb0c760a7..8bb0c760a7 100644
--- a/src/web/app/desktop/views/components/settings.drive.vue
+++ b/src/server/web/app/desktop/views/components/settings.drive.vue
diff --git a/src/web/app/desktop/views/components/settings.mute.vue b/src/server/web/app/desktop/views/components/settings.mute.vue
index a8dfe10604..a8dfe10604 100644
--- a/src/web/app/desktop/views/components/settings.mute.vue
+++ b/src/server/web/app/desktop/views/components/settings.mute.vue
diff --git a/src/web/app/desktop/views/components/settings.password.vue b/src/server/web/app/desktop/views/components/settings.password.vue
index be3f0370d6..be3f0370d6 100644
--- a/src/web/app/desktop/views/components/settings.password.vue
+++ b/src/server/web/app/desktop/views/components/settings.password.vue
diff --git a/src/web/app/desktop/views/components/settings.profile.vue b/src/server/web/app/desktop/views/components/settings.profile.vue
index 67a211c792..67a211c792 100644
--- a/src/web/app/desktop/views/components/settings.profile.vue
+++ b/src/server/web/app/desktop/views/components/settings.profile.vue
diff --git a/src/web/app/desktop/views/components/settings.signins.vue b/src/server/web/app/desktop/views/components/settings.signins.vue
index ddc567f06f..ddc567f06f 100644
--- a/src/web/app/desktop/views/components/settings.signins.vue
+++ b/src/server/web/app/desktop/views/components/settings.signins.vue
diff --git a/src/web/app/desktop/views/components/settings.vue b/src/server/web/app/desktop/views/components/settings.vue
index 3e6a477ced..3e6a477ced 100644
--- a/src/web/app/desktop/views/components/settings.vue
+++ b/src/server/web/app/desktop/views/components/settings.vue
diff --git a/src/web/app/desktop/views/components/sub-post-content.vue b/src/server/web/app/desktop/views/components/sub-post-content.vue
index 8c8f42c801..8c8f42c801 100644
--- a/src/web/app/desktop/views/components/sub-post-content.vue
+++ b/src/server/web/app/desktop/views/components/sub-post-content.vue
diff --git a/src/web/app/desktop/views/components/taskmanager.vue b/src/server/web/app/desktop/views/components/taskmanager.vue
index a00fabb047..a00fabb047 100644
--- a/src/web/app/desktop/views/components/taskmanager.vue
+++ b/src/server/web/app/desktop/views/components/taskmanager.vue
diff --git a/src/web/app/desktop/views/components/timeline.vue b/src/server/web/app/desktop/views/components/timeline.vue
index 47a9688b6d..47a9688b6d 100644
--- a/src/web/app/desktop/views/components/timeline.vue
+++ b/src/server/web/app/desktop/views/components/timeline.vue
diff --git a/src/web/app/desktop/views/components/ui-notification.vue b/src/server/web/app/desktop/views/components/ui-notification.vue
index 9983f02c5e..9983f02c5e 100644
--- a/src/web/app/desktop/views/components/ui-notification.vue
+++ b/src/server/web/app/desktop/views/components/ui-notification.vue
diff --git a/src/web/app/desktop/views/components/ui.header.account.vue b/src/server/web/app/desktop/views/components/ui.header.account.vue
index 19b9d77798..19b9d77798 100644
--- a/src/web/app/desktop/views/components/ui.header.account.vue
+++ b/src/server/web/app/desktop/views/components/ui.header.account.vue
diff --git a/src/web/app/desktop/views/components/ui.header.clock.vue b/src/server/web/app/desktop/views/components/ui.header.clock.vue
index cd23a67506..cd23a67506 100644
--- a/src/web/app/desktop/views/components/ui.header.clock.vue
+++ b/src/server/web/app/desktop/views/components/ui.header.clock.vue
diff --git a/src/web/app/desktop/views/components/ui.header.nav.vue b/src/server/web/app/desktop/views/components/ui.header.nav.vue
index 7582e8afce..7582e8afce 100644
--- a/src/web/app/desktop/views/components/ui.header.nav.vue
+++ b/src/server/web/app/desktop/views/components/ui.header.nav.vue
diff --git a/src/web/app/desktop/views/components/ui.header.notifications.vue b/src/server/web/app/desktop/views/components/ui.header.notifications.vue
index e829418d18..e829418d18 100644
--- a/src/web/app/desktop/views/components/ui.header.notifications.vue
+++ b/src/server/web/app/desktop/views/components/ui.header.notifications.vue
diff --git a/src/web/app/desktop/views/components/ui.header.post.vue b/src/server/web/app/desktop/views/components/ui.header.post.vue
index c2f0e07dd3..c2f0e07dd3 100644
--- a/src/web/app/desktop/views/components/ui.header.post.vue
+++ b/src/server/web/app/desktop/views/components/ui.header.post.vue
diff --git a/src/web/app/desktop/views/components/ui.header.search.vue b/src/server/web/app/desktop/views/components/ui.header.search.vue
index 86215556ad..86215556ad 100644
--- a/src/web/app/desktop/views/components/ui.header.search.vue
+++ b/src/server/web/app/desktop/views/components/ui.header.search.vue
diff --git a/src/web/app/desktop/views/components/ui.header.vue b/src/server/web/app/desktop/views/components/ui.header.vue
index 8af0e2fbed..8af0e2fbed 100644
--- a/src/web/app/desktop/views/components/ui.header.vue
+++ b/src/server/web/app/desktop/views/components/ui.header.vue
diff --git a/src/web/app/desktop/views/components/ui.vue b/src/server/web/app/desktop/views/components/ui.vue
index 87f932ff14..87f932ff14 100644
--- a/src/web/app/desktop/views/components/ui.vue
+++ b/src/server/web/app/desktop/views/components/ui.vue
diff --git a/src/web/app/desktop/views/components/user-preview.vue b/src/server/web/app/desktop/views/components/user-preview.vue
index 24d613f120..24d613f120 100644
--- a/src/web/app/desktop/views/components/user-preview.vue
+++ b/src/server/web/app/desktop/views/components/user-preview.vue
diff --git a/src/web/app/desktop/views/components/users-list.item.vue b/src/server/web/app/desktop/views/components/users-list.item.vue
index e02d1311d2..e02d1311d2 100644
--- a/src/web/app/desktop/views/components/users-list.item.vue
+++ b/src/server/web/app/desktop/views/components/users-list.item.vue
diff --git a/src/web/app/desktop/views/components/users-list.vue b/src/server/web/app/desktop/views/components/users-list.vue
index a08e76f573..a08e76f573 100644
--- a/src/web/app/desktop/views/components/users-list.vue
+++ b/src/server/web/app/desktop/views/components/users-list.vue
diff --git a/src/web/app/desktop/views/components/widget-container.vue b/src/server/web/app/desktop/views/components/widget-container.vue
index dd42be63bb..dd42be63bb 100644
--- a/src/web/app/desktop/views/components/widget-container.vue
+++ b/src/server/web/app/desktop/views/components/widget-container.vue
diff --git a/src/web/app/desktop/views/components/window.vue b/src/server/web/app/desktop/views/components/window.vue
index 75f725d4b0..75f725d4b0 100644
--- a/src/web/app/desktop/views/components/window.vue
+++ b/src/server/web/app/desktop/views/components/window.vue
diff --git a/src/web/app/desktop/views/directives/index.ts b/src/server/web/app/desktop/views/directives/index.ts
index 324e07596d..324e07596d 100644
--- a/src/web/app/desktop/views/directives/index.ts
+++ b/src/server/web/app/desktop/views/directives/index.ts
diff --git a/src/web/app/desktop/views/directives/user-preview.ts b/src/server/web/app/desktop/views/directives/user-preview.ts
index 8a4035881a..8a4035881a 100644
--- a/src/web/app/desktop/views/directives/user-preview.ts
+++ b/src/server/web/app/desktop/views/directives/user-preview.ts
diff --git a/src/web/app/desktop/views/pages/drive.vue b/src/server/web/app/desktop/views/pages/drive.vue
index 353f59b703..353f59b703 100644
--- a/src/web/app/desktop/views/pages/drive.vue
+++ b/src/server/web/app/desktop/views/pages/drive.vue
diff --git a/src/web/app/desktop/views/pages/home-customize.vue b/src/server/web/app/desktop/views/pages/home-customize.vue
index 8aa06be57f..8aa06be57f 100644
--- a/src/web/app/desktop/views/pages/home-customize.vue
+++ b/src/server/web/app/desktop/views/pages/home-customize.vue
diff --git a/src/web/app/desktop/views/pages/home.vue b/src/server/web/app/desktop/views/pages/home.vue
index e1464bab1d..e1464bab1d 100644
--- a/src/web/app/desktop/views/pages/home.vue
+++ b/src/server/web/app/desktop/views/pages/home.vue
diff --git a/src/web/app/desktop/views/pages/index.vue b/src/server/web/app/desktop/views/pages/index.vue
index 0ea47d913b..0ea47d913b 100644
--- a/src/web/app/desktop/views/pages/index.vue
+++ b/src/server/web/app/desktop/views/pages/index.vue
diff --git a/src/web/app/desktop/views/pages/messaging-room.vue b/src/server/web/app/desktop/views/pages/messaging-room.vue
index 0cab1e0d10..0cab1e0d10 100644
--- a/src/web/app/desktop/views/pages/messaging-room.vue
+++ b/src/server/web/app/desktop/views/pages/messaging-room.vue
diff --git a/src/web/app/desktop/views/pages/othello.vue b/src/server/web/app/desktop/views/pages/othello.vue
index 160dd9a354..160dd9a354 100644
--- a/src/web/app/desktop/views/pages/othello.vue
+++ b/src/server/web/app/desktop/views/pages/othello.vue
diff --git a/src/web/app/desktop/views/pages/post.vue b/src/server/web/app/desktop/views/pages/post.vue
index c7b8729b72..c7b8729b72 100644
--- a/src/web/app/desktop/views/pages/post.vue
+++ b/src/server/web/app/desktop/views/pages/post.vue
diff --git a/src/web/app/desktop/views/pages/search.vue b/src/server/web/app/desktop/views/pages/search.vue
index afd37c8cee..afd37c8cee 100644
--- a/src/web/app/desktop/views/pages/search.vue
+++ b/src/server/web/app/desktop/views/pages/search.vue
diff --git a/src/web/app/desktop/views/pages/selectdrive.vue b/src/server/web/app/desktop/views/pages/selectdrive.vue
index 4f0b86014b..4f0b86014b 100644
--- a/src/web/app/desktop/views/pages/selectdrive.vue
+++ b/src/server/web/app/desktop/views/pages/selectdrive.vue
diff --git a/src/web/app/desktop/views/pages/user/user.followers-you-know.vue b/src/server/web/app/desktop/views/pages/user/user.followers-you-know.vue
index 80b38e8acc..80b38e8acc 100644
--- a/src/web/app/desktop/views/pages/user/user.followers-you-know.vue
+++ b/src/server/web/app/desktop/views/pages/user/user.followers-you-know.vue
diff --git a/src/web/app/desktop/views/pages/user/user.friends.vue b/src/server/web/app/desktop/views/pages/user/user.friends.vue
index 57e6def27b..57e6def27b 100644
--- a/src/web/app/desktop/views/pages/user/user.friends.vue
+++ b/src/server/web/app/desktop/views/pages/user/user.friends.vue
diff --git a/src/web/app/desktop/views/pages/user/user.header.vue b/src/server/web/app/desktop/views/pages/user/user.header.vue
index 3522e76bdb..3522e76bdb 100644
--- a/src/web/app/desktop/views/pages/user/user.header.vue
+++ b/src/server/web/app/desktop/views/pages/user/user.header.vue
diff --git a/src/web/app/desktop/views/pages/user/user.home.vue b/src/server/web/app/desktop/views/pages/user/user.home.vue
index 2483a6c726..2483a6c726 100644
--- a/src/web/app/desktop/views/pages/user/user.home.vue
+++ b/src/server/web/app/desktop/views/pages/user/user.home.vue
diff --git a/src/web/app/desktop/views/pages/user/user.photos.vue b/src/server/web/app/desktop/views/pages/user/user.photos.vue
index db29a9945a..db29a9945a 100644
--- a/src/web/app/desktop/views/pages/user/user.photos.vue
+++ b/src/server/web/app/desktop/views/pages/user/user.photos.vue
diff --git a/src/web/app/desktop/views/pages/user/user.profile.vue b/src/server/web/app/desktop/views/pages/user/user.profile.vue
index b51aae18fa..b51aae18fa 100644
--- a/src/web/app/desktop/views/pages/user/user.profile.vue
+++ b/src/server/web/app/desktop/views/pages/user/user.profile.vue
diff --git a/src/web/app/desktop/views/pages/user/user.timeline.vue b/src/server/web/app/desktop/views/pages/user/user.timeline.vue
index 60eef8951b..60eef8951b 100644
--- a/src/web/app/desktop/views/pages/user/user.timeline.vue
+++ b/src/server/web/app/desktop/views/pages/user/user.timeline.vue
diff --git a/src/web/app/desktop/views/pages/user/user.vue b/src/server/web/app/desktop/views/pages/user/user.vue
index 67cef93269..67cef93269 100644
--- a/src/web/app/desktop/views/pages/user/user.vue
+++ b/src/server/web/app/desktop/views/pages/user/user.vue
diff --git a/src/web/app/desktop/views/pages/welcome.vue b/src/server/web/app/desktop/views/pages/welcome.vue
index 927ddf575b..927ddf575b 100644
--- a/src/web/app/desktop/views/pages/welcome.vue
+++ b/src/server/web/app/desktop/views/pages/welcome.vue
diff --git a/src/web/app/desktop/views/widgets/activity.vue b/src/server/web/app/desktop/views/widgets/activity.vue
index 0bdf4622af..0bdf4622af 100644
--- a/src/web/app/desktop/views/widgets/activity.vue
+++ b/src/server/web/app/desktop/views/widgets/activity.vue
diff --git a/src/web/app/desktop/views/widgets/channel.channel.form.vue b/src/server/web/app/desktop/views/widgets/channel.channel.form.vue
index 392ba5924b..392ba5924b 100644
--- a/src/web/app/desktop/views/widgets/channel.channel.form.vue
+++ b/src/server/web/app/desktop/views/widgets/channel.channel.form.vue
diff --git a/src/web/app/desktop/views/widgets/channel.channel.post.vue b/src/server/web/app/desktop/views/widgets/channel.channel.post.vue
index 433f9a00aa..433f9a00aa 100644
--- a/src/web/app/desktop/views/widgets/channel.channel.post.vue
+++ b/src/server/web/app/desktop/views/widgets/channel.channel.post.vue
diff --git a/src/web/app/desktop/views/widgets/channel.channel.vue b/src/server/web/app/desktop/views/widgets/channel.channel.vue
index de5885bfc1..de5885bfc1 100644
--- a/src/web/app/desktop/views/widgets/channel.channel.vue
+++ b/src/server/web/app/desktop/views/widgets/channel.channel.vue
diff --git a/src/web/app/desktop/views/widgets/channel.vue b/src/server/web/app/desktop/views/widgets/channel.vue
index fc143bb1df..fc143bb1df 100644
--- a/src/web/app/desktop/views/widgets/channel.vue
+++ b/src/server/web/app/desktop/views/widgets/channel.vue
diff --git a/src/web/app/desktop/views/widgets/index.ts b/src/server/web/app/desktop/views/widgets/index.ts
index 77d771d6b3..77d771d6b3 100644
--- a/src/web/app/desktop/views/widgets/index.ts
+++ b/src/server/web/app/desktop/views/widgets/index.ts
diff --git a/src/web/app/desktop/views/widgets/messaging.vue b/src/server/web/app/desktop/views/widgets/messaging.vue
index 2c9f473bd1..2c9f473bd1 100644
--- a/src/web/app/desktop/views/widgets/messaging.vue
+++ b/src/server/web/app/desktop/views/widgets/messaging.vue
diff --git a/src/web/app/desktop/views/widgets/notifications.vue b/src/server/web/app/desktop/views/widgets/notifications.vue
index 1a2b3d3f89..1a2b3d3f89 100644
--- a/src/web/app/desktop/views/widgets/notifications.vue
+++ b/src/server/web/app/desktop/views/widgets/notifications.vue
diff --git a/src/web/app/desktop/views/widgets/polls.vue b/src/server/web/app/desktop/views/widgets/polls.vue
index e5db34fc7a..e5db34fc7a 100644
--- a/src/web/app/desktop/views/widgets/polls.vue
+++ b/src/server/web/app/desktop/views/widgets/polls.vue
diff --git a/src/web/app/desktop/views/widgets/post-form.vue b/src/server/web/app/desktop/views/widgets/post-form.vue
index cf7fd1f2b2..cf7fd1f2b2 100644
--- a/src/web/app/desktop/views/widgets/post-form.vue
+++ b/src/server/web/app/desktop/views/widgets/post-form.vue
diff --git a/src/web/app/desktop/views/widgets/profile.vue b/src/server/web/app/desktop/views/widgets/profile.vue
index 3940106197..3940106197 100644
--- a/src/web/app/desktop/views/widgets/profile.vue
+++ b/src/server/web/app/desktop/views/widgets/profile.vue
diff --git a/src/web/app/desktop/views/widgets/timemachine.vue b/src/server/web/app/desktop/views/widgets/timemachine.vue
index 6db3b14c62..6db3b14c62 100644
--- a/src/web/app/desktop/views/widgets/timemachine.vue
+++ b/src/server/web/app/desktop/views/widgets/timemachine.vue
diff --git a/src/web/app/desktop/views/widgets/trends.vue b/src/server/web/app/desktop/views/widgets/trends.vue
index 77779787ee..77779787ee 100644
--- a/src/web/app/desktop/views/widgets/trends.vue
+++ b/src/server/web/app/desktop/views/widgets/trends.vue
diff --git a/src/web/app/desktop/views/widgets/users.vue b/src/server/web/app/desktop/views/widgets/users.vue
index 10e3c529ee..10e3c529ee 100644
--- a/src/web/app/desktop/views/widgets/users.vue
+++ b/src/server/web/app/desktop/views/widgets/users.vue
diff --git a/src/web/app/dev/script.ts b/src/server/web/app/dev/script.ts
index c043813b40..c043813b40 100644
--- a/src/web/app/dev/script.ts
+++ b/src/server/web/app/dev/script.ts
diff --git a/src/web/app/dev/style.styl b/src/server/web/app/dev/style.styl
index e635897b17..e635897b17 100644
--- a/src/web/app/dev/style.styl
+++ b/src/server/web/app/dev/style.styl
diff --git a/src/web/app/dev/views/app.vue b/src/server/web/app/dev/views/app.vue
index 2c2a3c83ce..2c2a3c83ce 100644
--- a/src/web/app/dev/views/app.vue
+++ b/src/server/web/app/dev/views/app.vue
diff --git a/src/web/app/dev/views/apps.vue b/src/server/web/app/dev/views/apps.vue
index 7e0b107a30..7e0b107a30 100644
--- a/src/web/app/dev/views/apps.vue
+++ b/src/server/web/app/dev/views/apps.vue
diff --git a/src/web/app/dev/views/index.vue b/src/server/web/app/dev/views/index.vue
index 3f572b3907..3f572b3907 100644
--- a/src/web/app/dev/views/index.vue
+++ b/src/server/web/app/dev/views/index.vue
diff --git a/src/web/app/dev/views/new-app.vue b/src/server/web/app/dev/views/new-app.vue
index 344e8468f9..344e8468f9 100644
--- a/src/web/app/dev/views/new-app.vue
+++ b/src/server/web/app/dev/views/new-app.vue
diff --git a/src/web/app/dev/views/ui.vue b/src/server/web/app/dev/views/ui.vue
index 4a0fcee635..4a0fcee635 100644
--- a/src/web/app/dev/views/ui.vue
+++ b/src/server/web/app/dev/views/ui.vue
diff --git a/src/web/app/init.css b/src/server/web/app/init.css
index 2587f63943..2587f63943 100644
--- a/src/web/app/init.css
+++ b/src/server/web/app/init.css
diff --git a/src/web/app/init.ts b/src/server/web/app/init.ts
index 521dade866..521dade866 100644
--- a/src/web/app/init.ts
+++ b/src/server/web/app/init.ts
diff --git a/src/web/app/mobile/api/choose-drive-file.ts b/src/server/web/app/mobile/api/choose-drive-file.ts
index b1a78f2364..b1a78f2364 100644
--- a/src/web/app/mobile/api/choose-drive-file.ts
+++ b/src/server/web/app/mobile/api/choose-drive-file.ts
diff --git a/src/web/app/mobile/api/choose-drive-folder.ts b/src/server/web/app/mobile/api/choose-drive-folder.ts
index d1f97d1487..d1f97d1487 100644
--- a/src/web/app/mobile/api/choose-drive-folder.ts
+++ b/src/server/web/app/mobile/api/choose-drive-folder.ts
diff --git a/src/web/app/mobile/api/dialog.ts b/src/server/web/app/mobile/api/dialog.ts
index a2378767be..a2378767be 100644
--- a/src/web/app/mobile/api/dialog.ts
+++ b/src/server/web/app/mobile/api/dialog.ts
diff --git a/src/web/app/mobile/api/input.ts b/src/server/web/app/mobile/api/input.ts
index 38d0fb61eb..38d0fb61eb 100644
--- a/src/web/app/mobile/api/input.ts
+++ b/src/server/web/app/mobile/api/input.ts
diff --git a/src/web/app/mobile/api/notify.ts b/src/server/web/app/mobile/api/notify.ts
index 82780d196f..82780d196f 100644
--- a/src/web/app/mobile/api/notify.ts
+++ b/src/server/web/app/mobile/api/notify.ts
diff --git a/src/web/app/mobile/api/post.ts b/src/server/web/app/mobile/api/post.ts
index 9b78ce10c2..9b78ce10c2 100644
--- a/src/web/app/mobile/api/post.ts
+++ b/src/server/web/app/mobile/api/post.ts
diff --git a/src/web/app/mobile/script.ts b/src/server/web/app/mobile/script.ts
index 4776fccddb..4776fccddb 100644
--- a/src/web/app/mobile/script.ts
+++ b/src/server/web/app/mobile/script.ts
diff --git a/src/web/app/mobile/style.styl b/src/server/web/app/mobile/style.styl
index 81912a2483..81912a2483 100644
--- a/src/web/app/mobile/style.styl
+++ b/src/server/web/app/mobile/style.styl
diff --git a/src/web/app/mobile/views/components/activity.vue b/src/server/web/app/mobile/views/components/activity.vue
index b50044b3de..b50044b3de 100644
--- a/src/web/app/mobile/views/components/activity.vue
+++ b/src/server/web/app/mobile/views/components/activity.vue
diff --git a/src/web/app/mobile/views/components/drive-file-chooser.vue b/src/server/web/app/mobile/views/components/drive-file-chooser.vue
index 6806af0f1e..6806af0f1e 100644
--- a/src/web/app/mobile/views/components/drive-file-chooser.vue
+++ b/src/server/web/app/mobile/views/components/drive-file-chooser.vue
diff --git a/src/web/app/mobile/views/components/drive-folder-chooser.vue b/src/server/web/app/mobile/views/components/drive-folder-chooser.vue
index 853078664f..853078664f 100644
--- a/src/web/app/mobile/views/components/drive-folder-chooser.vue
+++ b/src/server/web/app/mobile/views/components/drive-folder-chooser.vue
diff --git a/src/web/app/mobile/views/components/drive.file-detail.vue b/src/server/web/app/mobile/views/components/drive.file-detail.vue
index e41ebbb451..e41ebbb451 100644
--- a/src/web/app/mobile/views/components/drive.file-detail.vue
+++ b/src/server/web/app/mobile/views/components/drive.file-detail.vue
diff --git a/src/web/app/mobile/views/components/drive.file.vue b/src/server/web/app/mobile/views/components/drive.file.vue
index db73816282..db73816282 100644
--- a/src/web/app/mobile/views/components/drive.file.vue
+++ b/src/server/web/app/mobile/views/components/drive.file.vue
diff --git a/src/web/app/mobile/views/components/drive.folder.vue b/src/server/web/app/mobile/views/components/drive.folder.vue
index 22ff38fecb..22ff38fecb 100644
--- a/src/web/app/mobile/views/components/drive.folder.vue
+++ b/src/server/web/app/mobile/views/components/drive.folder.vue
diff --git a/src/web/app/mobile/views/components/drive.vue b/src/server/web/app/mobile/views/components/drive.vue
index 696c63e2a4..696c63e2a4 100644
--- a/src/web/app/mobile/views/components/drive.vue
+++ b/src/server/web/app/mobile/views/components/drive.vue
diff --git a/src/web/app/mobile/views/components/follow-button.vue b/src/server/web/app/mobile/views/components/follow-button.vue
index fb6eaa39c6..fb6eaa39c6 100644
--- a/src/web/app/mobile/views/components/follow-button.vue
+++ b/src/server/web/app/mobile/views/components/follow-button.vue
diff --git a/src/web/app/mobile/views/components/friends-maker.vue b/src/server/web/app/mobile/views/components/friends-maker.vue
index 961a5f568a..961a5f568a 100644
--- a/src/web/app/mobile/views/components/friends-maker.vue
+++ b/src/server/web/app/mobile/views/components/friends-maker.vue
diff --git a/src/web/app/mobile/views/components/index.ts b/src/server/web/app/mobile/views/components/index.ts
index fb8f65f47d..fb8f65f47d 100644
--- a/src/web/app/mobile/views/components/index.ts
+++ b/src/server/web/app/mobile/views/components/index.ts
diff --git a/src/web/app/mobile/views/components/media-image.vue b/src/server/web/app/mobile/views/components/media-image.vue
index faf8bad48a..faf8bad48a 100644
--- a/src/web/app/mobile/views/components/media-image.vue
+++ b/src/server/web/app/mobile/views/components/media-image.vue
diff --git a/src/web/app/mobile/views/components/media-video.vue b/src/server/web/app/mobile/views/components/media-video.vue
index 68cd48587a..68cd48587a 100644
--- a/src/web/app/mobile/views/components/media-video.vue
+++ b/src/server/web/app/mobile/views/components/media-video.vue
diff --git a/src/web/app/mobile/views/components/notification-preview.vue b/src/server/web/app/mobile/views/components/notification-preview.vue
index 47df626fa8..47df626fa8 100644
--- a/src/web/app/mobile/views/components/notification-preview.vue
+++ b/src/server/web/app/mobile/views/components/notification-preview.vue
diff --git a/src/web/app/mobile/views/components/notification.vue b/src/server/web/app/mobile/views/components/notification.vue
index 150ac0fd8b..150ac0fd8b 100644
--- a/src/web/app/mobile/views/components/notification.vue
+++ b/src/server/web/app/mobile/views/components/notification.vue
diff --git a/src/web/app/mobile/views/components/notifications.vue b/src/server/web/app/mobile/views/components/notifications.vue
index 1cd6e2bc13..1cd6e2bc13 100644
--- a/src/web/app/mobile/views/components/notifications.vue
+++ b/src/server/web/app/mobile/views/components/notifications.vue
diff --git a/src/web/app/mobile/views/components/notify.vue b/src/server/web/app/mobile/views/components/notify.vue
index 6d4a481dbe..6d4a481dbe 100644
--- a/src/web/app/mobile/views/components/notify.vue
+++ b/src/server/web/app/mobile/views/components/notify.vue
diff --git a/src/web/app/mobile/views/components/post-card.vue b/src/server/web/app/mobile/views/components/post-card.vue
index 8ca7550c2e..8ca7550c2e 100644
--- a/src/web/app/mobile/views/components/post-card.vue
+++ b/src/server/web/app/mobile/views/components/post-card.vue
diff --git a/src/web/app/mobile/views/components/post-detail.sub.vue b/src/server/web/app/mobile/views/components/post-detail.sub.vue
index 6906cf570e..6906cf570e 100644
--- a/src/web/app/mobile/views/components/post-detail.sub.vue
+++ b/src/server/web/app/mobile/views/components/post-detail.sub.vue
diff --git a/src/web/app/mobile/views/components/post-detail.vue b/src/server/web/app/mobile/views/components/post-detail.vue
index b5c9158300..b5c9158300 100644
--- a/src/web/app/mobile/views/components/post-detail.vue
+++ b/src/server/web/app/mobile/views/components/post-detail.vue
diff --git a/src/web/app/mobile/views/components/post-form.vue b/src/server/web/app/mobile/views/components/post-form.vue
index 2aa3c6f6c0..2aa3c6f6c0 100644
--- a/src/web/app/mobile/views/components/post-form.vue
+++ b/src/server/web/app/mobile/views/components/post-form.vue
diff --git a/src/web/app/mobile/views/components/post-preview.vue b/src/server/web/app/mobile/views/components/post-preview.vue
index 0bd0a355b3..0bd0a355b3 100644
--- a/src/web/app/mobile/views/components/post-preview.vue
+++ b/src/server/web/app/mobile/views/components/post-preview.vue
diff --git a/src/web/app/mobile/views/components/post.sub.vue b/src/server/web/app/mobile/views/components/post.sub.vue
index b6ee7c1e08..b6ee7c1e08 100644
--- a/src/web/app/mobile/views/components/post.sub.vue
+++ b/src/server/web/app/mobile/views/components/post.sub.vue
diff --git a/src/web/app/mobile/views/components/post.vue b/src/server/web/app/mobile/views/components/post.vue
index e5bc964792..e5bc964792 100644
--- a/src/web/app/mobile/views/components/post.vue
+++ b/src/server/web/app/mobile/views/components/post.vue
diff --git a/src/web/app/mobile/views/components/posts.vue b/src/server/web/app/mobile/views/components/posts.vue
index 7e71fa0982..7e71fa0982 100644
--- a/src/web/app/mobile/views/components/posts.vue
+++ b/src/server/web/app/mobile/views/components/posts.vue
diff --git a/src/web/app/mobile/views/components/sub-post-content.vue b/src/server/web/app/mobile/views/components/sub-post-content.vue
index 389fc420ea..389fc420ea 100644
--- a/src/web/app/mobile/views/components/sub-post-content.vue
+++ b/src/server/web/app/mobile/views/components/sub-post-content.vue
diff --git a/src/web/app/mobile/views/components/timeline.vue b/src/server/web/app/mobile/views/components/timeline.vue
index c0e766523f..c0e766523f 100644
--- a/src/web/app/mobile/views/components/timeline.vue
+++ b/src/server/web/app/mobile/views/components/timeline.vue
diff --git a/src/web/app/mobile/views/components/ui.header.vue b/src/server/web/app/mobile/views/components/ui.header.vue
index 66e10a0f8a..66e10a0f8a 100644
--- a/src/web/app/mobile/views/components/ui.header.vue
+++ b/src/server/web/app/mobile/views/components/ui.header.vue
diff --git a/src/web/app/mobile/views/components/ui.nav.vue b/src/server/web/app/mobile/views/components/ui.nav.vue
index 760a5b5184..760a5b5184 100644
--- a/src/web/app/mobile/views/components/ui.nav.vue
+++ b/src/server/web/app/mobile/views/components/ui.nav.vue
diff --git a/src/web/app/mobile/views/components/ui.vue b/src/server/web/app/mobile/views/components/ui.vue
index 325ce9d40e..325ce9d40e 100644
--- a/src/web/app/mobile/views/components/ui.vue
+++ b/src/server/web/app/mobile/views/components/ui.vue
diff --git a/src/web/app/mobile/views/components/user-card.vue b/src/server/web/app/mobile/views/components/user-card.vue
index 5a7309cfd3..5a7309cfd3 100644
--- a/src/web/app/mobile/views/components/user-card.vue
+++ b/src/server/web/app/mobile/views/components/user-card.vue
diff --git a/src/web/app/mobile/views/components/user-preview.vue b/src/server/web/app/mobile/views/components/user-preview.vue
index be80582cac..be80582cac 100644
--- a/src/web/app/mobile/views/components/user-preview.vue
+++ b/src/server/web/app/mobile/views/components/user-preview.vue
diff --git a/src/web/app/mobile/views/components/user-timeline.vue b/src/server/web/app/mobile/views/components/user-timeline.vue
index 39f959187c..39f959187c 100644
--- a/src/web/app/mobile/views/components/user-timeline.vue
+++ b/src/server/web/app/mobile/views/components/user-timeline.vue
diff --git a/src/web/app/mobile/views/components/users-list.vue b/src/server/web/app/mobile/views/components/users-list.vue
index b11e4549d6..b11e4549d6 100644
--- a/src/web/app/mobile/views/components/users-list.vue
+++ b/src/server/web/app/mobile/views/components/users-list.vue
diff --git a/src/web/app/mobile/views/components/widget-container.vue b/src/server/web/app/mobile/views/components/widget-container.vue
index 7319c90849..7319c90849 100644
--- a/src/web/app/mobile/views/components/widget-container.vue
+++ b/src/server/web/app/mobile/views/components/widget-container.vue
diff --git a/src/web/app/mobile/views/directives/index.ts b/src/server/web/app/mobile/views/directives/index.ts
index 324e07596d..324e07596d 100644
--- a/src/web/app/mobile/views/directives/index.ts
+++ b/src/server/web/app/mobile/views/directives/index.ts
diff --git a/src/web/app/mobile/views/directives/user-preview.ts b/src/server/web/app/mobile/views/directives/user-preview.ts
index 1a54abc20d..1a54abc20d 100644
--- a/src/web/app/mobile/views/directives/user-preview.ts
+++ b/src/server/web/app/mobile/views/directives/user-preview.ts
diff --git a/src/web/app/mobile/views/pages/drive.vue b/src/server/web/app/mobile/views/pages/drive.vue
index 200379f222..200379f222 100644
--- a/src/web/app/mobile/views/pages/drive.vue
+++ b/src/server/web/app/mobile/views/pages/drive.vue
diff --git a/src/web/app/mobile/views/pages/followers.vue b/src/server/web/app/mobile/views/pages/followers.vue
index 1edf4e38ad..1edf4e38ad 100644
--- a/src/web/app/mobile/views/pages/followers.vue
+++ b/src/server/web/app/mobile/views/pages/followers.vue
diff --git a/src/web/app/mobile/views/pages/following.vue b/src/server/web/app/mobile/views/pages/following.vue
index 0dd171cce1..0dd171cce1 100644
--- a/src/web/app/mobile/views/pages/following.vue
+++ b/src/server/web/app/mobile/views/pages/following.vue
diff --git a/src/web/app/mobile/views/pages/home.vue b/src/server/web/app/mobile/views/pages/home.vue
index b110fc4091..b110fc4091 100644
--- a/src/web/app/mobile/views/pages/home.vue
+++ b/src/server/web/app/mobile/views/pages/home.vue
diff --git a/src/web/app/mobile/views/pages/index.vue b/src/server/web/app/mobile/views/pages/index.vue
index 0ea47d913b..0ea47d913b 100644
--- a/src/web/app/mobile/views/pages/index.vue
+++ b/src/server/web/app/mobile/views/pages/index.vue
diff --git a/src/web/app/mobile/views/pages/messaging-room.vue b/src/server/web/app/mobile/views/pages/messaging-room.vue
index 193c41179c..193c41179c 100644
--- a/src/web/app/mobile/views/pages/messaging-room.vue
+++ b/src/server/web/app/mobile/views/pages/messaging-room.vue
diff --git a/src/web/app/mobile/views/pages/messaging.vue b/src/server/web/app/mobile/views/pages/messaging.vue
index e92068eda5..e92068eda5 100644
--- a/src/web/app/mobile/views/pages/messaging.vue
+++ b/src/server/web/app/mobile/views/pages/messaging.vue
diff --git a/src/web/app/mobile/views/pages/notifications.vue b/src/server/web/app/mobile/views/pages/notifications.vue
index 3dcfb2f38c..3dcfb2f38c 100644
--- a/src/web/app/mobile/views/pages/notifications.vue
+++ b/src/server/web/app/mobile/views/pages/notifications.vue
diff --git a/src/web/app/mobile/views/pages/othello.vue b/src/server/web/app/mobile/views/pages/othello.vue
index b110bf309e..b110bf309e 100644
--- a/src/web/app/mobile/views/pages/othello.vue
+++ b/src/server/web/app/mobile/views/pages/othello.vue
diff --git a/src/web/app/mobile/views/pages/post.vue b/src/server/web/app/mobile/views/pages/post.vue
index 2ed2ebfcfd..2ed2ebfcfd 100644
--- a/src/web/app/mobile/views/pages/post.vue
+++ b/src/server/web/app/mobile/views/pages/post.vue
diff --git a/src/web/app/mobile/views/pages/profile-setting.vue b/src/server/web/app/mobile/views/pages/profile-setting.vue
index 941165c99e..941165c99e 100644
--- a/src/web/app/mobile/views/pages/profile-setting.vue
+++ b/src/server/web/app/mobile/views/pages/profile-setting.vue
diff --git a/src/web/app/mobile/views/pages/search.vue b/src/server/web/app/mobile/views/pages/search.vue
index cbab504e3c..cbab504e3c 100644
--- a/src/web/app/mobile/views/pages/search.vue
+++ b/src/server/web/app/mobile/views/pages/search.vue
diff --git a/src/web/app/mobile/views/pages/selectdrive.vue b/src/server/web/app/mobile/views/pages/selectdrive.vue
index 3480a0d103..3480a0d103 100644
--- a/src/web/app/mobile/views/pages/selectdrive.vue
+++ b/src/server/web/app/mobile/views/pages/selectdrive.vue
diff --git a/src/web/app/mobile/views/pages/settings.vue b/src/server/web/app/mobile/views/pages/settings.vue
index 3250999e12..3250999e12 100644
--- a/src/web/app/mobile/views/pages/settings.vue
+++ b/src/server/web/app/mobile/views/pages/settings.vue
diff --git a/src/web/app/mobile/views/pages/signup.vue b/src/server/web/app/mobile/views/pages/signup.vue
index 9dc07a4b86..9dc07a4b86 100644
--- a/src/web/app/mobile/views/pages/signup.vue
+++ b/src/server/web/app/mobile/views/pages/signup.vue
diff --git a/src/web/app/mobile/views/pages/user.vue b/src/server/web/app/mobile/views/pages/user.vue
index 7ff897e42d..7ff897e42d 100644
--- a/src/web/app/mobile/views/pages/user.vue
+++ b/src/server/web/app/mobile/views/pages/user.vue
diff --git a/src/web/app/mobile/views/pages/user/home.followers-you-know.vue b/src/server/web/app/mobile/views/pages/user/home.followers-you-know.vue
index 1a2b8f7083..1a2b8f7083 100644
--- a/src/web/app/mobile/views/pages/user/home.followers-you-know.vue
+++ b/src/server/web/app/mobile/views/pages/user/home.followers-you-know.vue
diff --git a/src/web/app/mobile/views/pages/user/home.friends.vue b/src/server/web/app/mobile/views/pages/user/home.friends.vue
index b37f1a2fe8..b37f1a2fe8 100644
--- a/src/web/app/mobile/views/pages/user/home.friends.vue
+++ b/src/server/web/app/mobile/views/pages/user/home.friends.vue
diff --git a/src/web/app/mobile/views/pages/user/home.photos.vue b/src/server/web/app/mobile/views/pages/user/home.photos.vue
index f12f59a407..f12f59a407 100644
--- a/src/web/app/mobile/views/pages/user/home.photos.vue
+++ b/src/server/web/app/mobile/views/pages/user/home.photos.vue
diff --git a/src/web/app/mobile/views/pages/user/home.posts.vue b/src/server/web/app/mobile/views/pages/user/home.posts.vue
index 70b20ce943..70b20ce943 100644
--- a/src/web/app/mobile/views/pages/user/home.posts.vue
+++ b/src/server/web/app/mobile/views/pages/user/home.posts.vue
diff --git a/src/web/app/mobile/views/pages/user/home.vue b/src/server/web/app/mobile/views/pages/user/home.vue
index e3def61512..e3def61512 100644
--- a/src/web/app/mobile/views/pages/user/home.vue
+++ b/src/server/web/app/mobile/views/pages/user/home.vue
diff --git a/src/web/app/mobile/views/pages/welcome.vue b/src/server/web/app/mobile/views/pages/welcome.vue
index 3384ee6997..3384ee6997 100644
--- a/src/web/app/mobile/views/pages/welcome.vue
+++ b/src/server/web/app/mobile/views/pages/welcome.vue
diff --git a/src/web/app/mobile/views/widgets/activity.vue b/src/server/web/app/mobile/views/widgets/activity.vue
index 48dcafb3ed..48dcafb3ed 100644
--- a/src/web/app/mobile/views/widgets/activity.vue
+++ b/src/server/web/app/mobile/views/widgets/activity.vue
diff --git a/src/web/app/mobile/views/widgets/index.ts b/src/server/web/app/mobile/views/widgets/index.ts
index 4de912b64c..4de912b64c 100644
--- a/src/web/app/mobile/views/widgets/index.ts
+++ b/src/server/web/app/mobile/views/widgets/index.ts
diff --git a/src/web/app/mobile/views/widgets/profile.vue b/src/server/web/app/mobile/views/widgets/profile.vue
index 1c9d038b4c..1c9d038b4c 100644
--- a/src/web/app/mobile/views/widgets/profile.vue
+++ b/src/server/web/app/mobile/views/widgets/profile.vue
diff --git a/src/web/app/reset.styl b/src/server/web/app/reset.styl
index 10bd3113a2..10bd3113a2 100644
--- a/src/web/app/reset.styl
+++ b/src/server/web/app/reset.styl
diff --git a/src/web/app/safe.js b/src/server/web/app/safe.js
index 2fd5361725..2fd5361725 100644
--- a/src/web/app/safe.js
+++ b/src/server/web/app/safe.js
diff --git a/src/web/app/stats/style.styl b/src/server/web/app/stats/style.styl
index 5ae230ea56..5ae230ea56 100644
--- a/src/web/app/stats/style.styl
+++ b/src/server/web/app/stats/style.styl
diff --git a/src/web/app/stats/tags/index.tag b/src/server/web/app/stats/tags/index.tag
index 4b167ccbc8..4b167ccbc8 100644
--- a/src/web/app/stats/tags/index.tag
+++ b/src/server/web/app/stats/tags/index.tag
diff --git a/src/web/app/stats/tags/index.ts b/src/server/web/app/stats/tags/index.ts
index f41151949f..f41151949f 100644
--- a/src/web/app/stats/tags/index.ts
+++ b/src/server/web/app/stats/tags/index.ts
diff --git a/src/web/app/status/style.styl b/src/server/web/app/status/style.styl
index 5ae230ea56..5ae230ea56 100644
--- a/src/web/app/status/style.styl
+++ b/src/server/web/app/status/style.styl
diff --git a/src/web/app/status/tags/index.tag b/src/server/web/app/status/tags/index.tag
index 899467097a..899467097a 100644
--- a/src/web/app/status/tags/index.tag
+++ b/src/server/web/app/status/tags/index.tag
diff --git a/src/web/app/status/tags/index.ts b/src/server/web/app/status/tags/index.ts
index f41151949f..f41151949f 100644
--- a/src/web/app/status/tags/index.ts
+++ b/src/server/web/app/status/tags/index.ts
diff --git a/src/web/app/sw.js b/src/server/web/app/sw.js
index 669703b16c..669703b16c 100644
--- a/src/web/app/sw.js
+++ b/src/server/web/app/sw.js
diff --git a/src/web/app/tsconfig.json b/src/server/web/app/tsconfig.json
index e31b52dab1..e31b52dab1 100644
--- a/src/web/app/tsconfig.json
+++ b/src/server/web/app/tsconfig.json
diff --git a/src/web/app/v.d.ts b/src/server/web/app/v.d.ts
index 8f3a240d80..8f3a240d80 100644
--- a/src/web/app/v.d.ts
+++ b/src/server/web/app/v.d.ts
diff --git a/src/web/assets/404.js b/src/server/web/assets/404.js
index f897f0db6b..f897f0db6b 100644
--- a/src/web/assets/404.js
+++ b/src/server/web/assets/404.js
diff --git a/src/web/assets/code-highlight.css b/src/server/web/assets/code-highlight.css
index f0807dc9c3..f0807dc9c3 100644
--- a/src/web/assets/code-highlight.css
+++ b/src/server/web/assets/code-highlight.css
diff --git a/src/web/assets/error.jpg b/src/server/web/assets/error.jpg
index 872b1a3f5d..872b1a3f5d 100644
--- a/src/web/assets/error.jpg
+++ b/src/server/web/assets/error.jpg
diff --git a/src/web/assets/favicon.ico b/src/server/web/assets/favicon.ico
index ed9820d5f4..ed9820d5f4 100644
--- a/src/web/assets/favicon.ico
+++ b/src/server/web/assets/favicon.ico
diff --git a/src/web/assets/label.svg b/src/server/web/assets/label.svg
index b1f85f3c07..b1f85f3c07 100644
--- a/src/web/assets/label.svg
+++ b/src/server/web/assets/label.svg
diff --git a/src/web/assets/manifest.json b/src/server/web/assets/manifest.json
index 783d0539ac..783d0539ac 100644
--- a/src/web/assets/manifest.json
+++ b/src/server/web/assets/manifest.json
diff --git a/src/web/assets/message.mp3 b/src/server/web/assets/message.mp3
index 6427744475..6427744475 100644
--- a/src/web/assets/message.mp3
+++ b/src/server/web/assets/message.mp3
diff --git a/src/web/assets/othello-put-me.mp3 b/src/server/web/assets/othello-put-me.mp3
index 4e0e72091c..4e0e72091c 100644
--- a/src/web/assets/othello-put-me.mp3
+++ b/src/server/web/assets/othello-put-me.mp3
diff --git a/src/web/assets/othello-put-you.mp3 b/src/server/web/assets/othello-put-you.mp3
index 9244189c2d..9244189c2d 100644
--- a/src/web/assets/othello-put-you.mp3
+++ b/src/server/web/assets/othello-put-you.mp3
diff --git a/src/web/assets/post.mp3 b/src/server/web/assets/post.mp3
index d3da88a933..d3da88a933 100644
--- a/src/web/assets/post.mp3
+++ b/src/server/web/assets/post.mp3
diff --git a/src/web/assets/reactions/angry.png b/src/server/web/assets/reactions/angry.png
index d81c431a25..d81c431a25 100644
--- a/src/web/assets/reactions/angry.png
+++ b/src/server/web/assets/reactions/angry.png
diff --git a/src/web/assets/reactions/confused.png b/src/server/web/assets/reactions/confused.png
index cfaa60146f..cfaa60146f 100644
--- a/src/web/assets/reactions/confused.png
+++ b/src/server/web/assets/reactions/confused.png
diff --git a/src/web/assets/reactions/congrats.png b/src/server/web/assets/reactions/congrats.png
index 350adda322..350adda322 100644
--- a/src/web/assets/reactions/congrats.png
+++ b/src/server/web/assets/reactions/congrats.png
diff --git a/src/web/assets/reactions/hmm.png b/src/server/web/assets/reactions/hmm.png
index a9a7e9ac88..a9a7e9ac88 100644
--- a/src/web/assets/reactions/hmm.png
+++ b/src/server/web/assets/reactions/hmm.png
diff --git a/src/web/assets/reactions/laugh.png b/src/server/web/assets/reactions/laugh.png
index cd2225ffe1..cd2225ffe1 100644
--- a/src/web/assets/reactions/laugh.png
+++ b/src/server/web/assets/reactions/laugh.png
diff --git a/src/web/assets/reactions/like.png b/src/server/web/assets/reactions/like.png
index 9fe67c9109..9fe67c9109 100644
--- a/src/web/assets/reactions/like.png
+++ b/src/server/web/assets/reactions/like.png
diff --git a/src/web/assets/reactions/love.png b/src/server/web/assets/reactions/love.png
index b8a7532ef0..b8a7532ef0 100644
--- a/src/web/assets/reactions/love.png
+++ b/src/server/web/assets/reactions/love.png
diff --git a/src/web/assets/reactions/pudding.png b/src/server/web/assets/reactions/pudding.png
index 27a6b048e8..27a6b048e8 100644
--- a/src/web/assets/reactions/pudding.png
+++ b/src/server/web/assets/reactions/pudding.png
diff --git a/src/web/assets/reactions/surprise.png b/src/server/web/assets/reactions/surprise.png
index 5904cb2c6c..5904cb2c6c 100644
--- a/src/web/assets/reactions/surprise.png
+++ b/src/server/web/assets/reactions/surprise.png
diff --git a/src/web/assets/recover.html b/src/server/web/assets/recover.html
index 4922b68d35..4922b68d35 100644
--- a/src/web/assets/recover.html
+++ b/src/server/web/assets/recover.html
diff --git a/src/web/assets/title.svg b/src/server/web/assets/title.svg
index 747fcd38b1..747fcd38b1 100644
--- a/src/web/assets/title.svg
+++ b/src/server/web/assets/title.svg
diff --git a/src/web/assets/unread.svg b/src/server/web/assets/unread.svg
index 8c3cc9f475..8c3cc9f475 100644
--- a/src/web/assets/unread.svg
+++ b/src/server/web/assets/unread.svg
diff --git a/src/web/assets/welcome-bg.svg b/src/server/web/assets/welcome-bg.svg
index ba8cd8dc0a..ba8cd8dc0a 100644
--- a/src/web/assets/welcome-bg.svg
+++ b/src/server/web/assets/welcome-bg.svg
diff --git a/src/web/assets/welcome-fg.svg b/src/server/web/assets/welcome-fg.svg
index 5c795c3027..5c795c3027 100644
--- a/src/web/assets/welcome-fg.svg
+++ b/src/server/web/assets/welcome-fg.svg
diff --git a/src/web/const.styl b/src/server/web/const.styl
index b6560701d9..f16e077828 100644
--- a/src/web/const.styl
+++ b/src/server/web/const.styl
@@ -1,4 +1,4 @@
-json('../const.json')
+json('../../const.json')
 
 $theme-color = themeColor
 $theme-color-foreground = themeColorForeground
diff --git a/src/web/docs/about.en.pug b/src/server/web/docs/about.en.pug
index 893d9dd6a1..893d9dd6a1 100644
--- a/src/web/docs/about.en.pug
+++ b/src/server/web/docs/about.en.pug
diff --git a/src/web/docs/about.ja.pug b/src/server/web/docs/about.ja.pug
index fec933b0c6..fec933b0c6 100644
--- a/src/web/docs/about.ja.pug
+++ b/src/server/web/docs/about.ja.pug
diff --git a/src/web/docs/api.ja.pug b/src/server/web/docs/api.ja.pug
index 2bb08f7f32..2bb08f7f32 100644
--- a/src/web/docs/api.ja.pug
+++ b/src/server/web/docs/api.ja.pug
diff --git a/src/web/docs/api/endpoints/posts/create.yaml b/src/server/web/docs/api/endpoints/posts/create.yaml
index 5e2307dab4..5e2307dab4 100644
--- a/src/web/docs/api/endpoints/posts/create.yaml
+++ b/src/server/web/docs/api/endpoints/posts/create.yaml
diff --git a/src/web/docs/api/endpoints/posts/timeline.yaml b/src/server/web/docs/api/endpoints/posts/timeline.yaml
index 01976b0611..01976b0611 100644
--- a/src/web/docs/api/endpoints/posts/timeline.yaml
+++ b/src/server/web/docs/api/endpoints/posts/timeline.yaml
diff --git a/src/web/docs/api/endpoints/style.styl b/src/server/web/docs/api/endpoints/style.styl
index 2af9fe9a77..2af9fe9a77 100644
--- a/src/web/docs/api/endpoints/style.styl
+++ b/src/server/web/docs/api/endpoints/style.styl
diff --git a/src/web/docs/api/endpoints/view.pug b/src/server/web/docs/api/endpoints/view.pug
index d271a5517a..d271a5517a 100644
--- a/src/web/docs/api/endpoints/view.pug
+++ b/src/server/web/docs/api/endpoints/view.pug
diff --git a/src/web/docs/api/entities/drive-file.yaml b/src/server/web/docs/api/entities/drive-file.yaml
index 2ebbb089ab..2ebbb089ab 100644
--- a/src/web/docs/api/entities/drive-file.yaml
+++ b/src/server/web/docs/api/entities/drive-file.yaml
diff --git a/src/web/docs/api/entities/post.yaml b/src/server/web/docs/api/entities/post.yaml
index f780263144..f780263144 100644
--- a/src/web/docs/api/entities/post.yaml
+++ b/src/server/web/docs/api/entities/post.yaml
diff --git a/src/web/docs/api/entities/style.styl b/src/server/web/docs/api/entities/style.styl
index bddf0f53ab..bddf0f53ab 100644
--- a/src/web/docs/api/entities/style.styl
+++ b/src/server/web/docs/api/entities/style.styl
diff --git a/src/web/docs/api/entities/user.yaml b/src/server/web/docs/api/entities/user.yaml
index a451a40807..a451a40807 100644
--- a/src/web/docs/api/entities/user.yaml
+++ b/src/server/web/docs/api/entities/user.yaml
diff --git a/src/web/docs/api/entities/view.pug b/src/server/web/docs/api/entities/view.pug
index 2156463dc7..2156463dc7 100644
--- a/src/web/docs/api/entities/view.pug
+++ b/src/server/web/docs/api/entities/view.pug
diff --git a/src/web/docs/api/gulpfile.ts b/src/server/web/docs/api/gulpfile.ts
index cd1bf15307..37935413de 100644
--- a/src/web/docs/api/gulpfile.ts
+++ b/src/server/web/docs/api/gulpfile.ts
@@ -10,10 +10,10 @@ import * as pug from 'pug';
 import * as yaml from 'js-yaml';
 import * as mkdirp from 'mkdirp';
 
-import locales from '../../../../locales';
-import I18nReplacer from '../../../common/build/i18n';
-import fa from '../../../common/build/fa';
-import config from './../../../conf';
+import locales from '../../../../../locales';
+import I18nReplacer from '../../../../build/i18n';
+import fa from '../../../../build/fa';
+import config from './../../../../conf';
 
 import generateVars from '../vars';
 
@@ -94,7 +94,7 @@ gulp.task('doc:api', [
 
 gulp.task('doc:api:endpoints', async () => {
 	const commonVars = await generateVars();
-	glob('./src/web/docs/api/endpoints/**/*.yaml', (globErr, files) => {
+	glob('./src/server/web/docs/api/endpoints/**/*.yaml', (globErr, files) => {
 		if (globErr) {
 			console.error(globErr);
 			return;
@@ -115,10 +115,10 @@ gulp.task('doc:api:endpoints', async () => {
 				resDefs: ep.res ? extractDefs(ep.res) : null,
 			};
 			langs.forEach(lang => {
-				pug.renderFile('./src/web/docs/api/endpoints/view.pug', Object.assign({}, vars, {
+				pug.renderFile('./src/server/web/docs/api/endpoints/view.pug', Object.assign({}, vars, {
 					lang,
 					title: ep.endpoint,
-					src: `https://github.com/syuilo/misskey/tree/master/src/web/docs/api/endpoints/${ep.endpoint}.yaml`,
+					src: `https://github.com/syuilo/misskey/tree/master/src/server/web/docs/api/endpoints/${ep.endpoint}.yaml`,
 					kebab,
 					common: commonVars
 				}), (renderErr, html) => {
@@ -129,7 +129,7 @@ gulp.task('doc:api:endpoints', async () => {
 					const i18n = new I18nReplacer(lang);
 					html = html.replace(i18n.pattern, i18n.replacement);
 					html = fa(html);
-					const htmlPath = `./built/web/docs/${lang}/api/endpoints/${ep.endpoint}.html`;
+					const htmlPath = `./built/server/web/docs/${lang}/api/endpoints/${ep.endpoint}.html`;
 					mkdirp(path.dirname(htmlPath), (mkdirErr) => {
 						if (mkdirErr) {
 							console.error(mkdirErr);
@@ -145,7 +145,7 @@ gulp.task('doc:api:endpoints', async () => {
 
 gulp.task('doc:api:entities', async () => {
 	const commonVars = await generateVars();
-	glob('./src/web/docs/api/entities/**/*.yaml', (globErr, files) => {
+	glob('./src/server/web/docs/api/entities/**/*.yaml', (globErr, files) => {
 		if (globErr) {
 			console.error(globErr);
 			return;
@@ -159,10 +159,10 @@ gulp.task('doc:api:entities', async () => {
 				propDefs: extractDefs(entity.props),
 			};
 			langs.forEach(lang => {
-				pug.renderFile('./src/web/docs/api/entities/view.pug', Object.assign({}, vars, {
+				pug.renderFile('./src/server/web/docs/api/entities/view.pug', Object.assign({}, vars, {
 					lang,
 					title: entity.name,
-					src: `https://github.com/syuilo/misskey/tree/master/src/web/docs/api/entities/${kebab(entity.name)}.yaml`,
+					src: `https://github.com/syuilo/misskey/tree/master/src/server/web/docs/api/entities/${kebab(entity.name)}.yaml`,
 					kebab,
 					common: commonVars
 				}), (renderErr, html) => {
@@ -173,7 +173,7 @@ gulp.task('doc:api:entities', async () => {
 					const i18n = new I18nReplacer(lang);
 					html = html.replace(i18n.pattern, i18n.replacement);
 					html = fa(html);
-					const htmlPath = `./built/web/docs/${lang}/api/entities/${kebab(entity.name)}.html`;
+					const htmlPath = `./built/server/web/docs/${lang}/api/entities/${kebab(entity.name)}.html`;
 					mkdirp(path.dirname(htmlPath), (mkdirErr) => {
 						if (mkdirErr) {
 							console.error(mkdirErr);
diff --git a/src/web/docs/api/mixins.pug b/src/server/web/docs/api/mixins.pug
index 686bf6a2b6..686bf6a2b6 100644
--- a/src/web/docs/api/mixins.pug
+++ b/src/server/web/docs/api/mixins.pug
diff --git a/src/web/docs/api/style.styl b/src/server/web/docs/api/style.styl
index 3675a4da6f..3675a4da6f 100644
--- a/src/web/docs/api/style.styl
+++ b/src/server/web/docs/api/style.styl
diff --git a/src/web/docs/gulpfile.ts b/src/server/web/docs/gulpfile.ts
index d5ddda108d..7b36cf6675 100644
--- a/src/web/docs/gulpfile.ts
+++ b/src/server/web/docs/gulpfile.ts
@@ -11,8 +11,8 @@ import * as mkdirp from 'mkdirp';
 import stylus = require('gulp-stylus');
 import cssnano = require('gulp-cssnano');
 
-import I18nReplacer from '../../common/build/i18n';
-import fa from '../../common/build/fa';
+import I18nReplacer from '../../../build/i18n';
+import fa from '../../../build/fa';
 import generateVars from './vars';
 
 require('./api/gulpfile.ts');
@@ -26,7 +26,7 @@ gulp.task('doc', [
 gulp.task('doc:docs', async () => {
 	const commonVars = await generateVars();
 
-	glob('./src/web/docs/**/*.*.pug', (globErr, files) => {
+	glob('./src/server/web/docs/**/*.*.pug', (globErr, files) => {
 		if (globErr) {
 			console.error(globErr);
 			return;
@@ -37,7 +37,7 @@ gulp.task('doc:docs', async () => {
 				common: commonVars,
 				lang: lang,
 				title: fs.readFileSync(file, 'utf-8').match(/^h1 (.+?)\r?\n/)[1],
-				src: `https://github.com/syuilo/misskey/tree/master/src/web/docs/${name}.${lang}.pug`,
+				src: `https://github.com/syuilo/misskey/tree/master/src/server/web/docs/${name}.${lang}.pug`,
 			};
 			pug.renderFile(file, vars, (renderErr, content) => {
 				if (renderErr) {
@@ -45,7 +45,7 @@ gulp.task('doc:docs', async () => {
 					return;
 				}
 
-				pug.renderFile('./src/web/docs/layout.pug', Object.assign({}, vars, {
+				pug.renderFile('./src/server/web/docs/layout.pug', Object.assign({}, vars, {
 					content
 				}), (renderErr2, html) => {
 					if (renderErr2) {
@@ -55,7 +55,7 @@ gulp.task('doc:docs', async () => {
 					const i18n = new I18nReplacer(lang);
 					html = html.replace(i18n.pattern, i18n.replacement);
 					html = fa(html);
-					const htmlPath = `./built/web/docs/${lang}/${name}.html`;
+					const htmlPath = `./built/server/web/docs/${lang}/${name}.html`;
 					mkdirp(path.dirname(htmlPath), (mkdirErr) => {
 						if (mkdirErr) {
 							console.error(mkdirErr);
@@ -70,8 +70,8 @@ gulp.task('doc:docs', async () => {
 });
 
 gulp.task('doc:styles', () =>
-	gulp.src('./src/web/docs/**/*.styl')
+	gulp.src('./src/server/web/docs/**/*.styl')
 		.pipe(stylus())
 		.pipe((cssnano as any)())
-		.pipe(gulp.dest('./built/web/docs/assets/'))
+		.pipe(gulp.dest('./built/server/web/docs/assets/'))
 );
diff --git a/src/web/docs/index.en.pug b/src/server/web/docs/index.en.pug
index 1fcc870d3d..1fcc870d3d 100644
--- a/src/web/docs/index.en.pug
+++ b/src/server/web/docs/index.en.pug
diff --git a/src/web/docs/index.ja.pug b/src/server/web/docs/index.ja.pug
index 4a0bf7fa1d..4a0bf7fa1d 100644
--- a/src/web/docs/index.ja.pug
+++ b/src/server/web/docs/index.ja.pug
diff --git a/src/web/docs/layout.pug b/src/server/web/docs/layout.pug
index 9dfd0ab7af..9dfd0ab7af 100644
--- a/src/web/docs/layout.pug
+++ b/src/server/web/docs/layout.pug
diff --git a/src/web/docs/license.en.pug b/src/server/web/docs/license.en.pug
index 45d8b76473..45d8b76473 100644
--- a/src/web/docs/license.en.pug
+++ b/src/server/web/docs/license.en.pug
diff --git a/src/web/docs/license.ja.pug b/src/server/web/docs/license.ja.pug
index 6eb9ac308e..6eb9ac308e 100644
--- a/src/web/docs/license.ja.pug
+++ b/src/server/web/docs/license.ja.pug
diff --git a/src/web/docs/mute.ja.pug b/src/server/web/docs/mute.ja.pug
index 5e79af5f8c..5e79af5f8c 100644
--- a/src/web/docs/mute.ja.pug
+++ b/src/server/web/docs/mute.ja.pug
diff --git a/src/web/docs/search.ja.pug b/src/server/web/docs/search.ja.pug
index e14e8c867e..e14e8c867e 100644
--- a/src/web/docs/search.ja.pug
+++ b/src/server/web/docs/search.ja.pug
diff --git a/src/web/docs/server.ts b/src/server/web/docs/server.ts
index b2e50457e5..b2e50457e5 100644
--- a/src/web/docs/server.ts
+++ b/src/server/web/docs/server.ts
diff --git a/src/web/docs/style.styl b/src/server/web/docs/style.styl
index bc165f8728..bc165f8728 100644
--- a/src/web/docs/style.styl
+++ b/src/server/web/docs/style.styl
diff --git a/src/web/docs/tou.ja.pug b/src/server/web/docs/tou.ja.pug
index 7663258f82..7663258f82 100644
--- a/src/web/docs/tou.ja.pug
+++ b/src/server/web/docs/tou.ja.pug
diff --git a/src/web/docs/ui.styl b/src/server/web/docs/ui.styl
index 8d5515712f..8d5515712f 100644
--- a/src/web/docs/ui.styl
+++ b/src/server/web/docs/ui.styl
diff --git a/src/web/docs/vars.ts b/src/server/web/docs/vars.ts
index 6f713f21d0..5096a39c9e 100644
--- a/src/web/docs/vars.ts
+++ b/src/server/web/docs/vars.ts
@@ -5,27 +5,27 @@ import * as yaml from 'js-yaml';
 import * as licenseChecker from 'license-checker';
 import * as tmp from 'tmp';
 
-import { fa } from '../../common/build/fa';
-import config from '../../conf';
-import { licenseHtml } from '../../common/build/license';
-const constants = require('../../const.json');
+import { fa } from '../../../build/fa';
+import config from '../../../conf';
+import { licenseHtml } from '../../../build/license';
+const constants = require('../../../const.json');
 
 export default async function(): Promise<{ [key: string]: any }> {
 	const vars = {} as { [key: string]: any };
 
-	const endpoints = glob.sync('./src/web/docs/api/endpoints/**/*.yaml');
+	const endpoints = glob.sync('./src/server/web/docs/api/endpoints/**/*.yaml');
 	vars['endpoints'] = endpoints.map(ep => {
 		const _ep = yaml.safeLoad(fs.readFileSync(ep, 'utf-8'));
 		return _ep.endpoint;
 	});
 
-	const entities = glob.sync('./src/web/docs/api/entities/**/*.yaml');
+	const entities = glob.sync('./src/server/web/docs/api/entities/**/*.yaml');
 	vars['entities'] = entities.map(x => {
 		const _x = yaml.safeLoad(fs.readFileSync(x, 'utf-8'));
 		return _x.name;
 	});
 
-	const docs = glob.sync('./src/web/docs/**/*.*.pug');
+	const docs = glob.sync('./src/server/web/docs/**/*.*.pug');
 	vars['docs'] = {};
 	docs.forEach(x => {
 		const [, name, lang] = x.match(/docs\/(.+?)\.(.+?)\.pug$/);
@@ -53,7 +53,7 @@ export default async function(): Promise<{ [key: string]: any }> {
 		licenseText: ''
 	}), 'utf-8');
 	const dependencies = await util.promisify(licenseChecker.init).bind(licenseChecker)({
-		start: __dirname + '/../../../',
+		start: __dirname + '/../../../../',
 		customPath: tmpObj.name
 	});
 	tmpObj.removeCallback();
diff --git a/src/web/element.scss b/src/server/web/element.scss
index 917198e024..7e6d0e7099 100644
--- a/src/web/element.scss
+++ b/src/server/web/element.scss
@@ -1,7 +1,7 @@
 /* Element variable definitons */
 /* SEE: http://element.eleme.io/#/en-US/component/custom-theme */
 
-@import '../const.json';
+@import '../../const.json';
 
 /* theme color */
 $--color-primary: $themeColor;
diff --git a/src/web/server.ts b/src/server/web/server.ts
index b117f6ae81..b117f6ae81 100644
--- a/src/web/server.ts
+++ b/src/server/web/server.ts
diff --git a/src/web/service/url-preview.ts b/src/server/web/service/url-preview.ts
index 0c5fd8a78e..0c5fd8a78e 100644
--- a/src/web/service/url-preview.ts
+++ b/src/server/web/service/url-preview.ts
diff --git a/src/web/style.styl b/src/server/web/style.styl
index 6d1e53e5a6..6d1e53e5a6 100644
--- a/src/web/style.styl
+++ b/src/server/web/style.styl
diff --git a/src/tools/analysis/core.ts b/src/tools/analysis/core.ts
index 20e5fa6c51..839fffd3c8 100644
--- a/src/tools/analysis/core.ts
+++ b/src/tools/analysis/core.ts
@@ -1,7 +1,7 @@
 const bayes = require('./naive-bayes.js');
 
 const MeCab = require('./mecab');
-import Post from '../../api/models/post';
+import Post from '../../server/api/models/post';
 
 /**
  * 投稿を学習したり与えられた投稿のカテゴリを予測します
diff --git a/src/tools/analysis/extract-user-domains.ts b/src/tools/analysis/extract-user-domains.ts
index bc120f5c17..ba472b89a2 100644
--- a/src/tools/analysis/extract-user-domains.ts
+++ b/src/tools/analysis/extract-user-domains.ts
@@ -1,8 +1,8 @@
 import * as URL from 'url';
 
-import Post from '../../api/models/post';
-import User from '../../api/models/user';
-import parse from '../../api/common/text';
+import Post from '../../server/api/models/post';
+import User from '../../server/api/models/user';
+import parse from '../../server/api/common/text';
 
 process.on('unhandledRejection', console.dir);
 
diff --git a/src/tools/analysis/extract-user-keywords.ts b/src/tools/analysis/extract-user-keywords.ts
index b99ca93211..4fa9b384ef 100644
--- a/src/tools/analysis/extract-user-keywords.ts
+++ b/src/tools/analysis/extract-user-keywords.ts
@@ -1,9 +1,9 @@
 const moji = require('moji');
 
 const MeCab = require('./mecab');
-import Post from '../../api/models/post';
-import User from '../../api/models/user';
-import parse from '../../api/common/text';
+import Post from '../../server/api/models/post';
+import User from '../../server/api/models/user';
+import parse from '../../server/api/common/text';
 
 process.on('unhandledRejection', console.dir);
 
diff --git a/src/tools/analysis/predict-all-post-category.ts b/src/tools/analysis/predict-all-post-category.ts
index 058c4f99ef..8564fd1b10 100644
--- a/src/tools/analysis/predict-all-post-category.ts
+++ b/src/tools/analysis/predict-all-post-category.ts
@@ -1,4 +1,4 @@
-import Post from '../../api/models/post';
+import Post from '../../server/api/models/post';
 import Core from './core';
 
 const c = new Core();
diff --git a/src/tools/analysis/predict-user-interst.ts b/src/tools/analysis/predict-user-interst.ts
index 99bdfa4206..6599fb2208 100644
--- a/src/tools/analysis/predict-user-interst.ts
+++ b/src/tools/analysis/predict-user-interst.ts
@@ -1,5 +1,5 @@
-import Post from '../../api/models/post';
-import User from '../../api/models/user';
+import Post from '../../server/api/models/post';
+import User from '../../server/api/models/user';
 
 export async function predictOne(id) {
 	console.log(`predict interest of ${id} ...`);
diff --git a/test/api.js b/test/api.js
index b8b2aecc99..c2c08dd95d 100644
--- a/test/api.js
+++ b/test/api.js
@@ -17,7 +17,7 @@ const should = _chai.should();
 
 _chai.use(chaiHttp);
 
-const server = require('../built/api/server');
+const server = require('../built/server/api/server');
 const db = require('../built/db/mongodb').default;
 
 const async = fn => (done) => {
diff --git a/test/text.js b/test/text.js
index 3b27aa23d4..4f739cc1b1 100644
--- a/test/text.js
+++ b/test/text.js
@@ -4,8 +4,8 @@
 
 const assert = require('assert');
 
-const analyze = require('../built/api/common/text').default;
-const syntaxhighlighter = require('../built/api/common/text/core/syntax-highlighter').default;
+const analyze = require('../built/server/api/common/text').default;
+const syntaxhighlighter = require('../built/server/api/common/text/core/syntax-highlighter').default;
 
 describe('Text', () => {
 	it('can be analyzed', () => {
diff --git a/tsconfig.json b/tsconfig.json
index 47aa521bfe..574c11baca 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,6 +21,6 @@
     "./src/**/*.ts"
   ],
   "exclude": [
-    "./src/web/app/**/*.ts"
+    "./src/server/web/app/**/*.ts"
   ]
 }
diff --git a/webpack.config.ts b/webpack.config.ts
index 9a952c8ef3..6f16fcbfa3 100644
--- a/webpack.config.ts
+++ b/webpack.config.ts
@@ -11,11 +11,11 @@ const WebpackOnBuildPlugin = require('on-build-webpack');
 //const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
 const ProgressBarPlugin = require('progress-bar-webpack-plugin');
 
-import I18nReplacer from './src/common/build/i18n';
-import { pattern as faPattern, replacement as faReplacement } from './src/common/build/fa';
+import I18nReplacer from './src/build/i18n';
+import { pattern as faPattern, replacement as faReplacement } from './src/build/fa';
 const constants = require('./src/const.json');
 import config from './src/conf';
-import { licenseHtml } from './src/common/build/license';
+import { licenseHtml } from './src/build/license';
 
 import locales from './locales';
 const meta = require('./package.json');
@@ -33,7 +33,7 @@ global['collapseSpacesReplacement'] = html => {
 };
 
 global['base64replacement'] = (_, key) => {
-	return fs.readFileSync(__dirname + '/src/web/' + key, 'base64');
+	return fs.readFileSync(__dirname + '/src/server/web/' + key, 'base64');
 };
 //#endregion
 
@@ -51,18 +51,18 @@ module.exports = entries.map(x => {
 
 	// Entries
 	const entry = {
-		desktop: './src/web/app/desktop/script.ts',
-		mobile: './src/web/app/mobile/script.ts',
-		//ch: './src/web/app/ch/script.ts',
-		//stats: './src/web/app/stats/script.ts',
-		//status: './src/web/app/status/script.ts',
-		dev: './src/web/app/dev/script.ts',
-		auth: './src/web/app/auth/script.ts',
-		sw: './src/web/app/sw.js'
+		desktop: './src/server/web/app/desktop/script.ts',
+		mobile: './src/server/web/app/mobile/script.ts',
+		//ch: './src/server/web/app/ch/script.ts',
+		//stats: './src/server/web/app/stats/script.ts',
+		//status: './src/server/web/app/status/script.ts',
+		dev: './src/server/web/app/dev/script.ts',
+		auth: './src/server/web/app/auth/script.ts',
+		sw: './src/server/web/app/sw.js'
 	};
 
 	const output = {
-		path: __dirname + '/built/web/assets',
+		path: __dirname + '/built/server/web/assets',
 		filename: `[name].${version}.${lang}.${isProduction ? 'min' : 'raw'}.js`
 	};
 
@@ -206,7 +206,7 @@ module.exports = entries.map(x => {
 					loader: 'ts-loader',
 					options: {
 						happyPackMode: true,
-						configFile: __dirname + '/../src/web/app/tsconfig.json',
+						configFile: __dirname + '/../src/server/web/app/tsconfig.json',
 						appendTsSuffixTo: [/\.vue$/]
 					}
 				}, {
@@ -231,7 +231,7 @@ module.exports = entries.map(x => {
 				'.js', '.ts', '.json'
 			],
 			alias: {
-				'const.styl': __dirname + '/src/web/const.styl'
+				'const.styl': __dirname + '/src/server/web/const.styl'
 			}
 		},
 		resolveLoader: {