diff --git a/erisdb/erisdbss/http.go b/erisdb/erisdbss/http.go
index d01865ea8965e10f182e5c42756cc8f433a97c76..f738e9b5fa84bef63ccf200bc42ced4532c55ddb 100644
--- a/erisdb/erisdbss/http.go
+++ b/erisdb/erisdbss/http.go
@@ -7,7 +7,7 @@ import (
 	"os"
 
 	"github.com/eris-ltd/eris-db/config"
-	stypes "github.com/eris-ltd/eris-db/state/types"
+	stypes "github.com/eris-ltd/eris-db/manager/eris-mint/state/types"
 	"github.com/gin-gonic/gin"
 	. "github.com/tendermint/go-common"
 	"github.com/tendermint/go-wire"
diff --git a/erisdb/params.go b/erisdb/params.go
index 7c68fe2f6cf74bb76a335354b501436816b5843c..4abac581a10e572274c7f6858cd575e170f14b60 100644
--- a/erisdb/params.go
+++ b/erisdb/params.go
@@ -1,7 +1,7 @@
 package erisdb
 
 import (
-	"github.com/eris-ltd/eris-db/account"
+	"github.com/eris-ltd/eris-db/manager/eris-mint/account"
 	"github.com/eris-ltd/eris-db/erisdb/pipe"
 	"github.com/eris-ltd/eris-db/txs"
 )
diff --git a/erisdb/pipe/accounts.go b/erisdb/pipe/accounts.go
index c7ca785701157d31c2aebfd89cb0d2cb574589bb..138a13a7779e42fea490d64cf2e22a628565ecc6 100644
--- a/erisdb/pipe/accounts.go
+++ b/erisdb/pipe/accounts.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"sync"
 
-	acm "github.com/eris-ltd/eris-db/account"
+	acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
 	cmn "github.com/tendermint/go-common"
 
 	"github.com/eris-ltd/eris-db/tmsp"
diff --git a/erisdb/pipe/blockchain.go b/erisdb/pipe/blockchain.go
index 9a4d05a52409413982dcc392b778bb4fb4dffa07..da379df6cea89b527b52f918090e3b63e1ed24fa 100644
--- a/erisdb/pipe/blockchain.go
+++ b/erisdb/pipe/blockchain.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/eris-ltd/eris-db/state"
+	"github.com/eris-ltd/eris-db/manager/eris-mint/state"
 	dbm "github.com/tendermint/go-db"
 	"github.com/tendermint/tendermint/types"
 )
diff --git a/erisdb/pipe/namereg.go b/erisdb/pipe/namereg.go
index 87cf1d27e22dff5945afd3604bbadadf0fe59457..fce9f79e7f03ecb023890775722546fc3808fff2 100644
--- a/erisdb/pipe/namereg.go
+++ b/erisdb/pipe/namereg.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"sync"
 
-	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/tmsp"
 	"github.com/eris-ltd/eris-db/txs"
 )
diff --git a/erisdb/pipe/pipe.go b/erisdb/pipe/pipe.go
index b13380e6b2e63396620a19c77376ab46d3f1ef88..160b3e2947a31e8fb7ed1c44a6c68ae2fc97b3fd 100644
--- a/erisdb/pipe/pipe.go
+++ b/erisdb/pipe/pipe.go
@@ -5,7 +5,7 @@ import (
 	em "github.com/tendermint/go-events"
 	"github.com/tendermint/tendermint/types"
 
-	"github.com/eris-ltd/eris-db/account"
+	"github.com/eris-ltd/eris-db/manager/eris-mint/account"
 	"github.com/eris-ltd/eris-db/tmsp"
 	txs "github.com/eris-ltd/eris-db/txs"
 )
diff --git a/erisdb/pipe/transactor.go b/erisdb/pipe/transactor.go
index 8ae73ef429881383fa530f33e9a4bd09e390e565..92cdccfc2af4efd10a3d27b0961b8f6a04f710f8 100644
--- a/erisdb/pipe/transactor.go
+++ b/erisdb/pipe/transactor.go
@@ -7,9 +7,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/eris-ltd/eris-db/account"
-	"github.com/eris-ltd/eris-db/evm"
-	"github.com/eris-ltd/eris-db/state"
+	"github.com/eris-ltd/eris-db/manager/eris-mint/account"
+	"github.com/eris-ltd/eris-db/manager/eris-mint/evm"
+	"github.com/eris-ltd/eris-db/manager/eris-mint/state"
 	"github.com/eris-ltd/eris-db/txs"
 
 	cmn "github.com/tendermint/go-common"
diff --git a/erisdb/pipe/types.go b/erisdb/pipe/types.go
index d8e6be8e46f859951688d9fd32eb915bc7dd6613..a0261449a4769578e10be35e9c1ea02164751868 100644
--- a/erisdb/pipe/types.go
+++ b/erisdb/pipe/types.go
@@ -1,7 +1,7 @@
 package pipe
 
 import (
-	"github.com/eris-ltd/eris-db/account"
+	"github.com/eris-ltd/eris-db/manager/eris-mint/account"
 	txs "github.com/eris-ltd/eris-db/txs"
 
 	"github.com/tendermint/go-p2p" // NodeInfo (drop this!)
diff --git a/erisdb/serve.go b/erisdb/serve.go
index 8f8a8c36d09b3614ba02e18aaf53a0f30d3f3a28..f79b73e943e3ea2f6c89256f9102193e6b6c9ab0 100644
--- a/erisdb/serve.go
+++ b/erisdb/serve.go
@@ -35,8 +35,8 @@ import (
 	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
 	rpccore "github.com/eris-ltd/eris-db/rpc/core"
 	"github.com/eris-ltd/eris-db/server"
-	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"
 
 	tmcfg "github.com/tendermint/tendermint/config/tendermint" // for inproc only!