diff --git a/README.md b/README.md
index ce8abb3..f7ad544 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ You can install it in the following ways:
 - download the latest release from the **"Releases"** section here
 ```bash
 tar -xzf jilo-web_*.tgz
-cd jilo-web
+cd jilo-web/doc/
 ./install.sh
 ```
 - clone the **git repo**:
@@ -66,7 +66,7 @@ cd jilo-web
 - "sqlite_file" is the sqlite db file for jilo-web itself, it goes to `app/jilo-web.db`, create it with
 ```bash
 cd app
-cat doc/jilo-web.schema | sqlite3 jilo-web.db
+cat ../doc/jilo-web.schema | sqlite3 jilo-web.db
 ```
 - "jilo_database" is the sqlite db file for jilo, with data from the Jitsi logs
 
diff --git a/app/config/jilo-web.conf.php b/app/config/jilo-web.conf.php
index ffedbbb..2f008df 100644
--- a/app/config/jilo-web.conf.php
+++ b/app/config/jilo-web.conf.php
@@ -1,6 +1,6 @@
 <?php
 
-$config = [
+return [
     // edit to customize
     'domain'			=> 'localhost',			// domain for the web app
     'folder'			=> '/jilo-web/',		// subfolder for the web app, if any
@@ -10,8 +10,10 @@ $config = [
     'login_message'		=> '',				// will be displayed on login screen
 
     // edit only if needed for tests or debugging
-    'db_type'			=> 'sqlite',			// DB type for the web app, currently only "sqlite" is used
-    'sqlite_file'		=> '../app/jilo-web.db',	// default is ../app/jilo-web.db
+    'db' => [
+        'db_type'		=> 'sqlite',			// DB type for the web app, currently only "sqlite" is used
+        'sqlite_file'		=> '../app/jilo-web.db',	// default is ../app/jilo-web.db
+    ],
     'version'			=> '0.1.1',			// system info
 ];
 
diff --git a/app/helpers/database.php b/app/helpers/database.php
index b382134..7d7ac9f 100644
--- a/app/helpers/database.php
+++ b/app/helpers/database.php
@@ -18,11 +18,11 @@ function connectDB($config, $database = '') {
     } else {
 
         // sqlite database file
-        if ($config['db_type'] === 'sqlite') {
+        if ($config['db']['db_type'] === 'sqlite') {
             try {
                 $db = new Database([
-                    'type'	=> $config['db_type'],
-                    'dbFile'	=> $config['sqlite_file'],
+                    'type'	=> $config['db']['db_type'],
+                    'dbFile'	=> $config['db']['sqlite_file'],
                 ]);
                 $pdo = $db->getConnection();
             } catch (Exception $e) {
@@ -31,15 +31,15 @@ function connectDB($config, $database = '') {
                 exit();
             }
         // mysql/mariadb database
-        } elseif ($config['db_type'] === 'mysql' || $config['db_type'] === 'mariadb') {
+        } elseif ($config['db']['db_type'] === 'mysql' || $config['db']['db_type'] === 'mariadb') {
             try {
                 $db = new Database([
-                    'type'	=> $config['db_type'],
-                    'host'	=> $config['sql_host'] ?? 'localhost',
-                    'port'	=> $config['sql_port'] ?? '3306',
-                    'dbname'	=> $config['sql_database'],
-                    'user'	=> $config['sql_username'],
-                    'password'	=> $config['sql_password'],
+                    'type'	=> $config['db']['db_type'],
+                    'host'	=> $config['db']['sql_host'] ?? 'localhost',
+                    'port'	=> $config['db']['sql_port'] ?? '3306',
+                    'dbname'	=> $config['db']['sql_database'],
+                    'user'	=> $config['db']['sql_username'],
+                    'password'	=> $config['db']['sql_password'],
                 ]);
                 $pdo = $db->getConnection();
             } catch (Exception $e) {
@@ -49,7 +49,7 @@ function connectDB($config, $database = '') {
             }
         // unknown database
         } else {
-            $error = "Error: unknow database type \"{$config['db_type']}\"";
+            $error = "Error: unknow database type \"{$config['db']['db_type']}\"";
             include '../app/templates/block-message.php';
             exit();
         }
diff --git a/app/doc/config.apache b/doc/config.apache
similarity index 100%
rename from app/doc/config.apache
rename to doc/config.apache
diff --git a/app/doc/config.nginx b/doc/config.nginx
similarity index 100%
rename from app/doc/config.nginx
rename to doc/config.nginx
diff --git a/app/doc/install.sh b/doc/install.sh
similarity index 100%
rename from app/doc/install.sh
rename to doc/install.sh
diff --git a/app/doc/jilo-web.schema b/doc/jilo-web.schema
similarity index 100%
rename from app/doc/jilo-web.schema
rename to doc/jilo-web.schema
diff --git a/app/packaging/build-deb b/doc/packaging/build-deb
similarity index 100%
rename from app/packaging/build-deb
rename to doc/packaging/build-deb
diff --git a/app/packaging/build-rpm b/doc/packaging/build-rpm
similarity index 100%
rename from app/packaging/build-rpm
rename to doc/packaging/build-rpm
diff --git a/app/packaging/deb-README.debian b/doc/packaging/deb-README.debian
similarity index 100%
rename from app/packaging/deb-README.debian
rename to doc/packaging/deb-README.debian
diff --git a/app/packaging/deb-config b/doc/packaging/deb-config
similarity index 100%
rename from app/packaging/deb-config
rename to doc/packaging/deb-config
diff --git a/app/packaging/deb-control b/doc/packaging/deb-control
similarity index 100%
rename from app/packaging/deb-control
rename to doc/packaging/deb-control
diff --git a/app/packaging/deb-postinst b/doc/packaging/deb-postinst
similarity index 100%
rename from app/packaging/deb-postinst
rename to doc/packaging/deb-postinst
diff --git a/app/packaging/deb-postrm b/doc/packaging/deb-postrm
similarity index 100%
rename from app/packaging/deb-postrm
rename to doc/packaging/deb-postrm
diff --git a/app/packaging/deb-templates b/doc/packaging/deb-templates
similarity index 100%
rename from app/packaging/deb-templates
rename to doc/packaging/deb-templates
diff --git a/app/packaging/man-jilo-web.8 b/doc/packaging/man-jilo-web.8
similarity index 100%
rename from app/packaging/man-jilo-web.8
rename to doc/packaging/man-jilo-web.8
diff --git a/app/packaging/rpm-jilo-web.spec b/doc/packaging/rpm-jilo-web.spec
similarity index 100%
rename from app/packaging/rpm-jilo-web.spec
rename to doc/packaging/rpm-jilo-web.spec
diff --git a/public_html/index.php b/public_html/index.php
index d53a37d..31ab2e3 100644
--- a/public_html/index.php
+++ b/public_html/index.php
@@ -48,7 +48,7 @@ foreach ($config_file_locations as $location) {
 }
 // if found, use it
 if ($config_file) {
-    require_once $config_file;
+    $config = require $config_file;
 } else {
     die('Config file not found');
 }