diff --git a/lib/server/auth.js b/lib/server/auth.js
index 93008f71..b816ea3e 100644
--- a/lib/server/auth.js
+++ b/lib/server/auth.js
@@ -1,14 +1,16 @@
 /* https://github.com/prose/gatekeeper */
 
-var https           = require('https'),
-    qs              = require('querystring'),
+var DIR             = process.cwd() + '/',
+    main            = require(DIR + 'lib/server/main.js'),
+    LIBDIR          = main.LIBDIR,
+    SRVDIR          = main.SRVDIR,
     
-    DIR             = process.cwd() + '/',
-    LIBDIR          = DIR + 'lib/',
-    SRVDIR          = LIBDIR + 'server/',
+    https           = main.https,
+    qs              = main.querystring,
+        
+    Config          = main.config,
     
     srvfunc         = require(SRVDIR + 'srvfunc'),
-    Config          = srvfunc.require(DIR + 'config'),
     Util            = srvfunc.require(LIBDIR + 'util'),
     
     GithubAuth      = {
@@ -18,7 +20,6 @@ var https           = require('https'),
         method: "POST"
     };
 
-
 /**
  * function do authentication
  * @param pCode
diff --git a/lib/server/main.js b/lib/server/main.js
index c7184834..8b5e5c13 100644
--- a/lib/server/main.js
+++ b/lib/server/main.js
@@ -13,6 +13,9 @@ exports.fs                  = require('fs'),
 exports.querystring         = require('querystring'),
 exports.child_process       = require('child_process'),
 exports.https               = require('https'),
+exports.config              = srvfunc.require(DIR + 'config');
+exports.mainpackage         = srvfunc.require(DIR + 'package');
+
 exports.zlib                = srvfunc.require('zlib'), 
 exports.cloudfunc           = srvfunc.require(LIBDIR    + 'cloudfunc'),
 exports.util                = srvfunc.require(LIBDIR    + 'util'),
@@ -20,7 +23,4 @@ exports.update              = srvfunc.require(SRVDIR    + 'update'),
 exports.appcache            = srvfunc.require(SRVDIR    + 'appcache'),
 exports.auth                = srvfunc.require(SRVDIR    + 'auth'),
 exports.socket              = srvfunc.require(SRVDIR    + 'socket'),
-exports.object              = srvfunc.require(SRVDIR    + 'object'),
-
-exports.config              = srvfunc.require(DIR + 'config');
-exports.mainpackage         = srvfunc.require(DIR + 'package');
\ No newline at end of file
+exports.object              = srvfunc.require(SRVDIR    + 'object')
\ No newline at end of file
diff --git a/lib/server/socket.js b/lib/server/socket.js
index c8ef8d69..6d8d58f4 100644
--- a/lib/server/socket.js
+++ b/lib/server/socket.js
@@ -4,11 +4,11 @@ var DIR             = process.cwd() + '/',
     main            = require(DIR + 'lib/server/main.js'),
     SRVDIR          = main.SRVDIR,
     
-    srvfunc         = main.srvfunc,
+    srvfunc         = require(SRVDIR + 'srvfunc'),
     
     io              = srvfunc.require('socket.io'),
+    update          = srvfunc.require(SRVDIR + 'update'),
     exec            = main.child_process.exec,
-    update          = main.update,
     
     ClientFuncs     = [],
     OnMessageFuncs  = [],