diff --git a/config/.gitignore b/shared/config/.gitignore
similarity index 100%
rename from config/.gitignore
rename to shared/config/.gitignore
diff --git a/config/package-lock.json b/shared/config/package-lock.json
similarity index 100%
rename from config/package-lock.json
rename to shared/config/package-lock.json
diff --git a/config/package.json b/shared/config/package.json
similarity index 95%
rename from config/package.json
rename to shared/config/package.json
index 2bc18ee..00b3ddd 100644
--- a/config/package.json
+++ b/shared/config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "config",
   "version": "1.0.0",
-  "main": "main.js",
+  "main": "src/main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
diff --git a/config/main.js b/shared/config/src/main.js
similarity index 67%
rename from config/main.js
rename to shared/config/src/main.js
index 753eba9..ad5bc0e 100644
--- a/config/main.js
+++ b/shared/config/src/main.js
@@ -2,9 +2,7 @@ const fs = require('fs');
 const yaml = require('yaml');
 
 const config = () => {
-    try {
-        fs.readFileSync('../config.yaml', 'utf-8');
-    } catch { return }
+    if (!fs.existsSync('../config.yaml')) return;
 
     return yaml.parse(fs.readFileSync('../config.yaml', 'utf-8'));
 }
diff --git a/database/.gitignore b/shared/database/.gitignore
similarity index 100%
rename from database/.gitignore
rename to shared/database/.gitignore
diff --git a/database/data/schema.sql b/shared/database/data/schema.sql
similarity index 100%
rename from database/data/schema.sql
rename to shared/database/data/schema.sql
diff --git a/database/package-lock.json b/shared/database/package-lock.json
similarity index 100%
rename from database/package-lock.json
rename to shared/database/package-lock.json
diff --git a/database/package.json b/shared/database/package.json
similarity index 94%
rename from database/package.json
rename to shared/database/package.json
index 63effb2..cf7e4af 100644
--- a/database/package.json
+++ b/shared/database/package.json
@@ -1,7 +1,7 @@
 {
   "name": "database",
   "version": "1.0.0",
-  "main": "postgresql.js",
+  "main": "src/postgresql.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
diff --git a/database/main.js b/shared/database/src/main.js
similarity index 97%
rename from database/main.js
rename to shared/database/src/main.js
index 373138b..e82ab5d 100644
--- a/database/main.js
+++ b/shared/database/src/main.js
@@ -1,5 +1,5 @@
 const pool = require('./postgresql.js');
-const logger = require('../logger/main.js');
+const logger = require('../../logger/src/main.js');
 
 /**
  * Getting the currency exchange rate for a specific day
diff --git a/database/postgresql.js b/shared/database/src/postgresql.js
similarity index 84%
rename from database/postgresql.js
rename to shared/database/src/postgresql.js
index 0c174eb..d928aba 100644
--- a/database/postgresql.js
+++ b/shared/database/src/postgresql.js
@@ -1,5 +1,5 @@
 const pg = require("pg");
-const config = require("../config/main.js")();
+const config = require("../../config/src/main.js")();
 
 const pool = new pg.Pool({
     user:  config['database']['user'],
diff --git a/logger/.gitignore b/shared/logger/.gitignore
similarity index 100%
rename from logger/.gitignore
rename to shared/logger/.gitignore
diff --git a/logger/package-lock.json b/shared/logger/package-lock.json
similarity index 100%
rename from logger/package-lock.json
rename to shared/logger/package-lock.json
diff --git a/logger/package.json b/shared/logger/package.json
similarity index 95%
rename from logger/package.json
rename to shared/logger/package.json
index 5951da3..cdc14d7 100644
--- a/logger/package.json
+++ b/shared/logger/package.json
@@ -1,7 +1,7 @@
 {
   "name": "logger",
   "version": "1.0.0",
-  "main": "main.js",
+  "main": "src/main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
diff --git a/logger/main.js b/shared/logger/src/main.js
similarity index 96%
rename from logger/main.js
rename to shared/logger/src/main.js
index cddb032..0d30a70 100644
--- a/logger/main.js
+++ b/shared/logger/src/main.js
@@ -1,7 +1,7 @@
 const pino = require('pino');
 const pretty = require('pino-pretty');
 const path = require('path');
-const config = require('../config/main.js')();
+const config = require('../../config/src/main.js')();
 
 function getCallerFile() {
     const originalFunc = Error.prepareStackTrace;