diff --git a/.sequelizerc.example b/.sequelizerc.example
index 81248936b..c5c9973ed 100644
--- a/.sequelizerc.example
+++ b/.sequelizerc.example
@@ -26,6 +26,6 @@ fs.writeFile(path.resolve('config', 'database.json'), JSON.stringify(database),
 
 module.exports = {
     'config':          path.resolve('config', 'database.json'),
-    'migrations-path': path.resolve('lib', 'migrations'),
-    'models-path':     path.resolve('lib', 'models')
+    'migrations-path': path.resolve('src/lib', 'migrations'),
+    'models-path':     path.resolve('src/lib', 'models')
 }
diff --git a/lib/config/index.js b/lib/config/index.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/web/auth/ldap/index.js b/lib/web/auth/ldap/index.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/web/auth/oauth2/index.js b/lib/web/auth/oauth2/index.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/package.json b/package.json
index 7f5e84d75..5807008b9 100644
--- a/package.json
+++ b/package.json
@@ -6,14 +6,14 @@
   "license": "AGPL-3.0",
   "scripts": {
     "test": "npm run-script eslint && npm run-script jsonlint && npm run-script mocha-suite",
-    "eslint": "node_modules/.bin/eslint --max-warnings 0 lib public test",
+    "eslint": "node_modules/.bin/eslint --max-warnings 0 src",
     "jsonlint": "find . -not -path './node_modules/*' -type f -name '*.json' -o -type f -name '*.json.example' | while read json; do echo $json ; jq . $json; done",
     "mocha-suite": "NODE_ENV=test CMD_DB_URL=\"sqlite::memory:\" mocha --exit",
     "standard": "echo 'standard is no longer being used, use `npm run eslint` instead!' && exit 1",
     "dev": "webpack --config webpack.dev.js --progress --colors --watch",
     "heroku-prebuild": "bin/heroku",
     "build": "webpack --config webpack.prod.js --progress --colors --bail",
-    "start": "tsc && sequelize db:migrate && node built/app.js"
+    "start": "tsc && sequelize db:migrate && node built/lib/app.js"
   },
   "dependencies": {
     "@passport-next/passport-openid": "^1.0.0",
@@ -120,7 +120,7 @@
     "socket.io": "~2.1.1",
     "socket.io-client": "~2.1.1",
     "spin.js": "^2.3.2",
-    "sqlite3": "^4.1.0",
+    "sqlite3": "^4.2.0",
     "store": "^2.0.12",
     "string": "^3.3.3",
     "tedious": "^6.6.0",
diff --git a/lib/app.ts b/src/lib/app.ts
similarity index 100%
rename from lib/app.ts
rename to src/lib/app.ts
diff --git a/lib/config/default.ts b/src/lib/config/default.ts
similarity index 100%
rename from lib/config/default.ts
rename to src/lib/config/default.ts
diff --git a/lib/config/defaultSSL.ts b/src/lib/config/defaultSSL.ts
similarity index 100%
rename from lib/config/defaultSSL.ts
rename to src/lib/config/defaultSSL.ts
diff --git a/lib/config/dockerSecret.ts b/src/lib/config/dockerSecret.ts
similarity index 100%
rename from lib/config/dockerSecret.ts
rename to src/lib/config/dockerSecret.ts
diff --git a/lib/config/enum.ts b/src/lib/config/enum.ts
similarity index 100%
rename from lib/config/enum.ts
rename to src/lib/config/enum.ts
diff --git a/lib/config/environment.ts b/src/lib/config/environment.ts
similarity index 100%
rename from lib/config/environment.ts
rename to src/lib/config/environment.ts
diff --git a/lib/config/hackmdEnvironment.ts b/src/lib/config/hackmdEnvironment.ts
similarity index 100%
rename from lib/config/hackmdEnvironment.ts
rename to src/lib/config/hackmdEnvironment.ts
diff --git a/lib/config/index.ts b/src/lib/config/index.ts
similarity index 99%
rename from lib/config/index.ts
rename to src/lib/config/index.ts
index 8e8a91685..2924dc263 100644
--- a/lib/config/index.ts
+++ b/src/lib/config/index.ts
@@ -14,7 +14,7 @@ import { environment } from './environment'
 import { dockerSecret } from './dockerSecret'
 import deepFreeze = require('deep-freeze')
 
-const appRootPath = path.resolve(__dirname, '../../')
+const appRootPath = path.resolve(__dirname, '../../../')
 const env = process.env.NODE_ENV || Environment.development
 const debugConfig = {
   debug: (env === Environment.development)
diff --git a/lib/config/interfaces.ts b/src/lib/config/interfaces.ts
similarity index 100%
rename from lib/config/interfaces.ts
rename to src/lib/config/interfaces.ts
diff --git a/lib/config/oldDefault.ts b/src/lib/config/oldDefault.ts
similarity index 100%
rename from lib/config/oldDefault.ts
rename to src/lib/config/oldDefault.ts
diff --git a/lib/config/oldEnvironment.ts b/src/lib/config/oldEnvironment.ts
similarity index 100%
rename from lib/config/oldEnvironment.ts
rename to src/lib/config/oldEnvironment.ts
diff --git a/lib/config/utils.ts b/src/lib/config/utils.ts
similarity index 100%
rename from lib/config/utils.ts
rename to src/lib/config/utils.ts
diff --git a/lib/csp.ts b/src/lib/csp.ts
similarity index 100%
rename from lib/csp.ts
rename to src/lib/csp.ts
diff --git a/lib/errors.ts b/src/lib/errors.ts
similarity index 100%
rename from lib/errors.ts
rename to src/lib/errors.ts
diff --git a/lib/history.ts b/src/lib/history.ts
similarity index 100%
rename from lib/history.ts
rename to src/lib/history.ts
diff --git a/lib/letter-avatars.ts b/src/lib/letter-avatars.ts
similarity index 100%
rename from lib/letter-avatars.ts
rename to src/lib/letter-avatars.ts
diff --git a/lib/library-ext.d.ts b/src/lib/library-ext.d.ts
similarity index 100%
rename from lib/library-ext.d.ts
rename to src/lib/library-ext.d.ts
diff --git a/lib/logger.ts b/src/lib/logger.ts
similarity index 100%
rename from lib/logger.ts
rename to src/lib/logger.ts
diff --git a/lib/migrations/20150504155329-create-users.js b/src/lib/migrations/20150504155329-create-users.js
similarity index 100%
rename from lib/migrations/20150504155329-create-users.js
rename to src/lib/migrations/20150504155329-create-users.js
diff --git a/lib/migrations/20150508114741-create-notes.js b/src/lib/migrations/20150508114741-create-notes.js
similarity index 100%
rename from lib/migrations/20150508114741-create-notes.js
rename to src/lib/migrations/20150508114741-create-notes.js
diff --git a/lib/migrations/20150515125813-create-temp.js b/src/lib/migrations/20150515125813-create-temp.js
similarity index 100%
rename from lib/migrations/20150515125813-create-temp.js
rename to src/lib/migrations/20150515125813-create-temp.js
diff --git a/lib/migrations/20150702001020-update-to-0_3_1.js b/src/lib/migrations/20150702001020-update-to-0_3_1.js
similarity index 100%
rename from lib/migrations/20150702001020-update-to-0_3_1.js
rename to src/lib/migrations/20150702001020-update-to-0_3_1.js
diff --git a/lib/migrations/20150915153700-change-notes-title-to-text.js b/src/lib/migrations/20150915153700-change-notes-title-to-text.js
similarity index 100%
rename from lib/migrations/20150915153700-change-notes-title-to-text.js
rename to src/lib/migrations/20150915153700-change-notes-title-to-text.js
diff --git a/lib/migrations/20160112220142-note-add-lastchange.js b/src/lib/migrations/20160112220142-note-add-lastchange.js
similarity index 100%
rename from lib/migrations/20160112220142-note-add-lastchange.js
rename to src/lib/migrations/20160112220142-note-add-lastchange.js
diff --git a/lib/migrations/20160420180355-note-add-alias.js b/src/lib/migrations/20160420180355-note-add-alias.js
similarity index 100%
rename from lib/migrations/20160420180355-note-add-alias.js
rename to src/lib/migrations/20160420180355-note-add-alias.js
diff --git a/lib/migrations/20160515114000-user-add-tokens.js b/src/lib/migrations/20160515114000-user-add-tokens.js
similarity index 100%
rename from lib/migrations/20160515114000-user-add-tokens.js
rename to src/lib/migrations/20160515114000-user-add-tokens.js
diff --git a/lib/migrations/20160607060246-support-revision.js b/src/lib/migrations/20160607060246-support-revision.js
similarity index 100%
rename from lib/migrations/20160607060246-support-revision.js
rename to src/lib/migrations/20160607060246-support-revision.js
diff --git a/lib/migrations/20160703062241-support-authorship.js b/src/lib/migrations/20160703062241-support-authorship.js
similarity index 100%
rename from lib/migrations/20160703062241-support-authorship.js
rename to src/lib/migrations/20160703062241-support-authorship.js
diff --git a/lib/migrations/20161009040430-support-delete-note.js b/src/lib/migrations/20161009040430-support-delete-note.js
similarity index 100%
rename from lib/migrations/20161009040430-support-delete-note.js
rename to src/lib/migrations/20161009040430-support-delete-note.js
diff --git a/lib/migrations/20161201050312-support-email-signin.js b/src/lib/migrations/20161201050312-support-email-signin.js
similarity index 100%
rename from lib/migrations/20161201050312-support-email-signin.js
rename to src/lib/migrations/20161201050312-support-email-signin.js
diff --git a/lib/migrations/20171009121200-longtext-for-mysql.js b/src/lib/migrations/20171009121200-longtext-for-mysql.js
similarity index 100%
rename from lib/migrations/20171009121200-longtext-for-mysql.js
rename to src/lib/migrations/20171009121200-longtext-for-mysql.js
diff --git a/lib/migrations/20180209120907-longtext-of-authorship.js b/src/lib/migrations/20180209120907-longtext-of-authorship.js
similarity index 100%
rename from lib/migrations/20180209120907-longtext-of-authorship.js
rename to src/lib/migrations/20180209120907-longtext-of-authorship.js
diff --git a/lib/migrations/20180306150303-fix-enum.js b/src/lib/migrations/20180306150303-fix-enum.js
similarity index 100%
rename from lib/migrations/20180306150303-fix-enum.js
rename to src/lib/migrations/20180306150303-fix-enum.js
diff --git a/lib/migrations/20180326103000-use-text-in-tokens.js b/src/lib/migrations/20180326103000-use-text-in-tokens.js
similarity index 100%
rename from lib/migrations/20180326103000-use-text-in-tokens.js
rename to src/lib/migrations/20180326103000-use-text-in-tokens.js
diff --git a/lib/migrations/20180525153000-user-add-delete-token.js b/src/lib/migrations/20180525153000-user-add-delete-token.js
similarity index 100%
rename from lib/migrations/20180525153000-user-add-delete-token.js
rename to src/lib/migrations/20180525153000-user-add-delete-token.js
diff --git a/lib/models/author.ts b/src/lib/models/author.ts
similarity index 100%
rename from lib/models/author.ts
rename to src/lib/models/author.ts
diff --git a/lib/models/index.ts b/src/lib/models/index.ts
similarity index 100%
rename from lib/models/index.ts
rename to src/lib/models/index.ts
diff --git a/lib/models/note.ts b/src/lib/models/note.ts
similarity index 100%
rename from lib/models/note.ts
rename to src/lib/models/note.ts
diff --git a/lib/models/revision.ts b/src/lib/models/revision.ts
similarity index 99%
rename from lib/models/revision.ts
rename to src/lib/models/revision.ts
index 0861a6383..bf0faa83e 100644
--- a/lib/models/revision.ts
+++ b/src/lib/models/revision.ts
@@ -24,7 +24,7 @@ class Data {
 }
 
 function createDmpWorker (): ChildProcess {
-  const worker = childProcess.fork(path.resolve(__dirname, '../workers/dmpWorker.js'), ['ignore'])
+  const worker = childProcess.fork(path.resolve(__dirname, '../workers/dmpWorker'), ['ignore'])
   logger.debug('dmp worker process started')
   worker.on('message', function (data: Data) {
     if (!data || !data.msg || !data.cacheKey) {
diff --git a/lib/models/temp.ts b/src/lib/models/temp.ts
similarity index 100%
rename from lib/models/temp.ts
rename to src/lib/models/temp.ts
diff --git a/lib/models/user.ts b/src/lib/models/user.ts
similarity index 100%
rename from lib/models/user.ts
rename to src/lib/models/user.ts
diff --git a/lib/ot/client.js b/src/lib/ot/client.js
similarity index 100%
rename from lib/ot/client.js
rename to src/lib/ot/client.js
diff --git a/lib/ot/editor-socketio-server.ts b/src/lib/ot/editor-socketio-server.ts
similarity index 100%
rename from lib/ot/editor-socketio-server.ts
rename to src/lib/ot/editor-socketio-server.ts
diff --git a/lib/ot/index.js b/src/lib/ot/index.js
similarity index 100%
rename from lib/ot/index.js
rename to src/lib/ot/index.js
diff --git a/lib/ot/selection.js b/src/lib/ot/selection.js
similarity index 100%
rename from lib/ot/selection.js
rename to src/lib/ot/selection.js
diff --git a/lib/ot/server.js b/src/lib/ot/server.js
similarity index 100%
rename from lib/ot/server.js
rename to src/lib/ot/server.js
diff --git a/lib/ot/simple-text-operation.js b/src/lib/ot/simple-text-operation.js
similarity index 100%
rename from lib/ot/simple-text-operation.js
rename to src/lib/ot/simple-text-operation.js
diff --git a/lib/ot/text-operation.js b/src/lib/ot/text-operation.js
similarity index 100%
rename from lib/ot/text-operation.js
rename to src/lib/ot/text-operation.js
diff --git a/lib/ot/wrapped-operation.js b/src/lib/ot/wrapped-operation.js
similarity index 100%
rename from lib/ot/wrapped-operation.js
rename to src/lib/ot/wrapped-operation.js
diff --git a/lib/realtime.ts b/src/lib/realtime.ts
similarity index 100%
rename from lib/realtime.ts
rename to src/lib/realtime.ts
diff --git a/lib/response.ts b/src/lib/response.ts
similarity index 100%
rename from lib/response.ts
rename to src/lib/response.ts
diff --git a/lib/utils.ts b/src/lib/utils.ts
similarity index 100%
rename from lib/utils.ts
rename to src/lib/utils.ts
diff --git a/lib/web/auth/dropbox/index.ts b/src/lib/web/auth/dropbox/index.ts
similarity index 100%
rename from lib/web/auth/dropbox/index.ts
rename to src/lib/web/auth/dropbox/index.ts
diff --git a/lib/web/auth/email/index.ts b/src/lib/web/auth/email/index.ts
similarity index 100%
rename from lib/web/auth/email/index.ts
rename to src/lib/web/auth/email/index.ts
diff --git a/lib/web/auth/facebook/index.ts b/src/lib/web/auth/facebook/index.ts
similarity index 100%
rename from lib/web/auth/facebook/index.ts
rename to src/lib/web/auth/facebook/index.ts
diff --git a/lib/web/auth/github/index.ts b/src/lib/web/auth/github/index.ts
similarity index 100%
rename from lib/web/auth/github/index.ts
rename to src/lib/web/auth/github/index.ts
diff --git a/lib/web/auth/gitlab/index.ts b/src/lib/web/auth/gitlab/index.ts
similarity index 100%
rename from lib/web/auth/gitlab/index.ts
rename to src/lib/web/auth/gitlab/index.ts
diff --git a/lib/web/auth/google/index.ts b/src/lib/web/auth/google/index.ts
similarity index 100%
rename from lib/web/auth/google/index.ts
rename to src/lib/web/auth/google/index.ts
diff --git a/lib/web/auth/index.ts b/src/lib/web/auth/index.ts
similarity index 100%
rename from lib/web/auth/index.ts
rename to src/lib/web/auth/index.ts
diff --git a/lib/web/auth/interface.ts b/src/lib/web/auth/interface.ts
similarity index 100%
rename from lib/web/auth/interface.ts
rename to src/lib/web/auth/interface.ts
diff --git a/lib/web/auth/ldap/index.ts b/src/lib/web/auth/ldap/index.ts
similarity index 100%
rename from lib/web/auth/ldap/index.ts
rename to src/lib/web/auth/ldap/index.ts
diff --git a/lib/web/auth/oauth2/index.ts b/src/lib/web/auth/oauth2/index.ts
similarity index 100%
rename from lib/web/auth/oauth2/index.ts
rename to src/lib/web/auth/oauth2/index.ts
diff --git a/lib/web/auth/oauth2/oauth2-custom-strategy.ts b/src/lib/web/auth/oauth2/oauth2-custom-strategy.ts
similarity index 100%
rename from lib/web/auth/oauth2/oauth2-custom-strategy.ts
rename to src/lib/web/auth/oauth2/oauth2-custom-strategy.ts
diff --git a/lib/web/auth/openid/index.ts b/src/lib/web/auth/openid/index.ts
similarity index 100%
rename from lib/web/auth/openid/index.ts
rename to src/lib/web/auth/openid/index.ts
diff --git a/lib/web/auth/saml/index.ts b/src/lib/web/auth/saml/index.ts
similarity index 100%
rename from lib/web/auth/saml/index.ts
rename to src/lib/web/auth/saml/index.ts
diff --git a/lib/web/auth/twitter/index.ts b/src/lib/web/auth/twitter/index.ts
similarity index 100%
rename from lib/web/auth/twitter/index.ts
rename to src/lib/web/auth/twitter/index.ts
diff --git a/lib/web/auth/utils.ts b/src/lib/web/auth/utils.ts
similarity index 100%
rename from lib/web/auth/utils.ts
rename to src/lib/web/auth/utils.ts
diff --git a/lib/web/baseRouter.ts b/src/lib/web/baseRouter.ts
similarity index 100%
rename from lib/web/baseRouter.ts
rename to src/lib/web/baseRouter.ts
diff --git a/lib/web/historyRouter.ts b/src/lib/web/historyRouter.ts
similarity index 100%
rename from lib/web/historyRouter.ts
rename to src/lib/web/historyRouter.ts
diff --git a/lib/web/imageRouter/azure.ts b/src/lib/web/imageRouter/azure.ts
similarity index 100%
rename from lib/web/imageRouter/azure.ts
rename to src/lib/web/imageRouter/azure.ts
diff --git a/lib/web/imageRouter/filesystem.ts b/src/lib/web/imageRouter/filesystem.ts
similarity index 100%
rename from lib/web/imageRouter/filesystem.ts
rename to src/lib/web/imageRouter/filesystem.ts
diff --git a/lib/web/imageRouter/imgur.ts b/src/lib/web/imageRouter/imgur.ts
similarity index 100%
rename from lib/web/imageRouter/imgur.ts
rename to src/lib/web/imageRouter/imgur.ts
diff --git a/lib/web/imageRouter/index.ts b/src/lib/web/imageRouter/index.ts
similarity index 100%
rename from lib/web/imageRouter/index.ts
rename to src/lib/web/imageRouter/index.ts
diff --git a/lib/web/imageRouter/lutim.ts b/src/lib/web/imageRouter/lutim.ts
similarity index 100%
rename from lib/web/imageRouter/lutim.ts
rename to src/lib/web/imageRouter/lutim.ts
diff --git a/lib/web/imageRouter/minio.ts b/src/lib/web/imageRouter/minio.ts
similarity index 100%
rename from lib/web/imageRouter/minio.ts
rename to src/lib/web/imageRouter/minio.ts
diff --git a/lib/web/imageRouter/s3.ts b/src/lib/web/imageRouter/s3.ts
similarity index 100%
rename from lib/web/imageRouter/s3.ts
rename to src/lib/web/imageRouter/s3.ts
diff --git a/lib/web/index.ts b/src/lib/web/index.ts
similarity index 100%
rename from lib/web/index.ts
rename to src/lib/web/index.ts
diff --git a/lib/web/middleware/checkURIValid.ts b/src/lib/web/middleware/checkURIValid.ts
similarity index 100%
rename from lib/web/middleware/checkURIValid.ts
rename to src/lib/web/middleware/checkURIValid.ts
diff --git a/lib/web/middleware/codiMDVersion.ts b/src/lib/web/middleware/codiMDVersion.ts
similarity index 100%
rename from lib/web/middleware/codiMDVersion.ts
rename to src/lib/web/middleware/codiMDVersion.ts
diff --git a/lib/web/middleware/index.ts b/src/lib/web/middleware/index.ts
similarity index 100%
rename from lib/web/middleware/index.ts
rename to src/lib/web/middleware/index.ts
diff --git a/lib/web/middleware/redirectWithoutTrailingSlashes.ts b/src/lib/web/middleware/redirectWithoutTrailingSlashes.ts
similarity index 100%
rename from lib/web/middleware/redirectWithoutTrailingSlashes.ts
rename to src/lib/web/middleware/redirectWithoutTrailingSlashes.ts
diff --git a/lib/web/middleware/tooBusy.ts b/src/lib/web/middleware/tooBusy.ts
similarity index 100%
rename from lib/web/middleware/tooBusy.ts
rename to src/lib/web/middleware/tooBusy.ts
diff --git a/lib/web/note/actions.ts b/src/lib/web/note/actions.ts
similarity index 100%
rename from lib/web/note/actions.ts
rename to src/lib/web/note/actions.ts
diff --git a/lib/web/note/controller.ts b/src/lib/web/note/controller.ts
similarity index 100%
rename from lib/web/note/controller.ts
rename to src/lib/web/note/controller.ts
diff --git a/lib/web/note/router.ts b/src/lib/web/note/router.ts
similarity index 100%
rename from lib/web/note/router.ts
rename to src/lib/web/note/router.ts
diff --git a/lib/web/note/slide.ts b/src/lib/web/note/slide.ts
similarity index 100%
rename from lib/web/note/slide.ts
rename to src/lib/web/note/slide.ts
diff --git a/lib/web/note/util.ts b/src/lib/web/note/util.ts
similarity index 100%
rename from lib/web/note/util.ts
rename to src/lib/web/note/util.ts
diff --git a/lib/web/statusRouter.ts b/src/lib/web/statusRouter.ts
similarity index 100%
rename from lib/web/statusRouter.ts
rename to src/lib/web/statusRouter.ts
diff --git a/lib/web/userRouter.ts b/src/lib/web/userRouter.ts
similarity index 100%
rename from lib/web/userRouter.ts
rename to src/lib/web/userRouter.ts
diff --git a/lib/web/utils.ts b/src/lib/web/utils.ts
similarity index 100%
rename from lib/web/utils.ts
rename to src/lib/web/utils.ts
diff --git a/lib/workers/dmpWorker.ts b/src/lib/workers/dmpWorker.ts
similarity index 100%
rename from lib/workers/dmpWorker.ts
rename to src/lib/workers/dmpWorker.ts
diff --git a/test/auth.ts b/src/test/auth.ts
similarity index 100%
rename from test/auth.ts
rename to src/test/auth.ts
diff --git a/test/csp.js b/src/test/csp.js
similarity index 100%
rename from test/csp.js
rename to src/test/csp.js
diff --git a/test/letter-avatars.js b/src/test/letter-avatars.js
similarity index 100%
rename from test/letter-avatars.js
rename to src/test/letter-avatars.js
diff --git a/test/user.js b/src/test/user.js
similarity index 100%
rename from test/user.js
rename to src/test/user.js
diff --git a/tsconfig.json b/tsconfig.json
index 8773f510a..5bff2a5d0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,7 +12,5 @@
     "lib": ["ES2019"],
     "alwaysStrict": true
   },
-  "include": [
-    "./lib/**/*"
-  ]
+  "include":  ["src"]
 }