diff --git a/rpc/client/client.go b/rpc/client/client.go
index 01b57512cf4327b7d51ef2127fa9727bce079a9f..1778bf36bd27ce9b7a8d615c2920fbfb151de7eb 100644
--- a/rpc/client/client.go
+++ b/rpc/client/client.go
@@ -3,7 +3,7 @@ package client
 import (
 	rpcclient "github.com/tendermint/go-rpc/client"
 
-	acm "github.com/eris-ltd/eris-db/account"
+	acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
 	ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
 	"github.com/eris-ltd/eris-db/txs"
 )
diff --git a/rpc/core/accounts.go b/rpc/core/accounts.go
index ca236cfb9bbe977e78dddf9a3b1c1650961c9632..07ca8754f461b2d9c4794364bf4fb0ec037b33df 100644
--- a/rpc/core/accounts.go
+++ b/rpc/core/accounts.go
@@ -2,7 +2,7 @@ package core
 
 import (
 	"fmt"
-	acm "github.com/eris-ltd/eris-db/account"
+	acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
 	ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
 	. "github.com/tendermint/go-common"
 )
diff --git a/rpc/core/names.go b/rpc/core/names.go
index 063f07030a09b918ad73f3012dd2eee27fee46ba..8de2243ed90969d8a36057b0a67b2e70dc6c4bcc 100644
--- a/rpc/core/names.go
+++ b/rpc/core/names.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
-	sm "github.com/eris-ltd/eris-db/state"
+	sm "github.com/eris-ltd/eris-db/manager/eris-mint/state"
 	"github.com/eris-ltd/eris-db/txs"
 )
 
diff --git a/rpc/core/net.go b/rpc/core/net.go
index 2198731c5c4b6d3d5d7cf5d61aa3cbf7f6229e8f..7d156af018a36215c8b87a40110b20026e457186 100644
--- a/rpc/core/net.go
+++ b/rpc/core/net.go
@@ -2,7 +2,7 @@ package core
 
 import (
 	ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
-	sm "github.com/eris-ltd/eris-db/state"
+	sm "github.com/eris-ltd/eris-db/manager/eris-mint/state"
 	"github.com/tendermint/tendermint/types"
 
 	dbm "github.com/tendermint/go-db"
diff --git a/rpc/core/pipe.go b/rpc/core/pipe.go
index 23860a03e25ed0a87c9e35e8660f84091b50abba..43f2146058da87a1f3a83577518176ec4fd80322 100644
--- a/rpc/core/pipe.go
+++ b/rpc/core/pipe.go
@@ -1,7 +1,7 @@
 package core
 
 import (
-	stypes "github.com/eris-ltd/eris-db/state/types"
+	stypes "github.com/eris-ltd/eris-db/manager/eris-mint/state/types"
 	"github.com/eris-ltd/eris-db/tmsp"
 
 	bc "github.com/tendermint/tendermint/blockchain"
diff --git a/rpc/core/routes.go b/rpc/core/routes.go
index cb52756937e4082eace6feac630fea7a6401ced0..218d4b19e5668b6edb68cda51c4b1de77947db1a 100644
--- a/rpc/core/routes.go
+++ b/rpc/core/routes.go
@@ -1,7 +1,7 @@
 package core
 
 import (
-	acm "github.com/eris-ltd/eris-db/account"
+	acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
 	ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
 	"github.com/eris-ltd/eris-db/txs"
 	rpc "github.com/tendermint/go-rpc/server"
diff --git a/rpc/core/txs.go b/rpc/core/txs.go
index 2029ce016da32efcb9073324e5dd6f75fac59f87..414fe1383ccd6aef705abb06a6de468cfd5d37ac 100644
--- a/rpc/core/txs.go
+++ b/rpc/core/txs.go
@@ -3,10 +3,10 @@ package core
 import (
 	"fmt"
 
-	acm "github.com/eris-ltd/eris-db/account"
-	"github.com/eris-ltd/eris-db/evm"
+	acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+	"github.com/eris-ltd/eris-db/manager/eris-mint/evm"
 	ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
-	"github.com/eris-ltd/eris-db/state"
+	"github.com/eris-ltd/eris-db/manager/eris-mint/state"
 	"github.com/eris-ltd/eris-db/txs"
 
 	. "github.com/tendermint/go-common"
diff --git a/rpc/core/types/responses.go b/rpc/core/types/responses.go
index d8a9a61b043b66cad9c0fbbbff06cfb791bdc24e..6a544e004d0e1e398a90b303ac8b70ecdb6841f7 100644
--- a/rpc/core/types/responses.go
+++ b/rpc/core/types/responses.go
@@ -1,8 +1,8 @@
 package core_types
 
 import (
-	acm "github.com/eris-ltd/eris-db/account"
-	stypes "github.com/eris-ltd/eris-db/state/types"
+	acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
+	stypes "github.com/eris-ltd/eris-db/manager/eris-mint/state/types"
 	txtypes "github.com/eris-ltd/eris-db/txs"
 	"github.com/tendermint/tendermint/types"
 
diff --git a/rpc/test/helpers.go b/rpc/test/helpers.go
index 98affbdaf4d2fedd85d37ee0636653d918c37f28..50190c324cfc8e588d2cf5a7e0b404ec1a3497e8 100644
--- a/rpc/test/helpers.go
+++ b/rpc/test/helpers.go
@@ -5,12 +5,12 @@ import (
 	"strconv"
 	"testing"
 
-	acm "github.com/eris-ltd/eris-db/account"
+	acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
 	edb "github.com/eris-ltd/eris-db/erisdb"
 	edbcli "github.com/eris-ltd/eris-db/rpc/client"
 	ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
-	sm "github.com/eris-ltd/eris-db/state"
-	stypes "github.com/eris-ltd/eris-db/state/types"
+	sm "github.com/eris-ltd/eris-db/manager/eris-mint/state"
+	stypes "github.com/eris-ltd/eris-db/manager/eris-mint/state/types"
 	edbapp "github.com/eris-ltd/eris-db/tmsp"
 	txs "github.com/eris-ltd/eris-db/txs"