diff --git a/lib/server/auth.js b/lib/server/auth.js
index 4678ff89..61573a4d 100644
--- a/lib/server/auth.js
+++ b/lib/server/auth.js
@@ -17,13 +17,14 @@
     var main        = global.cloudcmd.main,
         
         DIR         = './',
+        DIR_LIB     = DIR + '../',
         
-        https       = main.https,
-        qs          = main.querystring,
+        https       = require('https'),
+        qs          = require('querystring'),
         pipe        = require(DIR + 'pipe'),
             
         Modules     = main.modules,
-        Util        = main.util,
+        Util        = require(DIR_LIB + 'util'),
         
         GithubAuth      = {
             host: 'github.com',
diff --git a/lib/server/main.js b/lib/server/main.js
index 76476886..05b7e12c 100644
--- a/lib/server/main.js
+++ b/lib/server/main.js
@@ -10,7 +10,7 @@
         
         SLASH,
         ext,
-        path, zlib, url, CloudFunc, diffPatch, querystring,
+        path, zlib, url, CloudFunc, diffPatch,
         
         Config = {
             server  : true,
@@ -20,11 +20,8 @@
     
     /* Native Modules*/
     exports.child_process                   = require('child_process'),
-    exports.http                            = require('http'),
-    exports.https                           = require('https'),
     exports.path        = path              = require('path'),
     exports.url         = url               = require('url'),
-    exports.querystring = querystring       = require('querystring'),
     
     /* Constants */
     exports.SLASH       = SLASH             = '/',