diff --git a/core/coreiface/block.go b/core/coreiface/block.go
index b99b05fdb..587ad339f 100644
--- a/core/coreiface/block.go
+++ b/core/coreiface/block.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	options "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 // BlockStat contains information about a block
diff --git a/core/coreiface/coreapi.go b/core/coreiface/coreapi.go
index d26ec4f7d..651af8bf0 100644
--- a/core/coreiface/coreapi.go
+++ b/core/coreiface/coreapi.go
@@ -5,7 +5,7 @@ package iface
 import (
 	"context"
 
-	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	"github.com/ipfs/interface-go-ipfs-core/options"
 
 	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
 )
diff --git a/core/coreiface/dht.go b/core/coreiface/dht.go
index 94fb3779f..b3f7879e3 100644
--- a/core/coreiface/dht.go
+++ b/core/coreiface/dht.go
@@ -3,7 +3,7 @@ package iface
 import (
 	"context"
 
-	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	"github.com/ipfs/interface-go-ipfs-core/options"
 
 	peer "gx/ipfs/QmPJxxDsX2UbchSHobbYuvz7qnyJTFKvaKMzE2rZWJ4x5B/go-libp2p-peer"
 	pstore "gx/ipfs/QmQFFp4ntkd4C14sP3FaH9WJyBuetuGUVo6dShNHvnoEvC/go-libp2p-peerstore"
diff --git a/core/coreiface/key.go b/core/coreiface/key.go
index 69857e613..154f82b66 100644
--- a/core/coreiface/key.go
+++ b/core/coreiface/key.go
@@ -3,7 +3,7 @@ package iface
 import (
 	"context"
 
-	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	options "github.com/ipfs/interface-go-ipfs-core/options"
 
 	"gx/ipfs/QmPJxxDsX2UbchSHobbYuvz7qnyJTFKvaKMzE2rZWJ4x5B/go-libp2p-peer"
 )
diff --git a/core/coreiface/name.go b/core/coreiface/name.go
index a02bc0787..51b005b7e 100644
--- a/core/coreiface/name.go
+++ b/core/coreiface/name.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 
-	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	options "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 var ErrResolveFailed = errors.New("could not resolve name")
diff --git a/core/coreiface/object.go b/core/coreiface/object.go
index 2ed357cb6..28613aaa0 100644
--- a/core/coreiface/object.go
+++ b/core/coreiface/object.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	options "github.com/ipfs/interface-go-ipfs-core/options"
 
 	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
diff --git a/core/coreiface/options/name.go b/core/coreiface/options/name.go
index e07ef8a59..59aaf2ca3 100644
--- a/core/coreiface/options/name.go
+++ b/core/coreiface/options/name.go
@@ -3,7 +3,7 @@ package options
 import (
 	"time"
 
-	ropts "github.com/ipfs/go-ipfs/core/coreapi/interface/options/namesys"
+	ropts "github.com/ipfs/interface-go-ipfs-core/options/namesys"
 )
 
 const (
diff --git a/core/coreiface/pin.go b/core/coreiface/pin.go
index 6e13def8f..6a7dab413 100644
--- a/core/coreiface/pin.go
+++ b/core/coreiface/pin.go
@@ -3,7 +3,7 @@ package iface
 import (
 	"context"
 
-	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	options "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 // Pin holds information about pinned resource
diff --git a/core/coreiface/pubsub.go b/core/coreiface/pubsub.go
index 933673826..40cea689a 100644
--- a/core/coreiface/pubsub.go
+++ b/core/coreiface/pubsub.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	options "github.com/ipfs/interface-go-ipfs-core/options"
 
 	peer "gx/ipfs/QmPJxxDsX2UbchSHobbYuvz7qnyJTFKvaKMzE2rZWJ4x5B/go-libp2p-peer"
 )
diff --git a/core/coreiface/tests/api.go b/core/coreiface/tests/api.go
index 7a4bd7386..5e7c1f541 100644
--- a/core/coreiface/tests/api.go
+++ b/core/coreiface/tests/api.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
+	coreiface "github.com/ipfs/interface-go-ipfs-core"
 )
 
 var apiNotImplemented = errors.New("api not implemented")
diff --git a/core/coreiface/tests/block.go b/core/coreiface/tests/block.go
index c2ee70a3a..2e0a84b40 100644
--- a/core/coreiface/tests/block.go
+++ b/core/coreiface/tests/block.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
-	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	coreiface "github.com/ipfs/interface-go-ipfs-core"
+	opt "github.com/ipfs/interface-go-ipfs-core/options"
 
 	mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
 )
diff --git a/core/coreiface/tests/dag.go b/core/coreiface/tests/dag.go
index cf332027c..9e0bc34ba 100644
--- a/core/coreiface/tests/dag.go
+++ b/core/coreiface/tests/dag.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
+	coreiface "github.com/ipfs/interface-go-ipfs-core"
 
 	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
 	ipldcbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
