diff --git a/cloudcmd.js b/lib/cloudcmd.js
similarity index 75%
rename from cloudcmd.js
rename to lib/cloudcmd.js
index bb59adfc..602b4a09 100644
--- a/cloudcmd.js
+++ b/lib/cloudcmd.js
@@ -2,10 +2,9 @@
     'use strict';
     
     var DIR         = __dirname + '/',
-        DIR_LIB     = DIR       + 'lib/',
-        DIR_SERVER  = DIR       + 'lib/server/',
+        DIR_SERVER  = DIR       + 'server/',
         
-        server      = require(DIR_LIB       + 'server'),
+        server      = require(DIR           + 'server'),
         config      = require(DIR_SERVER    + 'config');
         
         
diff --git a/package.json b/package.json
index 2bfd6397..6b61eaf0 100644
--- a/package.json
+++ b/package.json
@@ -50,5 +50,5 @@
     "node": ">=0.6.x"
   },
   "license": "MIT",
-  "main": "cloudcmd.js"
+  "main": "lib/cloudcmd.js"
 }