diff --git a/config.js b/config.js
index fa826d2..7bd8aa3 100644
--- a/config.js
+++ b/config.js
@@ -15,6 +15,15 @@ System.config({
 
 System.config({
   "map": {
+    "config-API": "src/configapi", 
+    "doodle3d-API": "src/doodle3dapi", 
+    "info-API": "src/infoapi", 
+    "network-API": "src/networkapi", 
+    "printer-API": "src/printerapi", 
+    "rest-API": "src/restapi", 
+    "sketch-API": "src/sketchapi", 
+    "system-API": "src/systemapi", 
+    "update-API": "src/updateapi", 
     "babel": "npm:babel-core@5.6.20",
     "babel-runtime": "npm:babel-runtime@5.6.20",
     "core-js": "npm:core-js@0.9.18",
diff --git a/example/app.js b/example/app.js
index a2f391e..946ce2f 100644
--- a/example/app.js
+++ b/example/app.js
@@ -1,6 +1,6 @@
 import $ from 'jquery';
-import Doodle3DAPI from '../src/doodle3dapi';
-import rest from '../src/restapi';
+import Doodle3DAPI from 'doodle3d-API';
+import rest from 'rest-API';
 
 var api = "http://connect.doodle3d.com/api/";
 
diff --git a/package.json b/package.json
index c32cbeb..494fb2a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,9 @@
 {
   "jspm": {
-    "main": "src/doodle3dapi.js",
-    "directories": {},
+    "main": "doodle3dapi.js",
+    "directories": {
+      "lib": "src"
+    },
     "dependencies": {
       "jquery": "github:components/jquery@^2.1.4"
     },
@@ -10,16 +12,5 @@
       "babel-runtime": "npm:babel-runtime@^5.1.13",
       "core-js": "npm:core-js@^0.9.4"
     }
-  },
-  "name": "Doodle3D-API",
-  "version": "0.0.0",
-  "main": "",
-  "directories": {
-    "test": "test"
-  },
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "Doodle3D",
-  "license": "ISC"
+  }
 }
diff --git a/src/configapi.js b/src/configapi.js
index 76d1ac6..b15599f 100644
--- a/src/configapi.js
+++ b/src/configapi.js
@@ -1,4 +1,4 @@
-import rest from 'src/restapi';
+import rest from 'rest-API';
 
 export default class {
 	constructor (localIP) {
diff --git a/src/doodle3dapi.js b/src/doodle3dapi.js
index b495518..ea9b43c 100644
--- a/src/doodle3dapi.js
+++ b/src/doodle3dapi.js
@@ -1,11 +1,11 @@
-import rest from 'src/restapi';
-import ConfigAPI from 'src/configapi';
-import InfoAPI from 'src/infoapi';
-import NetworkAPI from 'src/networkapi';
-import PrinterAPI from 'src/printerapi';
-import SketchAPI from 'src/sketchapi';
-import SystemAPI from 'src/systemapi';
-import UpdateAPI from 'src/updateapi';
+import rest from 'rest-API';
+import ConfigAPI from 'config-API';
+import InfoAPI from 'info-API';
+import NetworkAPI from 'network-API';
+import PrinterAPI from 'printer-API';
+import SketchAPI from 'sketch-API';
+import SystemAPI from 'system-API';
+import UpdateAPI from 'update-API';
 
 export default class {
 	constructor (localIP) {
diff --git a/src/infoapi.js b/src/infoapi.js
index 1c293b5..45d85fd 100644
--- a/src/infoapi.js
+++ b/src/infoapi.js
@@ -1,4 +1,4 @@
-import rest from 'src/restapi';
+import rest from 'rest-API';
 
 export default class {
 	constructor (localIP) {
diff --git a/src/networkapi.js b/src/networkapi.js
index 7245f0d..920f762 100644
--- a/src/networkapi.js
+++ b/src/networkapi.js
@@ -1,4 +1,4 @@
-import rest from 'src/restapi';
+import rest from 'rest-API';
 
 export default class {
 	constructor (localIP) {
diff --git a/src/printerapi.js b/src/printerapi.js
index 9d3b074..7721141 100644
--- a/src/printerapi.js
+++ b/src/printerapi.js
@@ -1,4 +1,4 @@
-import rest from 'src/restapi';
+import rest from 'rest-API';
 
 export default class {
 	constructor (localIP) {
diff --git a/src/sketchapi.js b/src/sketchapi.js
index 36c444e..3e9ef22 100644
--- a/src/sketchapi.js
+++ b/src/sketchapi.js
@@ -1,4 +1,4 @@
-import rest from 'src/restapi';
+import rest from 'rest-API';
 
 export default class {
 	constructor (localIP) {
diff --git a/src/systemapi.js b/src/systemapi.js
index a0b0257..2290bf0 100644
--- a/src/systemapi.js
+++ b/src/systemapi.js
@@ -1,4 +1,4 @@
-import rest from 'src/restapi';
+import rest from 'rest-API';
 
 export default class {
 	constructor (localIP) {
diff --git a/src/updateapi.js b/src/updateapi.js
index 05d243b..1c75d31 100644
--- a/src/updateapi.js
+++ b/src/updateapi.js
@@ -1,4 +1,4 @@
-import rest from 'src/restapi';
+import rest from 'rest-API';
 
 export default class {
 	constructor (localIP) {