diff --git a/maxctrl/maxctrl_core/lib/alter.js b/maxctrl/lib/alter.js
similarity index 98%
rename from maxctrl/maxctrl_core/lib/alter.js
rename to maxctrl/lib/alter.js
index b308d616e..fd37c8694 100644
--- a/maxctrl/maxctrl_core/lib/alter.js
+++ b/maxctrl/lib/alter.js
@@ -10,7 +10,7 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-require('../common.js')()
+require('./common.js')()
 
 exports.command = 'alter <command>'
 exports.desc = 'Alter objects'
diff --git a/maxctrl/maxctrl_core/lib/call.js b/maxctrl/lib/call.js
similarity index 98%
rename from maxctrl/maxctrl_core/lib/call.js
rename to maxctrl/lib/call.js
index d2b6a88fa..868159dfc 100644
--- a/maxctrl/maxctrl_core/lib/call.js
+++ b/maxctrl/lib/call.js
@@ -10,7 +10,7 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-require('../common.js')()
+require('./common.js')()
 
 exports.command = 'call <command>'
 exports.desc = 'Call module commands'
diff --git a/maxctrl/maxctrl_core/lib/clear.js b/maxctrl/lib/clear.js
similarity index 97%
rename from maxctrl/maxctrl_core/lib/clear.js
rename to maxctrl/lib/clear.js
index b4b442acd..2c8fa57e2 100644
--- a/maxctrl/maxctrl_core/lib/clear.js
+++ b/maxctrl/lib/clear.js
@@ -10,7 +10,7 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-require('../common.js')()
+require('./common.js')()
 
 exports.command = 'clear <command>'
 exports.desc = 'Clear object state'
diff --git a/maxctrl/maxctrl_core/common.js b/maxctrl/lib/common.js
similarity index 100%
rename from maxctrl/maxctrl_core/common.js
rename to maxctrl/lib/common.js
diff --git a/maxctrl/maxctrl_core/core.js b/maxctrl/lib/core.js
similarity index 78%
rename from maxctrl/maxctrl_core/core.js
rename to maxctrl/lib/core.js
index c3f871428..09d778abf 100644
--- a/maxctrl/maxctrl_core/core.js
+++ b/maxctrl/lib/core.js
@@ -63,21 +63,21 @@ program
         type: 'boolean'
     })
 
