diff --git a/packages/xo-cli/bin/xo-cli b/packages/xo-cli/bin/xo-cli
deleted file mode 100755
index bfe13c7d4..000000000
--- a/packages/xo-cli/bin/xo-cli
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env node
-
-'use strict';
-
-//====================================================================
-
-require('exec-promise')(require('..'));
diff --git a/packages/xo-cli/src/config.js b/packages/xo-cli/config.js
similarity index 100%
rename from packages/xo-cli/src/config.js
rename to packages/xo-cli/config.js
diff --git a/packages/xo-cli/src/cli.js b/packages/xo-cli/index.js
old mode 100644
new mode 100755
similarity index 97%
rename from packages/xo-cli/src/cli.js
rename to packages/xo-cli/index.js
index 392392a4d..9fde2d5b9
--- a/packages/xo-cli/src/cli.js
+++ b/packages/xo-cli/index.js
@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 'use strict';
 
 //====================================================================
@@ -122,7 +124,7 @@ var help = wrap((function (pkg) {
 
     return pkg[key];
   });
-})(require('../package')));
+})(require('./package')));
 
 //--------------------------------------------------------------------
 
@@ -308,3 +310,9 @@ function call(args) {
   });
 }
 exports.call = call;
+
+//====================================================================
+
+if (!module.parent) {
+  require('exec-promise')(exports);
+}
diff --git a/packages/xo-cli/package.json b/packages/xo-cli/package.json
index acefafddb..259910988 100644
--- a/packages/xo-cli/package.json
+++ b/packages/xo-cli/package.json
@@ -13,11 +13,12 @@
   "bugs": "https://github.com/vatesfr/xo-cli/issues",
   "author": "Julien Fontanet <julien.fontanet@vates.fr>",
   "preferGlobal": true,
-  "main": "./src/cli.js",
-  "directories": {
-    "bin": "./bin",
-    "man": "./man"
+  "bin": {
+    "xo-cli": "index.js"
   },
+  "files": [
+    "*.js"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/vatesfr/xo-cli"
@@ -42,12 +43,5 @@
     "sent": "^1.1.0",
     "xdg": "^0.1.1",
     "xo-lib": "^0.2.0"
-  },
-  "devDependencies": {
-    "chai": "^1.9.1",
-    "mocha": "^1.21.3"
-  },
-  "scripts": {
-    "test": "mocha cli.spec.js"
   }
 }