diff --git a/cloudcmd.js b/cloudcmd.js
index 14681c99..5d17b1cb 100644
--- a/cloudcmd.js
+++ b/cloudcmd.js
@@ -1,8 +1,10 @@
 (function(){
     "use strict";
     
-    var DIR         = process.cwd() + '/',
-        main        = require(DIR + 'lib/server/main'),
+    global.cloudcmd = {};
+    
+    var DIR         = __dirname     + '/',
+        main        = require(DIR   + 'lib/server/main'),
         
         LIBDIR      = main.LIBDIR,
         SRVDIR      = main.SRVDIR,
diff --git a/lib/server/appcache.js b/lib/server/appcache.js
index 1f02ce99..14451f1d 100644
--- a/lib/server/appcache.js
+++ b/lib/server/appcache.js
@@ -3,7 +3,7 @@
     "use strict";
     
     var DIR         = process.cwd() + '/',
-        main        = require(DIR + './lib/server/main'),
+        main        = require(DIR   + 'lib/server/main'),
         fs          = main.fs,
         Util        = main.util,
     
diff --git a/lib/server/auth.js b/lib/server/auth.js
index 025e9ee6..2c533ddd 100644
--- a/lib/server/auth.js
+++ b/lib/server/auth.js
@@ -2,15 +2,14 @@
 (function(){
     "use strict";
         
-    var DIR             = process.cwd() + '/',
-        main            = require(DIR + 'lib/server/main'),
+    var DIR         = process.cwd() + '/',
+        main        = require(DIR   + 'lib/server/main'),
         
-        https           = main.https,
-        qs              = main.querystring,
+        https       = main.https,
+        qs          = main.querystring,
             
-        Config          = main.config,
-        
-        Util            = main.util,
+        Config      = main.config,        
+        Util        = main.util,
         
         GithubAuth      = {
             host: "github.com",
diff --git a/lib/server/cache.js b/lib/server/cache.js
index 7bf5ffe2..94d100b6 100644
--- a/lib/server/cache.js
+++ b/lib/server/cache.js
@@ -2,7 +2,7 @@
     "use strict";
     
     var DIR         = process.cwd() + '/',
-        main        = require(DIR + 'lib/server/main.js'),
+        main        = require(DIR   + 'lib/server/main'),
         SRVDIR      = main.SRVDIR;
     
     /* 
diff --git a/lib/server/main.js b/lib/server/main.js
index fbf30bc5..788a1555 100644
--- a/lib/server/main.js
+++ b/lib/server/main.js
@@ -58,7 +58,7 @@
     exports.update                  = srvrequire('update'),
     exports.minify                  = srvrequire('minify').Minify,
     exports.zlib                    =   mrequire('zlib');
-
+    
     
     /**
      * function do safe require of needed module
diff --git a/lib/server/minify.js b/lib/server/minify.js
index 87ceca18..deac66a2 100644
--- a/lib/server/minify.js
+++ b/lib/server/minify.js
@@ -4,7 +4,7 @@
     "use strict";
     
     var DIR         = process.cwd() + '/',
-        main        = require(DIR + 'lib/server/main.js'),
+        main        = require(DIR   + 'lib/server/main'),
         SRVDIR      = main.SRVDIR;
     
     exports.Minify = {
diff --git a/lib/server/rest.js b/lib/server/rest.js
index dd713770..1fcab0a8 100644
--- a/lib/server/rest.js
+++ b/lib/server/rest.js
@@ -4,7 +4,7 @@
     "use strict";
     
     var DIR         = process.cwd() + '/',
-        main        = require(DIR + 'lib/server/main'),
+        main        = require(DIR   + 'lib/server/main'),
         Util        = main.util,
         APIURL      = '/api/v1',
         OK          = 200,
diff --git a/lib/server/socket.js b/lib/server/socket.js
index 1b574df7..fc59677c 100644
--- a/lib/server/socket.js
+++ b/lib/server/socket.js
@@ -3,8 +3,8 @@
 (function(){
     "use strict";
     
-    var DIR             = process.cwd() + '/',
-        main            = require(DIR + 'lib/server/main'),
+    var DIR         = process.cwd() + '/',
+        main        = require(DIR   + 'lib/server/main'),
         SRVDIR          = main.SRVDIR,
         
         io              = main.require('socket.io'),
diff --git a/lib/server/update.js b/lib/server/update.js
index 774b220e..0fc8fb49 100644
--- a/lib/server/update.js
+++ b/lib/server/update.js
@@ -3,8 +3,8 @@
 (function(){
     "use strict";
     
-    var DIR             = process.cwd() + '/',
-        main            = require(DIR + 'lib/server/main'),
+    var DIR         = process.cwd() + '/',
+        main        = require(DIR   + 'lib/server/main'),
         mainpackage     = main.mainpackage,
         exec            = main.child_process.exec;
     
diff --git a/server.js b/server.js
index 3153ce4a..b8f7e713 100644
--- a/server.js
+++ b/server.js
@@ -1,6 +1,6 @@
 (function(){
     "use strict";
-    
+        
     /* Обьект содержащий все функции и переменные 
      * серверной части Cloud Commander'а
      */
@@ -62,8 +62,10 @@
         DirPath             = '/',
         
         OK                  = 200,
-        DIR                 = process.cwd() + '/',
-        main                = require(DIR + 'lib/server/main.js'),
+                
+        DIR         = process.cwd() + '/',
+        
+        main        = require(DIR   + 'lib/server/main'),
         
         LIBDIR              = main.LIBDIR,
         SRVDIR              = main.SRVDIR,