diff --git a/lib/shared/child-writer/README.md b/lib/child-writer/README.md
similarity index 100%
rename from lib/shared/child-writer/README.md
rename to lib/child-writer/README.md
diff --git a/lib/shared/child-writer/cli.js b/lib/child-writer/cli.js
similarity index 100%
rename from lib/shared/child-writer/cli.js
rename to lib/child-writer/cli.js
diff --git a/lib/shared/child-writer/constants.js b/lib/child-writer/constants.js
similarity index 94%
rename from lib/shared/child-writer/constants.js
rename to lib/child-writer/constants.js
index 22b5a09f..e0c0e536 100644
--- a/lib/shared/child-writer/constants.js
+++ b/lib/child-writer/constants.js
@@ -29,7 +29,7 @@ module.exports = {
    * @property {String} PROJECT_ROOT
    * @memberof CONSTANTS
    */
-  PROJECT_ROOT: path.join(__dirname, '..', '..', '..'),
+  PROJECT_ROOT: path.join(__dirname, '..', '..'),
 
   /**
    * @property {String} WRITER_PROXY_SCRIPT
diff --git a/lib/shared/child-writer/index.js b/lib/child-writer/index.js
similarity index 97%
rename from lib/shared/child-writer/index.js
rename to lib/child-writer/index.js
index f4d63604..bfa82d45 100644
--- a/lib/shared/child-writer/index.js
+++ b/lib/child-writer/index.js
@@ -23,8 +23,8 @@ const ipc = require('node-ipc');
 const rendererUtils = require('./renderer-utils');
 const cli = require('./cli');
 const CONSTANTS = require('./constants');
-const EXIT_CODES = require('../exit-codes');
-const robot = require('../robot');
+const EXIT_CODES = require('../shared/exit-codes');
+const robot = require('../shared/robot');
 
 /**
  * @summary Perform a write
diff --git a/lib/shared/child-writer/renderer-utils.js b/lib/child-writer/renderer-utils.js
similarity index 100%
rename from lib/shared/child-writer/renderer-utils.js
rename to lib/child-writer/renderer-utils.js
diff --git a/lib/shared/child-writer/utils.js b/lib/child-writer/utils.js
similarity index 100%
rename from lib/shared/child-writer/utils.js
rename to lib/child-writer/utils.js
diff --git a/lib/shared/child-writer/writer-proxy.js b/lib/child-writer/writer-proxy.js
similarity index 98%
rename from lib/shared/child-writer/writer-proxy.js
rename to lib/child-writer/writer-proxy.js
index ee191638..98b8de15 100644
--- a/lib/shared/child-writer/writer-proxy.js
+++ b/lib/child-writer/writer-proxy.js
@@ -25,8 +25,8 @@ const os = require('os');
 const path = require('path');
 const sudoPrompt = Bluebird.promisifyAll(require('sudo-prompt'));
 const utils = require('./utils');
-const EXIT_CODES = require('../exit-codes');
-const packageJSON = require('../../../package.json');
+const EXIT_CODES = require('../shared/exit-codes');
+const packageJSON = require('../../package.json');
 
 // This script is in charge of spawning the writer process and
 // ensuring it has the necessary privileges. It might look a bit
diff --git a/lib/gui/modules/image-writer.js b/lib/gui/modules/image-writer.js
index 8edc2713..04e82c70 100644
--- a/lib/gui/modules/image-writer.js
+++ b/lib/gui/modules/image-writer.js
@@ -21,7 +21,7 @@
  */
 
 const angular = require('angular');
-const childWriter = require('../../shared/child-writer');
+const childWriter = require('../../child-writer');
 
 const MODULE_NAME = 'Etcher.Modules.ImageWriter';
 const imageWriter = angular.module(MODULE_NAME, [
diff --git a/package.json b/package.json
index 01478373..c93655f4 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "url": "git@github.com:resin-io/etcher.git"
   },
   "scripts": {
-    "test": "npm run lint && electron-mocha --recursive --renderer tests/gui -R spec && electron-mocha --recursive tests/cli tests/shared -R spec",
+    "test": "npm run lint && electron-mocha --recursive --renderer tests/gui -R spec && electron-mocha --recursive tests/cli tests/shared tests/child-writer -R spec",
     "sass": "node-sass ./lib/gui/scss/main.scss > ./lib/gui/css/main.css",
     "jslint": "eslint lib tests scripts bin versionist.conf.js",
     "scsslint": "scss-lint lib/gui/scss",
diff --git a/tests/shared/child-writer/cli.spec.js b/tests/child-writer/cli.spec.js
similarity index 96%
rename from tests/shared/child-writer/cli.spec.js
rename to tests/child-writer/cli.spec.js
index a0a9d5e1..353430b6 100644
--- a/tests/shared/child-writer/cli.spec.js
+++ b/tests/child-writer/cli.spec.js
@@ -17,9 +17,9 @@
 'use strict';
 
 const m = require('mochainon');
-const cli = require('../../../lib/shared/child-writer/cli');
+const cli = require('../../lib/child-writer/cli');
 
-describe('Shared: ChildWriter CLI', function() {
+describe('ChildWriter CLI', function() {
 
   describe('.getBooleanArgumentForm()', function() {
 
diff --git a/tests/shared/child-writer/utils.spec.js b/tests/child-writer/utils.spec.js
similarity index 95%
rename from tests/shared/child-writer/utils.spec.js
rename to tests/child-writer/utils.spec.js
index 6acbfd3b..6bc94e72 100644
--- a/tests/shared/child-writer/utils.spec.js
+++ b/tests/child-writer/utils.spec.js
@@ -17,9 +17,9 @@
 'use strict';
 
 const m = require('mochainon');
-const utils = require('../../../lib/shared/child-writer/utils');
+const utils = require('../../lib/child-writer/utils');
 
-describe('Shared: ChildWriter Utils', function() {
+describe('ChildWriter Utils', function() {
 
   describe('.splitObjectLines()', function() {