diff --git a/manager/eris-mint/eris-mint.go b/manager/eris-mint/eris-mint.go
index e12fe1439c430b38f5534e2e7dfee52ba687a86f..00c8bfbb15374dc93ff004dfc79a6834e71b9d24 100644
--- a/manager/eris-mint/eris-mint.go
+++ b/manager/eris-mint/eris-mint.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"sync"
 
-	sm "github.com/eris-ltd/eris-db/state"
+	sm "github.com/eris-ltd/eris-db/manager/eris-mint/state"
 	types "github.com/eris-ltd/eris-db/txs"
 
 	"github.com/tendermint/go-events"
diff --git a/manager/eris-mint/evm/test/fake_app_state.go b/manager/eris-mint/evm/test/fake_app_state.go
index 9204218fcfe1b72107d359b975cb7c49e7046af5..c910a1c3cbad0afc4ef7445d8622e74b20dac9f5 100644
--- a/manager/eris-mint/evm/test/fake_app_state.go
+++ b/manager/eris-mint/evm/test/fake_app_state.go
@@ -2,8 +2,8 @@ package vm
 
 import (
 	. "github.com/tendermint/go-common"
-	. "github.com/eris-ltd/eris-db/evm"
-	"github.com/eris-ltd/eris-db/evm/sha3"
+	. "github.com/eris-ltd/eris-db/manager/eris-mint/evm"
+	"github.com/eris-ltd/eris-db/manager/eris-mint/evm/sha3"
 )
 
 type FakeAppState struct {
diff --git a/manager/eris-mint/evm/test/log_event_test.go b/manager/eris-mint/evm/test/log_event_test.go
index 0d7b308c9be44a3c83e128ed9c02bfad6e2ac174..302f2912571e87d7f605f0370b81e7f66f32ec07 100644
--- a/manager/eris-mint/evm/test/log_event_test.go
+++ b/manager/eris-mint/evm/test/log_event_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	. "github.com/eris-ltd/eris-db/evm"
+	. "github.com/eris-ltd/eris-db/manager/eris-mint/evm"
 	"github.com/eris-ltd/eris-db/txs"
 	. "github.com/tendermint/go-common"
 	"github.com/tendermint/go-events"
diff --git a/manager/eris-mint/evm/test/vm_test.go b/manager/eris-mint/evm/test/vm_test.go
index 83bbed3a7d11cbff525b3fa0d72ac10a56e33bd8..11686e63a9676e837511dccd87ef2476cbe721e8 100644
--- a/manager/eris-mint/evm/test/vm_test.go
+++ b/manager/eris-mint/evm/test/vm_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/eris-ltd/eris-db/evm"
+	. "github.com/eris-ltd/eris-db/manager/eris-mint/evm"
 	ptypes "github.com/eris-ltd/eris-db/permission/types"
 	"github.com/eris-ltd/eris-db/txs"
 	. "github.com/tendermint/go-common"
diff --git a/manager/eris-mint/evm/vm.go b/manager/eris-mint/evm/vm.go
index e96de42d13c83e58e22c75c82e02756bff536a92..d1c50df6937b3c4291353dc891d012377efb3d38 100644
--- a/manager/eris-mint/evm/vm.go
+++ b/manager/eris-mint/evm/vm.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/eris-ltd/eris-db/evm/sha3"
+	"github.com/eris-ltd/eris-db/manager/eris-mint/evm/sha3"
 	ptypes "github.com/eris-ltd/eris-db/permission/types"
 	"github.com/eris-ltd/eris-db/txs"
 	. "github.com/tendermint/go-common"
diff --git a/manager/eris-mint/state/block_cache.go b/manager/eris-mint/state/block_cache.go
index 1cefa6a3b18b996800a2d89e0670675ee14dd1d2..92f8d7cbab50de53b282fbf54ea553aafaa1788d 100644
--- a/manager/eris-mint/state/block_cache.go
+++ b/manager/eris-mint/state/block_cache.go
@@ -8,7 +8,7 @@ import (
 	dbm "github.com/tendermint/go-db"
 	"github.com/tendermint/go-merkle"
 
-	acm "github.com/eris-ltd/eris-db/account"
+	acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
 	"github.com/eris-ltd/eris-db/txs"
 )
 
diff --git a/manager/eris-mint/state/common.go b/manager/eris-mint/state/common.go
index 1f572a2108044082d9be6fbb0229af6a8418286f..6309a87f1383a713cea495c0c2019b9ae9fabf13 100644
--- a/manager/eris-mint/state/common.go
+++ b/manager/eris-mint/state/common.go
@@ -2,8 +2,8 @@ package state
 
 import (
 	. "github.com/tendermint/go-common"
-	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"
 )
 
 type AccountGetter interface {
diff --git a/manager/eris-mint/state/execution.go b/manager/eris-mint/state/execution.go
index 7247dd5057a7e5d2d5e43afcb3e9b66eb346cec6..6320acd3cff891c12aec870f50da6a00d5b90fcc 100644
--- a/manager/eris-mint/state/execution.go
+++ b/manager/eris-mint/state/execution.go
@@ -8,8 +8,8 @@ import (
 	. "github.com/tendermint/go-common"
 	"github.com/tendermint/go-events"
 
-	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"
 	ptypes "github.com/eris-ltd/eris-db/permission/types" // for GlobalPermissionAddress ...
 
 	"github.com/eris-ltd/eris-db/txs"
diff --git a/manager/eris-mint/state/genesis_test.go b/manager/eris-mint/state/genesis_test.go
index 05f16cae8054af645585076ef15c5b9ecae61b57..304ed79cccf3bdad123b8b10583081c224a70044 100644
--- a/manager/eris-mint/state/genesis_test.go
+++ b/manager/eris-mint/state/genesis_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	ptypes "github.com/eris-ltd/eris-db/permission/types"
-	. "github.com/eris-ltd/eris-db/state/types"
+	. "github.com/eris-ltd/eris-db/manager/eris-mint/state/types"
 	tdb "github.com/tendermint/go-db"
 )
 
diff --git a/manager/eris-mint/state/permissions_test.go b/manager/eris-mint/state/permissions_test.go
index 46aa570a7fb6dda0ef56e9416bd77a49eb4f8a97..6b18854e9bf4448ad24feed807e574ae28d0aadf 100644
--- a/manager/eris-mint/state/permissions_test.go
+++ b/manager/eris-mint/state/permissions_test.go
@@ -8,9 +8,9 @@ import (
 	"testing"
 	"time"
 
-	acm "github.com/eris-ltd/eris-db/account"
+	acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
 	ptypes "github.com/eris-ltd/eris-db/permission/types"
-	. "github.com/eris-ltd/eris-db/state/types"
+	. "github.com/eris-ltd/eris-db/manager/eris-mint/state/types"
 	"github.com/eris-ltd/eris-db/txs"
 
 	. "github.com/tendermint/go-common"
diff --git a/manager/eris-mint/state/state.go b/manager/eris-mint/state/state.go
index aea7f949539bff8f3987b3dd1f316d5d4e7fe090..2051fa327dae060e025efb3557d27901754964c9 100644
--- a/manager/eris-mint/state/state.go
+++ b/manager/eris-mint/state/state.go
@@ -6,9 +6,9 @@ import (
 	"io/ioutil"
 	"time"
 
-	acm "github.com/eris-ltd/eris-db/account"
+	acm "github.com/eris-ltd/eris-db/manager/eris-mint/account"
 	ptypes "github.com/eris-ltd/eris-db/permission/types"
-	. "github.com/eris-ltd/eris-db/state/types"
+	. "github.com/eris-ltd/eris-db/manager/eris-mint/state/types"
 	txs "github.com/eris-ltd/eris-db/txs"
 
 	. "github.com/tendermint/go-common"
diff --git a/manager/eris-mint/state/tx_cache.go b/manager/eris-mint/state/tx_cache.go
index 292c35314966cbb450e45d0dd55da500462da673..18eca782c4a8faba1bc243a8c45449cdfc45fdb0 100644
--- a/manager/eris-mint/state/tx_cache.go
+++ b/manager/eris-mint/state/tx_cache.go
@@ -1,8 +1,8 @@
 package state
 
 import (
-	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"
 	ptypes "github.com/eris-ltd/eris-db/permission/types" // for GlobalPermissionAddress ...
 	"github.com/eris-ltd/eris-db/txs"