diff --git a/.ember-cli b/.ember-cli
index ee64cfe..59bb55f 100644
--- a/.ember-cli
+++ b/.ember-cli
@@ -5,5 +5,5 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": false
+  "disableAnalytics": true
 }
diff --git a/lib/.jshintrc b/lib/.jshintrc
new file mode 100644
index 0000000..839c191
--- /dev/null
+++ b/lib/.jshintrc
@@ -0,0 +1,4 @@
+{
+  "node": true,
+  "browser": false
+}
diff --git a/lib/contracts/index.js b/lib/contracts/index.js
new file mode 100644
index 0000000..3e7977e
--- /dev/null
+++ b/lib/contracts/index.js
@@ -0,0 +1,32 @@
+/*jshint node:true*/
+const writeFile = require('broccoli-file-creator');
+const mergeTrees = require('broccoli-merge-trees');
+const jsonModule = require('broccoli-json-module');
+
+module.exports = {
+  name: 'contracts',
+
+  treeForAddon: function(tree) {
+    let trees = [];
+    const files = require('kredits-contracts/lib');
+
+    let abis = {};
+    let addresses = {};
+
+    files.forEach(function(file) {
+      abis[file] = require(`kredits-contracts/lib/abis/${file}.json`);
+      addresses[file] = require(`kredits-contracts/lib/addresses/${file}.json`);
+    });
+
+    trees.push(writeFile(`abis/index.json`, JSON.stringify(abis)));
+    trees.push(writeFile(`addresses/index.json`, JSON.stringify(addresses)));
+
+    tree = jsonModule(mergeTrees(trees));
+
+    return this._super.treeForAddon.call(this, tree);
+  },
+
+  isDevelopingAddon: function() {
+    return true;
+  }
+};
diff --git a/lib/contracts/package.json b/lib/contracts/package.json
new file mode 100644
index 0000000..a2e4ce6
--- /dev/null
+++ b/lib/contracts/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "contracts",
+  "keywords": [
+    "ember-addon"
+  ]
+}
diff --git a/package.json b/package.json
index 63c4c87..4717baf 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,9 @@
     "babel-preset-es2015": "^6.22.0",
     "babelify": "^7.3.0",
     "broccoli-asset-rev": "^2.4.5",
+    "broccoli-file-creator": "^1.1.1",
+    "broccoli-json-module": "^1.0.0",
+    "broccoli-merge-trees": "^3.0.0",
     "ember-ajax": "^2.4.1",
     "ember-browserify": "^1.1.13",
     "ember-cli": "2.10.0",
@@ -57,7 +60,7 @@
     "ember-truth-helpers": "1.3.0",
     "ipfs-api": "^12.1.7",
     "kosmos-schemas": "^1.1.2",
-    "kredits-contracts": "github:67P/kredits-contracts#operator",
+    "kredits-contracts": "github:67P/truffle-kredits#master",
     "loader.js": "^4.0.10",
     "tv4": "^1.3.0",
     "uuid": "^3.0.1",
@@ -66,5 +69,10 @@
   "engines": {
     "node": ">= 0.12.0"
   },
-  "private": true
+  "private": true,
+  "ember-addon": {
+    "paths": [
+      "lib/contracts"
+    ]
+  }
 }