diff --git a/core/coreiface/tests/dht.go b/core/coreiface/tests/dht.go
index d2eae1af4..1793cd738 100644
--- a/core/coreiface/tests/dht.go
+++ b/core/coreiface/tests/dht.go
@@ -5,8 +5,8 @@ import (
 	"io"
 	"testing"
 
-	"github.com/ipfs/go-ipfs/core/coreapi/interface"
-	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	"github.com/ipfs/interface-go-ipfs-core"
+	"github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 func (tp *provider) TestDht(t *testing.T) {
diff --git a/core/coreiface/tests/key.go b/core/coreiface/tests/key.go
index 66011f99f..dbbfce059 100644
--- a/core/coreiface/tests/key.go
+++ b/core/coreiface/tests/key.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ipfs/go-ipfs/core/coreapi/interface"
-	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	"github.com/ipfs/interface-go-ipfs-core"
+	opt "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 func (tp *provider) TestKey(t *testing.T) {
diff --git a/core/coreiface/tests/name.go b/core/coreiface/tests/name.go
index 8d87bd495..eb5cd1e3a 100644
--- a/core/coreiface/tests/name.go
+++ b/core/coreiface/tests/name.go
@@ -11,8 +11,8 @@ import (
 	ipath "gx/ipfs/QmQ3YSqfxunT5QBg6KBVskKyRE26q6hjSMyhpxchpm7jEN/go-path"
 	"gx/ipfs/QmaXvvAVAQ5ABqM5xtjYmV85xmN5MkWAZsX9H9Fwo4FVXp/go-ipfs-files"
 
-	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
-	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	coreiface "github.com/ipfs/interface-go-ipfs-core"
+	opt "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 func (tp *provider) TestName(t *testing.T) {
diff --git a/core/coreiface/tests/object.go b/core/coreiface/tests/object.go
index 2a3b1bd5c..026def73b 100644
--- a/core/coreiface/tests/object.go
+++ b/core/coreiface/tests/object.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ipfs/go-ipfs/core/coreapi/interface"
-	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	"github.com/ipfs/interface-go-ipfs-core"
+	opt "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 func (tp *provider) TestObject(t *testing.T) {
diff --git a/core/coreiface/tests/path.go b/core/coreiface/tests/path.go
index 5594cf0da..01841d869 100644
--- a/core/coreiface/tests/path.go
+++ b/core/coreiface/tests/path.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
-	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	coreiface "github.com/ipfs/interface-go-ipfs-core"
+	"github.com/ipfs/interface-go-ipfs-core/options"
 
 	ipldcbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
 )
diff --git a/core/coreiface/tests/pin.go b/core/coreiface/tests/pin.go
index 35c913618..27ed2ad5d 100644
--- a/core/coreiface/tests/pin.go
+++ b/core/coreiface/tests/pin.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ipfs/go-ipfs/core/coreapi/interface"
-	opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	"github.com/ipfs/interface-go-ipfs-core"
+	opt "github.com/ipfs/interface-go-ipfs-core/options"
 
 	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
 	ipldcbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
diff --git a/core/coreiface/tests/pubsub.go b/core/coreiface/tests/pubsub.go
index b993f51dc..14e3545a9 100644
--- a/core/coreiface/tests/pubsub.go
+++ b/core/coreiface/tests/pubsub.go
@@ -2,10 +2,11 @@ package tests
 
 import (
 	"context"
-	"github.com/ipfs/go-ipfs/core/coreapi/interface"
-	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
 	"testing"
 	"time"
+
+	"github.com/ipfs/interface-go-ipfs-core"
+	"github.com/ipfs/interface-go-ipfs-core/options"
 )
 
 func (tp *provider) TestPubSub(t *testing.T) {
diff --git a/core/coreiface/tests/unixfs.go b/core/coreiface/tests/unixfs.go
index f5ce85b78..cb5897b69 100644
--- a/core/coreiface/tests/unixfs.go
+++ b/core/coreiface/tests/unixfs.go
@@ -15,8 +15,8 @@ import (
 	"sync"
 	"testing"
 
-	coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
-	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	coreiface "github.com/ipfs/interface-go-ipfs-core"
+	"github.com/ipfs/interface-go-ipfs-core/options"
 
 	"gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
 	cbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
diff --git a/core/coreiface/unixfs.go b/core/coreiface/unixfs.go
index 8e559022c..c01ccde78 100644
--- a/core/coreiface/unixfs.go
+++ b/core/coreiface/unixfs.go
@@ -2,7 +2,7 @@ package iface
 
 import (
 	"context"
-	"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
+	"github.com/ipfs/interface-go-ipfs-core/options"
 
 	ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
 	"gx/ipfs/QmZArMcsVDsXdcLbUx4844CuqKXBpbxdeiryM4cnmGTNRq/go-unixfs"