diff --git a/Makefile b/Makefile
index ba84005da40704b16d35b6a5a9b2da23ad25192b..7f4fe4741711b3746785d4b703c56e70955224fc 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,6 @@ debug:
 	$(YARN) test --no-sandbox
 
 style:
-	$(YARN) prettier --write instance common style client test main.js >/dev/null
+	$(YARN) prettier --write instance style client test main.js >/dev/null
 
 .PHONY: test debug run prepare style
diff --git a/client/main.js b/client/main.js
index ab07310d81e38da80f1b8d2aa85fc4decbfafb15..f80a39e4ffd67b6e4f395e4776e50d1e6976ac10 100644
--- a/client/main.js
+++ b/client/main.js
@@ -1,5 +1,5 @@
 const rootDirectory = `${__dirname}/..`;
-const logger = require(rootDirectory + '/common/logger.js');
+const logger = require(rootDirectory + '/instance/lib/logger.js');
 const express = require('express');
 const packageConfig = require(rootDirectory + '/package.json').config;
 
diff --git a/instance/index.js b/instance/index.js
index 613dc78194d624e84dce15c72eeeefc58c165dd4..83d17173cd5d632473ba8096336c84777ec93b95 100644
--- a/instance/index.js
+++ b/instance/index.js
@@ -1,7 +1,7 @@
 /* The main window instance */
 
 const { ipcRenderer } = require('electron'),
-    logger = require('../common/logger.js'),
+    logger = require('./lib/logger.js'),
     ejs = require('ejs'),
     e = require('express');
 
diff --git a/common/.gitkeep b/instance/lib/.gitkeep
similarity index 100%
rename from common/.gitkeep
rename to instance/lib/.gitkeep
diff --git a/common/config.js b/instance/lib/config.js
similarity index 96%
rename from common/config.js
rename to instance/lib/config.js
index 6583fa42b18ba7ad0b8f5092676d62e22c7a450e..bfbc6afd724887bcc0552d6c9812ba1df594ac08 100644
--- a/common/config.js
+++ b/instance/lib/config.js
@@ -2,7 +2,7 @@ const ini = require('ini'),
     os = require('os'),
     fs = require('fs');
 
-const packageConfig = require('../package.json').config;
+const packageConfig = require('../../package.json').config;
 
 const __configDir = `${os.homedir()}/.config/lektor`;
 const __configFile = `${__configDir}/amadeus.ini`;
diff --git a/common/db.js b/instance/lib/db.js
similarity index 98%
rename from common/db.js
rename to instance/lib/db.js
index 0f608fbd00d8cc0d4b2ee7e601aa76000732832b..dd06166ac7715ceb33f6a1087715a4d85738ca35 100644
--- a/common/db.js
+++ b/instance/lib/db.js
@@ -1,5 +1,5 @@
-const logger = require.main.require('./common/logger.js');
-const config = require.main.require('./common/config.js');
+const logger = require('./logger.js');
+const config = require('./config.js');
 var sqlite3 = require.main.require('sqlite3').verbose();
 
 /* The kara table is defined as follows:
diff --git a/common/isRunning.js b/instance/lib/isRunning.js
similarity index 100%
rename from common/isRunning.js
rename to instance/lib/isRunning.js
diff --git a/common/lkt.js b/instance/lib/lkt.js
similarity index 99%
rename from common/lkt.js
rename to instance/lib/lkt.js
index 5f58ad1575d7979e5185b360a5a15b9e3151efb4..52ca9ba34966f4af98fd084ba015031c3e51c095 100644
--- a/common/lkt.js
+++ b/instance/lib/lkt.js
@@ -1,8 +1,8 @@
-const logger = require.main.require('./common/logger.js'),
+const logger = require('./logger.js'),
     net = require('net'),
     { finished } = require('stream'),
     { cli } = require('winston/lib/winston/config');
-var config = require.main.require('./common/config.js');
+var config = require('./config.js');
 
 class LktClient {
     /***************************************
diff --git a/common/logger.js b/instance/lib/logger.js
similarity index 98%
rename from common/logger.js
rename to instance/lib/logger.js
index de288aa5035e789a37d77005e137818cfeea15e5..33bba9ff727f273fb56fd0df7445e2d3f6df16f5 100644
--- a/common/logger.js
+++ b/instance/lib/logger.js
@@ -1,6 +1,6 @@
 /* To use this logger, just require the file and use the logger as follows:
  * <code>
- * const logger = require('./common/logger.js');
+ * const logger = require('./instance/lib/logger.js');
  * logger.log('info', 'This is an information message.');
  * logger.log('debug', 'This is an information message.');
  * logger.log('warn', 'This is an information message.');
diff --git a/instance/log.js b/instance/log.js
index 1663bba4baeaec0df20ff83c845aa57dbd08b004..8d7c1e1bff44b4cad3e33920252e1e422ae31e1e 100644
--- a/instance/log.js
+++ b/instance/log.js
@@ -1,7 +1,7 @@
 /* The log window */
 
 const { ipcRenderer } = require('electron'),
