diff --git a/src/cli/utils.js b/src/cli/utils.js
index 94756d6221..c6e43daf4c 100644
--- a/src/cli/utils.js
+++ b/src/cli/utils.js
@@ -2,7 +2,7 @@ const fs = require('fs')
 const os = require('os')
 const APIctl = require('ipfs-api')
 const multiaddr = require('multiaddr')
-const IPFS = require('../ipfs-core')
+const IPFS = require('../core')
 const debug = require('debug')
 const log = debug('cli')
 log.error = debug('cli:error')
diff --git a/src/ipfs-core/default-repo/browser.js b/src/core/default-repo/browser.js
similarity index 100%
rename from src/ipfs-core/default-repo/browser.js
rename to src/core/default-repo/browser.js
diff --git a/src/ipfs-core/default-repo/index.js b/src/core/default-repo/index.js
similarity index 100%
rename from src/ipfs-core/default-repo/index.js
rename to src/core/default-repo/index.js
diff --git a/src/ipfs-core/default-repo/node.js b/src/core/default-repo/node.js
similarity index 100%
rename from src/ipfs-core/default-repo/node.js
rename to src/core/default-repo/node.js
diff --git a/src/ipfs-core/index.js b/src/core/index.js
similarity index 100%
rename from src/ipfs-core/index.js
rename to src/core/index.js
diff --git a/src/http-api/index.js b/src/http-api/index.js
index de961a5902..43da3645a4 100644
--- a/src/http-api/index.js
+++ b/src/http-api/index.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Hapi = require('hapi')
-const IPFS = require('../ipfs-core')
+const IPFS = require('../core')
 const debug = require('debug')
 const fs = require('fs')
 const os = require('os')
diff --git a/tests/test-core/test-block.js b/tests/test-core/test-block.js
index e7ae341ff1..025ef99a81 100644
--- a/tests/test-core/test-block.js
+++ b/tests/test-core/test-block.js
@@ -3,7 +3,7 @@
 const expect = require('chai').expect
 const base58 = require('bs58')
 const fs = require('fs')
-const IPFS = require('../../src/ipfs-core')
+const IPFS = require('../../src/core')
 const Block = require('ipfs-blocks').Block
 
 const isNode = !global.window
diff --git a/tests/test-core/test-bootstrap.js b/tests/test-core/test-bootstrap.js
index ad777ac6e0..c7cc803d03 100644
--- a/tests/test-core/test-bootstrap.js
+++ b/tests/test-core/test-bootstrap.js
@@ -3,7 +3,7 @@
 const expect = require('chai').expect
 
 process.env.IPFS_PATH = process.cwd() + '/tests/repo-example'
-const IPFS = require('../../src/ipfs-core')
+const IPFS = require('../../src/core')
 
 describe('bootstrap', () => {
   var ipfs
diff --git a/tests/test-core/test-config.js b/tests/test-core/test-config.js
index 54bf233099..cc995616b0 100644
--- a/tests/test-core/test-config.js
+++ b/tests/test-core/test-config.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 
 const expect = require('chai').expect
-const IPFS = require('../../src/ipfs-core')
+const IPFS = require('../../src/core')
 
 describe('config', () => {
   var defaultConfig = {
diff --git a/tests/test-core/test-id.js b/tests/test-core/test-id.js
index 4e7130a294..e7e2f66336 100644
--- a/tests/test-core/test-id.js
+++ b/tests/test-core/test-id.js
@@ -3,7 +3,7 @@
 const expect = require('chai').expect
 
 process.env.IPFS_PATH = process.cwd() + '/tests/repo-example'
-const IPFS = require('../../src/ipfs-core')
+const IPFS = require('../../src/core')
 
 describe('id', () => {
   var ipfs
diff --git a/tests/test-core/test-object.js b/tests/test-core/test-object.js
index 6e07a75197..c66c1a5e37 100644
--- a/tests/test-core/test-object.js
+++ b/tests/test-core/test-object.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 
 const expect = require('chai').expect
-const IPFS = require('../../src/ipfs-core')
+const IPFS = require('../../src/core')
 const bs58 = require('bs58')
 const mDAG = require('ipfs-merkle-dag')
 const DAGNode = mDAG.DAGNode
diff --git a/tests/test-core/test-version.js b/tests/test-core/test-version.js
index 43bdf6d724..da96ee4190 100644
--- a/tests/test-core/test-version.js
+++ b/tests/test-core/test-version.js
@@ -3,7 +3,7 @@
 const expect = require('chai').expect
 
 process.env.IPFS_PATH = process.cwd() + '/tests/repo-example'
-const IPFS = require('../../src/ipfs-core')
+const IPFS = require('../../src/core')
 
 describe('version', () => {
   var ipfs