diff --git a/api/src/index.js b/api/src/index.js
index a2b5265..5be8b75 100644
--- a/api/src/index.js
+++ b/api/src/index.js
@@ -1,5 +1,5 @@
 const express = require('express');
-const { execute } = require('../../shared/execute');
+const { execute } = require('../../lxc/execute.js');
 const { languages } = require('./languages');
 const { checkSchema, validationResult } = require('express-validator');
 
diff --git a/api/src/languages.js b/api/src/languages.js
index 4bdd0fc..6ac2f14 100644
--- a/api/src/languages.js
+++ b/api/src/languages.js
@@ -1,8 +1,8 @@
 const { spawn } = require('child_process');
-const languages = require('../../shared/languages.json');
+const languages = require('../../config/languages.json');
 
 {
-    const process = spawn(__dirname + '/../../lxc/versions');
+    const process = spawn(__dirname + '/../../lxc/util/versions');
 
     let output = '';
     process.stderr.on('data', chunk => output += chunk);
diff --git a/cli/execute b/cli/execute
index a8dc72c..6fdfdd3 100755
--- a/cli/execute
+++ b/cli/execute
@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-const { execute } = require('../shared/execute');
+const { execute } = require('../lxc/execute.js');
 const { readFileSync } = require('fs');
-const languages = require('../shared/languages.json');
+const languages = require('../config/languages.json');
 
 const [languageName, sourceFile, ...args] = process.argv.slice(2);
 
@@ -11,7 +11,7 @@ const [languageName, sourceFile, ...args] = process.argv.slice(2);
         console.error('Provide a language name');
         return;
     }
-    
+
     if (!sourceFile) {
         console.error('Provide a source file');
         return;
diff --git a/shared/languages.json b/config/languages.json
similarity index 100%
rename from shared/languages.json
rename to config/languages.json
diff --git a/shared/execute.js b/lxc/execute.js
similarity index 96%
rename from shared/execute.js
rename to lxc/execute.js
index c8b8635..fc9fb8b 100644
--- a/shared/execute.js
+++ b/lxc/execute.js
@@ -13,7 +13,7 @@ function execute(language, source, stdin = '', args = []) {
         writeFileSync(`${LXC_ROOT}/tmp/${id}/stdin.stdin`, stdin);
         writeFileSync(`${LXC_ROOT}/tmp/${id}/args.args`, args.join('\n'));
 
-        const process = spawn(__dirname + '/../lxc/execute', [
+        const process = spawn(__dirname + '/execute', [
             language.name,
             id,
         ]);
diff --git a/lxc/test_all_lxc b/lxc/tests/_run
similarity index 99%
rename from lxc/test_all_lxc
rename to lxc/tests/_run
index eac050e..c495742 100755
--- a/lxc/test_all_lxc
+++ b/lxc/tests/_run
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-cd tests
 
 echo -n 'testing awk = '
 ../../cli/execute awk awk.awk
diff --git a/lxc/disable_network b/lxc/util/disable_network
similarity index 100%
rename from lxc/disable_network
rename to lxc/util/disable_network
diff --git a/lxc/enable_network b/lxc/util/enable_network
similarity index 100%
rename from lxc/enable_network
rename to lxc/util/enable_network
diff --git a/lxc/versions b/lxc/util/versions
similarity index 100%
rename from lxc/versions
rename to lxc/util/versions