-    logger = require('../common/logger.js'),
+    logger = require('./lib/logger.js'),
     ejs = require('ejs'),
     e = require('express'),
     fs = require('fs'),
diff --git a/main.js b/main.js
index e9f03def1d1f8425b6c5e7bb6ab3981d89be7455..43a11b74a92c7e2f01f7e180a3dfb5cc0d2c5781 100644
--- a/main.js
+++ b/main.js
@@ -1,10 +1,10 @@
-const logger = require.main.require('./common/logger.js'),
+const logger = require.main.require('./instance/lib/logger.js'),
     electron = require('electron'),
     { app, BrowserWindow, globalShortcut, ipcMain } = require('electron'),
     { fork, spawn } = require('child_process'),
     fs = require('fs'),
-    lkt = require.main.require('./common/lkt.js'),
-    isRunning = require('./common/isRunning.js');
+    lkt = require.main.require('./instance/lib/lkt.js'),
+    isRunning = require('./instance/lib/isRunning.js');
 
 let electronEjs = require('electron-ejs');
 let ejs = new electronEjs({ app: 'Amadeus' }, {});
@@ -12,8 +12,8 @@ let ejs = new electronEjs({ app: 'Amadeus' }, {});
 const packageConfig = require('./package.json').config;
 logger.debug('main', 'Package config is ' + JSON.stringify(packageConfig));
 
-var config = require('./common/config.js');
-var db = require.main.require('./common/db.js');
+var config = require('./instance/lib/config.js');
+var db = require.main.require('./instance/lib/db.js');
 var Tail = require('tail').Tail;
 
 var client; /* Sub process for the express server */
diff --git a/test/test_db.js b/test/test_db.js
index 36094fa67c790738100a9a3a851ae052ae052a41..326fd1df6f61958c59489b85bce6e8ab5e40c2b4 100644
--- a/test/test_db.js
+++ b/test/test_db.js
@@ -1,5 +1,5 @@
-const logger       = require.main.require('./common/logger.js');
-const KaraDatabase = require.main.require('./common/db.js');
+const logger       = require.main.require('./instance/lib/logger.js');
+const KaraDatabase = require.main.require('./instance/lib/db.js');
 
 var myDb = new KaraDatabase("/home/kara/kara.db");
 
diff --git a/test/test_lkt.js b/test/test_lkt.js
index 98a08aca49ecbc453ceda28ab04a905cd0f23261..461783f1b4b75a1f7ad1fe074c70819bfb5843ff 100644
--- a/test/test_lkt.js
+++ b/test/test_lkt.js
@@ -1,5 +1,5 @@
-const logger = require.main.require('./common/logger.js');
-const lkt    = require.main.require('./common/lkt.js');
+const logger = require.main.require('./instance/lib/logger.js');
+const lkt    = require.main.require('./instance/lib/lkt.js');
 
 lkt
     .commandStatus()