diff --git a/lib/server.js b/lib/server.js
index eea9552a..348f2a25 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -8,25 +8,28 @@
              '# Module is part of Cloud Commander,'             + '\n'  +
              '# easy to use web server.'                        + '\n'  +
              '# http://cloudcmd.io'                             + '\n');
-             
+    console.log(__dirname);         
     var main                = global.cloudcmd.main,
         
-        DIR                 = main.DIR,
-        URL                 = main.url,
-        Path                = main.path,
+        DIR                 = './',
+        DIR_SERVER          = DIR + 'server/',
         
-        Minify              = main.minify,
-        CloudFunc           = main.cloudfunc,
-        AppCache            = main.appcache,
-        Socket              = main.socket,
-        Console             = main.console,
-        Terminal            = main.terminal,
-        join                = main.srvrequire('join'),
+        URL                 = require('url'),
+        Path                = require('path'),
+        http                = require('http'),
+        https               = require('https'),
+        
+        Util                = require(DIR + 'util'),
+        CloudFunc           = require(DIR + 'cloudfunc'),
+        
+        Minify              = require(DIR_SERVER + 'minify'),
+        AppCache            = require(DIR_SERVER + 'appcache'),
+        Socket              = require(DIR_SERVER + 'socket'),
+        Console             = require(DIR_SERVER + 'console'),
+        Terminal            = require(DIR_SERVER + 'terminal'),
+        join                = require(DIR_SERVER + 'join'),
+        express             = require(DIR_SERVER + 'express'),
         
-        http                = main.http,
-        https               = main.https,
-        Util                = main.util,
-        express             = main.express,
         expressApp,
         emptyHandler        = function(req, res, next) { Util.exec(next); },