diff --git a/cloudcmd.js b/cloudcmd.js
index 69617060..13f5f552 100644
--- a/cloudcmd.js
+++ b/cloudcmd.js
@@ -17,6 +17,7 @@
         files       = require(DIR_SERVER + 'files'),
         update      = require(DIR_SERVER + 'update'),
         minify      = require(DIR_SERVER + 'minify'),
+        rest        = require(DIR_SERVER + 'rest'),
         
         Util        = require(DIR_LIB + 'util'),
         CloudFunc   = require(DIR_LIB + 'cloudfunc'),
@@ -123,7 +124,7 @@
         }
         
         paramsStart = {
-            rest        : main.rest,
+            rest        : rest,
             route       : route
         };
         
diff --git a/lib/server/main.js b/lib/server/main.js
index fc84301b..2c188306 100644
--- a/lib/server/main.js
+++ b/lib/server/main.js
@@ -60,8 +60,7 @@
     exports.socket                          = srvrequire('socket'),
     exports.auth                            = srvrequire('auth').auth,
     diffPatch                               = librequire('diff/diff-match-patch').diff_match_patch,
-    exports.diff                            = new (librequire('diff').DiffProto)(diffPatch),
-    exports.rest                            = srvrequire('rest').api;
+    exports.diff                            = new (librequire('diff').DiffProto)(diffPatch);
     
     /* second initializing after all modules load, so global var is   *
      * totally filled of all information that should know all modules */
diff --git a/lib/server/rest.js b/lib/server/rest.js
index 44aeff04..6b1285fd 100644
--- a/lib/server/rest.js
+++ b/lib/server/rest.js
@@ -49,7 +49,7 @@
      * @param response
      * @param callback
      */
-    exports.api = function(request, response, next) {
+    module.exports = function(request, response, next) {
         var apiURL, name, is, regExp,
             params  = {
                 request     : request,