diff --git a/.dockerignore b/.dockerignore
index 0383cf6..5cd7648 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,4 @@
 node_modules
 npm-debug.log
 .c9/
-env*.js*
\ No newline at end of file
+env/
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 37d1ce3..6383682 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 node_modules/
 .c9/
-env*.js*
\ No newline at end of file
+env/
\ No newline at end of file
diff --git a/srv-add.js b/admin/add.js
similarity index 87%
rename from srv-add.js
rename to admin/add.js
index 7733dc3..57ff9f9 100644
--- a/srv-add.js
+++ b/admin/add.js
@@ -3,7 +3,7 @@
  * routes for intra-server peer sharing
 */
  
-const env = require(process.argv[2]||'./env.json')
+const env = require(process.argv[2]||'../env/env.json')
 const fs = require('fs').promises
 
 module.exports = async (req, res) => {
diff --git a/srv-del.js b/admin/del.js
similarity index 84%
rename from srv-del.js
rename to admin/del.js
index 67e9e17..95458e9 100644
--- a/srv-del.js
+++ b/admin/del.js
@@ -3,7 +3,7 @@
  * routes for intra-server peer sharing
 */
  
-const env = require('./env.json')
+const env = require('../env/env.json')
 const fs = require('fs').promises
 
 module.exports = async (req, res) => {
diff --git a/add.js b/app/add.js
similarity index 98%
rename from add.js
rename to app/add.js
index 7bb1013..5ae3dc0 100644
--- a/add.js
+++ b/app/add.js
@@ -3,9 +3,9 @@
  * route for a client to add a peer
 */
 
-const env = require(process.argv[2]||'./env.json')
+const env = require(process.argv[2]||'../env/env.json')
 const fs = require('fs').promises
-const wg = require('./wireguard')
+const wg = require('../includes/wireguard')
 const https = require('https')
 // Construct axios in IIFE for async/await
 let axios; (async()=>{
diff --git a/del.js b/app/del.js
similarity index 89%
rename from del.js
rename to app/del.js
index 6a8af43..c273d09 100644
--- a/del.js
+++ b/app/del.js
@@ -4,7 +4,7 @@
 */
 
 const fs = require('fs').promises
-const env = require('./env.json')
+const env = require('../env/env.json')
 
 module.exports = async (req, res) => {
 	const privkey = req.query['del']
diff --git a/middleware.js b/includes/middleware.js
similarity index 95%
rename from middleware.js
rename to includes/middleware.js
index 5149516..5bebcc6 100644
--- a/middleware.js
+++ b/includes/middleware.js
@@ -1,5 +1,5 @@
 'use strict'
-const env = require(process.argv[2]||'./env.json')
+const env = require(process.argv[2]||'../env/env.json')
 
 // Get DNS Servers in a string for peer configs
 let DNS_SERVERS = []
diff --git a/wireguard.js b/includes/wireguard.js
similarity index 100%
rename from wireguard.js
rename to includes/wireguard.js
diff --git a/index.js b/index.js
index 5383435..b2abaea 100644
--- a/index.js
+++ b/index.js
@@ -3,22 +3,22 @@
  * Entrypoint and server listener
 */
 
-const env = require(process.argv[2]||'./env.json')
-const mw = require('./middleware.js')
+const env = require(process.argv[2]||'./env/env.json')
+const mw = require('./includes/middleware.js')
 const express = require('express')
 const app = express()
 const admin = express()
 
 app
 	.use(mw.getRequester)
-	.get('/add', mw.getDnsServers, require('./add.js'))
-	.get('/del', require('./del.js'))
+	.get('/add', mw.getDnsServers, require('./app/add.js'))
+	.get('/del', require('./app/del.js'))
 	.listen(env.PORT)
 admin
 	.use(mw.getAdminRequester)
 	.use(mw.allowServers)
 	.use(express.text())
-	.post('/add', require('./srv-add.js'))
-	.post('/del', require('./srv-del.js'))
+	.post('/add', require('./admin/add.js'))
+	.post('/del', require('./admin/del.js'))
 	.listen(env.ADMIN_PORT)
 console.log('Server started')