diff --git a/server/app.js b/server/app.js
index 3a6a0458..c7d45bcc 100644
--- a/server/app.js
+++ b/server/app.js
@@ -1,7 +1,7 @@
 var cluster = require('cluster'),
     net = require('net'),
     path = require('path'),
-    publicPath = path.join(__dirname, 'public'),
+    //publicPath = path.join(__dirname, 'public'),
     http = require('http'),
     port = 8080,
     num_processes = require('os').cpus().length,
@@ -9,6 +9,9 @@ var cluster = require('cluster'),
     vhost = require('vhost'),
     app = express();
 
+publicPath = path.join(__dirname, 'public');
+pathThumbnails = __dirname;
+
 try {
     var redis = require("redis");
     var client = redis.createClient({host: "localhost", port: 6379});
@@ -57,7 +60,7 @@ function startClustered(redis_enabled) {
 
 function startSingle(clustered, redis_enabled) {
     var server;
-    var client = require('./client.js');
+    var client = require('./apps/client.js');
     try {
         var cert_config = require(path.join(path.join(__dirname, 'config'), 'cert_config.js'));
         var fs = require('fs');
@@ -136,8 +139,8 @@ function onListen() {
 }
 
 function routingFunction(req, res, next) {
-    var client = require('./client.js');
-    var admin = require('./admin.js');
+    var client = require('./apps/client.js');
+    var admin = require('./apps/admin.js');
     var url = req.headers['x-forwarded-host'] ? req.headers['x-forwarded-host'] : req.headers.host.split(":")[0];
     var subdomain = req.headers['x-forwarded-host'] ? req.headers['x-forwarded-host'].split(".") : req.headers.host.split(":")[0].split(".");
 
diff --git a/server/admin.js b/server/apps/admin.js
similarity index 96%
rename from server/admin.js
rename to server/apps/admin.js
index 41be76b4..ea2f3851 100644
--- a/server/admin.js
+++ b/server/apps/admin.js
@@ -2,7 +2,7 @@ var express = require('express');
 var app = express();
 
 const path = require('path');
-const publicPath = path.join(__dirname, 'public');
+const publicPath = path.join(__dirname + "", '../public');
 var exphbs = require('express-handlebars');
 var hbs = exphbs.create({
    defaultLayout: publicPath + '/layouts/admin/main',
@@ -14,16 +14,16 @@ var passport = require('passport');
 var mpromise = require('mpromise');
 var LocalStrategy = require('passport-local').Strategy;
 var mongoose = require('mongoose');
-var mongo_db_cred = require(path.join(__dirname, './config/mongo_config.js'));
+var mongo_db_cred = require(pathThumbnails + '/config/mongo_config.js');
 var mongojs = require('mongojs');
 var db = mongojs(mongo_db_cred.config);
 var token_db = mongojs("tokens");
 var bodyParser = require('body-parser');
 var Cookies = require('cookies');
 var session = require('express-session');
-var api = require('./routing/admin/api.js');
+var api = require(pathThumbnails + '/routing/admin/api.js');
 
-var User = require('./models/user.js');
+var User = require(pathThumbnails + '/models/user.js');
 var url = 'mongodb://localhost/users';
 mongoose.connect(url);
 
diff --git a/server/client.js b/server/apps/client.js
similarity index 77%
rename from server/client.js
rename to server/apps/client.js
index 5471d0b6..6cb7aa30 100755
--- a/server/client.js
+++ b/server/apps/client.js
@@ -1,9 +1,7 @@
-VERSION = require('./VERSION.js');
+VERSION = require(pathThumbnails + '/VERSION.js');
 
 var add = "";
 var path = require('path');
-var publicPath = path.join(__dirname, 'public');
-pathThumbnails = __dirname;
 var express = require('express');
 var app = express();
 var exphbs = require('express-handlebars');
@@ -35,8 +33,8 @@ io = require('socket.io')({
 	//path: '/zoff',
 	//"origins": ("https://zoff.me:443*,https://zoff.me:8080*,zoff.me:8080*,https://remote.zoff.me:443*,https://remote.zoff.me:8080*,https://fb.zoff.me:443*,https://fb.zoff.me:8080*,https://admin.zoff.me:443*,https://admin.zoff.me:8080*, http://localhost:8080*")});
 });
-db = require('./handlers/db.js');
-var socketIO = require('./handlers/io.js');
+db = require(pathThumbnails + '/handlers/db.js');
+var socketIO = require(pathThumbnails +'/handlers/io.js');
 socketIO();
 
 app.socketIO = io;
@@ -44,15 +42,15 @@ app.socketIO = io;
 request = require('request');
 
 /* Globally needed "libraries" and files */
-Functions = require('./handlers/functions.js');
-ListChange = require('./handlers/list_change.js');
-Chat = require('./handlers/chat.js');
-List = require('./handlers/list.js');
-Suggestions = require('./handlers/suggestions.js');
-ListSettings = require('./handlers/list_settings.js');
-Frontpage = require('./handlers/frontpage.js');
-Notifications = require('./handlers/notifications.js');
-Search = require('./handlers/search.js');
+Functions = require(pathThumbnails + '/handlers/functions.js');
+ListChange = require(pathThumbnails + '/handlers/list_change.js');
+Chat = require(pathThumbnails + '/handlers/chat.js');
+List = require(pathThumbnails + '/handlers/list.js');
+Suggestions = require(pathThumbnails + '/handlers/suggestions.js');
+ListSettings = require(pathThumbnails + '/handlers/list_settings.js');
+Frontpage = require(pathThumbnails + '/handlers/frontpage.js');
+Notifications = require(pathThumbnails + '/handlers/notifications.js');
+Search = require(pathThumbnails + '/handlers/search.js');
 crypto = require('crypto');
 node_cryptojs = require('node-cryptojs-aes');
 CryptoJS = node_cryptojs.CryptoJS;
@@ -60,9 +58,9 @@ emojiStrip = require('emoji-strip');
 Filter = require('bad-words');
 filter = new Filter({ placeHolder: 'x'});
 
-var router = require('./routing/client/router.js');
-var api = require('./routing/client/api.js');
-var ico_router = require('./routing/client/icons_routing.js');
+var router = require(pathThumbnails + '/routing/client/router.js');
+var api = require(pathThumbnails + '/routing/client/api.js');
+var ico_router = require(pathThumbnails + '/routing/client/icons_routing.js');
 
 app.get('/robots.txt', function (req, res) {
 	res.type('text/plain');