-    .command(require('./lib/list.js'))
-    .command(require('./lib/show.js'))
-    .command(require('./lib/set.js'))
-    .command(require('./lib/clear.js'))
-    .command(require('./lib/enable.js'))
-    .command(require('./lib/disable.js'))
-    .command(require('./lib/create.js'))
-    .command(require('./lib/destroy.js'))
-    .command(require('./lib/link.js'))
-    .command(require('./lib/unlink.js'))
-    .command(require('./lib/start.js'))
-    .command(require('./lib/stop.js'))
-    .command(require('./lib/alter.js'))
-    .command(require('./lib/rotate.js'))
-    .command(require('./lib/call.js'))
+    .command(require('./list.js'))
+    .command(require('./show.js'))
+    .command(require('./set.js'))
+    .command(require('./clear.js'))
+    .command(require('./enable.js'))
+    .command(require('./disable.js'))
+    .command(require('./create.js'))
+    .command(require('./destroy.js'))
+    .command(require('./link.js'))
+    .command(require('./unlink.js'))
+    .command(require('./start.js'))
+    .command(require('./stop.js'))
+    .command(require('./alter.js'))
+    .command(require('./rotate.js'))
+    .command(require('./call.js'))
     .help()
     .demandCommand(1, 'At least one command is required')
     .command('*', 'the default command', {}, () => {
diff --git a/maxctrl/maxctrl_core/lib/create.js b/maxctrl/lib/create.js
similarity index 99%
rename from maxctrl/maxctrl_core/lib/create.js
rename to maxctrl/lib/create.js
index 4cacba607..03c08f565 100644
--- a/maxctrl/maxctrl_core/lib/create.js
+++ b/maxctrl/lib/create.js
@@ -10,7 +10,7 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-require('../common.js')()
+require('./common.js')()
 
 exports.command = 'create <command>'
 exports.desc = 'Create objects'
diff --git a/maxctrl/maxctrl_core/lib/destroy.js b/maxctrl/lib/destroy.js
similarity index 98%
rename from maxctrl/maxctrl_core/lib/destroy.js
rename to maxctrl/lib/destroy.js
index b6d7aa961..58185a562 100644
--- a/maxctrl/maxctrl_core/lib/destroy.js
+++ b/maxctrl/lib/destroy.js
@@ -10,7 +10,7 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-require('../common.js')()
+require('./common.js')()
 
 exports.command = 'destroy <command>'
 exports.desc = 'Destroy objects'
diff --git a/maxctrl/maxctrl_core/lib/disable.js b/maxctrl/lib/disable.js
similarity index 98%
rename from maxctrl/maxctrl_core/lib/disable.js
rename to maxctrl/lib/disable.js
index b0b9ca2cf..28024fc47 100644
--- a/maxctrl/maxctrl_core/lib/disable.js
+++ b/maxctrl/lib/disable.js
@@ -10,7 +10,7 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-require('../common.js')()
+require('./common.js')()
 
 const log_levels = [
     'debug',
diff --git a/maxctrl/maxctrl_core/lib/enable.js b/maxctrl/lib/enable.js
similarity index 98%
rename from maxctrl/maxctrl_core/lib/enable.js
rename to maxctrl/lib/enable.js
index 3fcd7c3b9..d280e8822 100644
--- a/maxctrl/maxctrl_core/lib/enable.js
+++ b/maxctrl/lib/enable.js
@@ -10,7 +10,7 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-require('../common.js')()
+require('./common.js')()
 
 const log_levels = [
     'debug',
diff --git a/maxctrl/maxctrl_core/lib/link.js b/maxctrl/lib/link.js
similarity index 98%
rename from maxctrl/maxctrl_core/lib/link.js
rename to maxctrl/lib/link.js
index e5c57d9b7..fc0e8dcd9 100644
--- a/maxctrl/maxctrl_core/lib/link.js
+++ b/maxctrl/lib/link.js
@@ -10,7 +10,7 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-require('../common.js')()
+require('./common.js')()
 
 function addServer(argv, path, targets) {
     maxctrl(argv, function(host){
diff --git a/maxctrl/maxctrl_core/lib/list.js b/maxctrl/lib/list.js
similarity index 99%
rename from maxctrl/maxctrl_core/lib/list.js
rename to maxctrl/lib/list.js
index 00fcda87b..23eb6a9fc 100644
--- a/maxctrl/maxctrl_core/lib/list.js
+++ b/maxctrl/lib/list.js
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-require('../common.js')()
+require('./common.js')()
 
 exports.command = 'list <command>'
 exports.desc = 'List objects'
diff --git a/maxctrl/maxctrl_core/lib/rotate.js b/maxctrl/lib/rotate.js
similarity index 97%
rename from maxctrl/maxctrl_core/lib/rotate.js
rename to maxctrl/lib/rotate.js
index 543bf6ef6..e04164d7f 100644
--- a/maxctrl/maxctrl_core/lib/rotate.js
+++ b/maxctrl/lib/rotate.js
@@ -10,7 +10,7 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-require('../common.js')()
+require('./common.js')()
 
 exports.command = 'rotate <command>'
 exports.desc = 'Rotate log files'
diff --git a/maxctrl/maxctrl_core/lib/set.js b/maxctrl/lib/set.js
similarity index 97%
rename from maxctrl/maxctrl_core/lib/set.js
rename to maxctrl/lib/set.js
index 0a36719fe..d09f76a3e 100644
--- a/maxctrl/maxctrl_core/lib/set.js
+++ b/maxctrl/lib/set.js
@@ -10,7 +10,7 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-require('../common.js')()
+require('./common.js')()
 
 exports.command = 'set <command>'
 exports.desc = 'Set object state'
diff --git a/maxctrl/maxctrl_core/lib/show.js b/maxctrl/lib/show.js
similarity index 99%
rename from maxctrl/maxctrl_core/lib/show.js
rename to maxctrl/lib/show.js
index 6381a5708..0b3087af9 100644
--- a/maxctrl/maxctrl_core/lib/show.js
+++ b/maxctrl/lib/show.js
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-require('../common.js')()
+require('./common.js')()
 
 exports.command = 'show <command>'
 exports.desc = 'Show objects'
diff --git a/maxctrl/maxctrl_core/lib/start.js b/maxctrl/lib/start.js
similarity index 97%
rename from maxctrl/maxctrl_core/lib/start.js
rename to maxctrl/lib/start.js
index d472b54b1..6b1923450 100644
--- a/maxctrl/maxctrl_core/lib/start.js
+++ b/maxctrl/lib/start.js
@@ -10,7 +10,7 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-require('../common.js')()
+require('./common.js')()
 
 exports.command = 'start <command>'
 exports.desc = 'Start objects'
diff --git a/maxctrl/maxctrl_core/lib/stop.js b/maxctrl/lib/stop.js
similarity index 97%
rename from maxctrl/maxctrl_core/lib/stop.js
rename to maxctrl/lib/stop.js
index 7c67c13a1..db546b53e 100644
--- a/maxctrl/maxctrl_core/lib/stop.js
+++ b/maxctrl/lib/stop.js
@@ -10,7 +10,7 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-require('../common.js')()
+require('./common.js')()
 
 exports.command = 'stop <command>'
 exports.desc = 'Stop objects'
diff --git a/maxctrl/maxctrl_core/lib/unlink.js b/maxctrl/lib/unlink.js
similarity index 98%
rename from maxctrl/maxctrl_core/lib/unlink.js
rename to maxctrl/lib/unlink.js
index f82ae5ad9..b68bb51be 100644
--- a/maxctrl/maxctrl_core/lib/unlink.js
+++ b/maxctrl/lib/unlink.js
@@ -10,7 +10,7 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-require('../common.js')()
+require('./common.js')()
 
 function removeServer(argv, path, targets) {
     maxctrl(argv, function(host) {
diff --git a/maxctrl/maxctrl.js b/maxctrl/maxctrl.js
index fa8361e43..1c5653b85 100644
--- a/maxctrl/maxctrl.js
+++ b/maxctrl/maxctrl.js
@@ -13,7 +13,7 @@
 
 'use strict';
 
-var maxctrl = require('maxctrl-core')
+var maxctrl = require('./lib/core.js')
 
 // Mangle the arguments if we are being called from the command line
 if (process.argv[0] == process.execPath) {
diff --git a/maxctrl/maxctrl_core/package.json b/maxctrl/maxctrl_core/package.json
deleted file mode 100644
index 60dc5eddf..000000000
--- a/maxctrl/maxctrl_core/package.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "name": "maxctrl-core",
-  "version": "1.0.0",
-  "description": "MaxScale Administrative Client Core Library",
-  "repository": "https://github.com/mariadb-corporation/MaxScale",
-  "main": "core.js",
-  "keywords": [
-    "maxscale"
-  ],
-  "author": "MariaDB Corporation Ab",
-  "license": "SEE LICENSE IN ../../LICENSE.TXT",
-  "dependencies": {
-    "cli-table": "^0.3.1",
-    "lodash": "^4.17.4",
-    "lodash-getpath": "^0.2.4",
-    "request": "^2.81.0",
-    "request-promise-native": "^1.0.3",
-    "yargs": "^8.0.2"
-  }
-}
diff --git a/maxctrl/package.json b/maxctrl/package.json
index f111d7781..bc1a0835d 100644
--- a/maxctrl/package.json
+++ b/maxctrl/package.json
@@ -5,7 +5,7 @@
   "repository": "https://github.com/mariadb-corporation/MaxScale",
   "main": "maxctrl.js",
   "scripts": {
-    "test": "mocha --timeout 15000 --slow 10000"
+    "test": "nyc mocha --timeout 15000 --slow 10000"
   },
   "keywords": [
     "maxscale"
@@ -14,13 +14,24 @@
     "maxctrl": "./maxctrl.js"
   },
   "author": "MariaDB Corporation Ab",
-  "license": "SEE LICENSE IN ../../LICENSE.TXT",
+  "license": "SEE LICENSE IN ../LICENSE.TXT",
   "dependencies": {
-    "maxscale-core": "file:./maxctrl_core"
+    "cli-table": "^0.3.1",
+    "lodash": "^4.17.4",
+    "lodash-getpath": "^0.2.4",
+    "request": "^2.81.0",
+    "request-promise-native": "^1.0.3",
+    "yargs": "^8.0.2"
   },
   "devDependencies": {
     "chai": "^3.5.0",
     "chai-as-promised": "^6.0.0",
-    "mocha": "^3.3.0"
+    "mocha": "^3.3.0",
+    "nyc": "^11.0.3"
+  },
+  "nyc": {
+    "include": [
+      "lib/*.js"
+    ]
   }
 }
diff --git a/maxctrl/test/diagnostics.js b/maxctrl/test/diagnostics.js
index 52360476c..9d642f799 100644
--- a/maxctrl/test/diagnostics.js
+++ b/maxctrl/test/diagnostics.js
@@ -1,27 +1,27 @@
 require('../test_utils.js')()
 
+var ctrl = require('../lib/core.js')
+var tests = [
+    'list servers',
+    'list services',
+    'list monitors',
+    'list sessions',
+    'list filters',
+    'list modules',
+    'list users',
+    'list commands',
+    'show server server1',
+    'show service RW-Split-Router',
+    'show monitor MySQL-Monitor',
+    'show session 5',
+    'show filter Hint',
+    'show module readwritesplit',
+    'show maxscale',
+]
+
 describe("Diagnostic commands", function() {
     before(startMaxScale)
 
-    var ctrl = require('maxctrl-core')
-    var tests = [
-        'list servers',
-        'list services',
-        'list monitors',
-        'list sessions',
-        'list filters',
-        'list modules',
-        'list users',
-        'list commands',
-        'show server server1',
-        'show service RW-Split-Router',
-        'show monitor MySQL-Monitor',
-        'show session 5',
-        'show filter Hint',
-        'show module readwritesplit',
-        'show maxscale',
-    ]
-
     tests.forEach(function(i) {
         it(i, function() {
             return ctrl.execute(i.split(' '), {
diff --git a/maxctrl/test/monitor.js b/maxctrl/test/monitor.js
index e5b26767b..8c305f2ee 100644
--- a/maxctrl/test/monitor.js
+++ b/maxctrl/test/monitor.js
@@ -1,11 +1,11 @@
 require('../test_utils.js')()
 
+var ctrl = require('../lib/core.js')
+var opts = { extra_args: [ '--quiet'] }
+
 describe("Monitor Commands", function() {
     before(startMaxScale)
 
-    var ctrl = require('maxctrl-core')
-    var opts = { extra_args: [ '--quiet'] }
-
     it('create monitor', function() {
         return ctrl.execute('create monitor my-monitor mysqlmon'.split(' '), opts)
             .then(function() {
diff --git a/maxctrl/test/server.js b/maxctrl/test/server.js
index 4e1507a90..8ecc9e6b5 100644
--- a/maxctrl/test/server.js
+++ b/maxctrl/test/server.js
@@ -1,11 +1,11 @@
 require('../test_utils.js')()
 
+var ctrl = require('../lib/core.js')
+var opts = { extra_args: [ '--quiet'] }
+
 describe("Server Commands", function() {
     before(startMaxScale)
 
-    var ctrl = require('maxctrl-core')
-    var opts = { extra_args: [ '--quiet'] }
-
     it('create server', function() {
         return ctrl.execute('create server server5 127.0.0.1 3003'.split(' '), opts)
             .then(function() {
diff --git a/maxctrl/test/service.js b/maxctrl/test/service.js
index 3b86e17c6..e9d65de2d 100644
--- a/maxctrl/test/service.js
+++ b/maxctrl/test/service.js
@@ -1,11 +1,11 @@
 require('../test_utils.js')()
 
+var ctrl = require('../lib/core.js')
+var opts = { extra_args: [ '--quiet'] }
+
 describe("Service Commands", function() {
     before(startMaxScale)
 
-    var ctrl = require('maxctrl-core')
-    var opts = { extra_args: [ '--quiet'] }
-
     it('link servers to a service', function() {
         return ctrl.execute('link service Read-Connection-Router server1 server2 server3 server4'.split(' '), opts)
             .then(function() {
diff --git a/maxctrl/test/states.js b/maxctrl/test/states.js
index 7e925faaa..97eb11dac 100644
--- a/maxctrl/test/states.js
+++ b/maxctrl/test/states.js
@@ -1,5 +1,8 @@
 require('../test_utils.js')()
 
+var ctrl = require('../lib/core.js')
+var opts = { extra_args: [ '--quiet'] }
+
 describe("Server states", function() {
     before(function() {
         return startMaxScale()
@@ -8,9 +11,6 @@ describe("Server states", function() {
             })
     })
 
-    var ctrl = require('maxctrl-core')
-    var opts = { extra_args: [ '--quiet'] }
-
     it('set correct state', function() {
         return ctrl.execute('set server server2 master'.split(' '), opts)
             .then(function() {