diff --git a/cmd/serve.go b/cmd/serve.go
index c0edf7251cca34b3def67eb849d6ffa799923607..0f560031deb931f4110f13828846c16514274928 100644
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -135,7 +135,7 @@ func Serve(cmd *cobra.Command, args []string) {
     log.Fatalf("Failed to load server configuration: %s.", err)
     os.Exit(1)
   }
-  serverProcess, err := newCore.NewGateway(serverConfig)
+  serverProcess, err := newCore.NewGatewayV0(serverConfig)
   if err != nil {
     log.Fatalf("Failed to load servers: %s.", err)
     os.Exit(1)
diff --git a/core/core.go b/core/core.go
index 43d0bb3a68542aedf3a8938b0828df3cb942a178..f71559be2d2437db6a57f9a5fc981023eb1e8b8a 100644
--- a/core/core.go
+++ b/core/core.go
@@ -78,7 +78,7 @@ func NewCore(chainId string, consensusConfig *config.ModuleConfig,
 // NOTE: [ben] in phase 0 we exactly take over the full server architecture
 // from Eris-DB and Tendermint; This is a draft and will be overhauled.
 
-func (core *Core) NewGateway(config *server.ServerConfig) (*server.ServeProcess,
+func (core *Core) NewGatewayV0(config *server.ServerConfig) (*server.ServeProcess,
   error) {
   codec := &rpc_v0.TCodec{}
   eventSubscriptions := event.NewEventSubscriptions(core.pipe.Events())
diff --git a/rpc/tendermint/client/client.go b/rpc/tendermint/client/client.go
index 01b57512cf4327b7d51ef2127fa9727bce079a9f..a8efbc20508de1e96b4e91db1ce98b24d4451298 100644
--- a/rpc/tendermint/client/client.go
+++ b/rpc/tendermint/client/client.go
@@ -4,7 +4,7 @@ import (
 	rpcclient "github.com/tendermint/go-rpc/client"
 
 	acm "github.com/eris-ltd/eris-db/account"
-	ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
+	ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
 	"github.com/eris-ltd/eris-db/txs"
 )
 
diff --git a/rpc/tendermint/core/accounts.go b/rpc/tendermint/core/accounts.go
index ca236cfb9bbe977e78dddf9a3b1c1650961c9632..b5e67d7d6c0741fe487931dfc31172670ef4c619 100644
--- a/rpc/tendermint/core/accounts.go
+++ b/rpc/tendermint/core/accounts.go
@@ -3,7 +3,7 @@ package core
 import (
 	"fmt"
 	acm "github.com/eris-ltd/eris-db/account"
-	ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
+	ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
 	. "github.com/tendermint/go-common"
 )
 
diff --git a/rpc/tendermint/core/mempool.go b/rpc/tendermint/core/mempool.go
index 47025a085cac7505661b8da16d14e31ce0262881..eb71714908bb4985aafa6ac007cbaad4ca24a065 100644
--- a/rpc/tendermint/core/mempool.go
+++ b/rpc/tendermint/core/mempool.go
@@ -2,7 +2,7 @@ package core
 
 import (
 	"fmt"
-	ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
+	ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
 	txs "github.com/eris-ltd/eris-db/txs"
 	"github.com/tendermint/tendermint/types"
 	tmsp "github.com/tendermint/tmsp/types"
diff --git a/rpc/tendermint/core/names.go b/rpc/tendermint/core/names.go
index 8de2243ed90969d8a36057b0a67b2e70dc6c4bcc..da9e74fcd50131c4b7ae182adb86aed7b85aa951 100644
--- a/rpc/tendermint/core/names.go
+++ b/rpc/tendermint/core/names.go
@@ -3,7 +3,7 @@ package core
 import (
 	"fmt"
 
-	ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
+	ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
 	sm "github.com/eris-ltd/eris-db/manager/eris-mint/state"
 	"github.com/eris-ltd/eris-db/txs"
 )
diff --git a/rpc/tendermint/core/net.go b/rpc/tendermint/core/net.go
index 7d156af018a36215c8b87a40110b20026e457186..ae06c6033e0e6f6c42bec0ef6d22ab98dca4d56f 100644
--- a/rpc/tendermint/core/net.go
+++ b/rpc/tendermint/core/net.go
@@ -1,7 +1,7 @@
 package core
 
 import (
-	ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
+	ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
 	sm "github.com/eris-ltd/eris-db/manager/eris-mint/state"
 	"github.com/tendermint/tendermint/types"
 
diff --git a/rpc/tendermint/core/routes.go b/rpc/tendermint/core/routes.go
index cb52756937e4082eace6feac630fea7a6401ced0..15b21125ab6bc3e37ee91812bafa7474fe7b189a 100644
--- a/rpc/tendermint/core/routes.go
+++ b/rpc/tendermint/core/routes.go
@@ -2,7 +2,7 @@ package core
 
 import (
 	acm "github.com/eris-ltd/eris-db/account"
-	ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
+	ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
 	"github.com/eris-ltd/eris-db/txs"
 	rpc "github.com/tendermint/go-rpc/server"
 )
diff --git a/rpc/tendermint/core/txs.go b/rpc/tendermint/core/txs.go
index 527c21112dcd8c6fed3cc3dcb77b442bb0e9ebd5..4bbe01ead4034a44c39961e5f1be689fe1e88394 100644
--- a/rpc/tendermint/core/txs.go
+++ b/rpc/tendermint/core/txs.go
@@ -5,7 +5,7 @@ import (
 
 	acm "github.com/eris-ltd/eris-db/account"
 	"github.com/eris-ltd/eris-db/manager/eris-mint/evm"
-	ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
+	ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
 	"github.com/eris-ltd/eris-db/manager/eris-mint/state"
 	"github.com/eris-ltd/eris-db/txs"
 
diff --git a/rpc/tendermint/test/helpers.go b/rpc/tendermint/test/helpers.go
index 11647e64ddf3ce5f647bbbb257a48e9f0368d935..cc2b66f5eb9343413cb50d7fa86765267eca01d4 100644
--- a/rpc/tendermint/test/helpers.go
+++ b/rpc/tendermint/test/helpers.go
@@ -11,7 +11,7 @@ import (
 	sm "github.com/eris-ltd/eris-db/manager/eris-mint/state"
 	stypes "github.com/eris-ltd/eris-db/manager/eris-mint/state/types"
 	edbcli "github.com/eris-ltd/eris-db/rpc/client"
-	ctypes "github.com/eris-ltd/eris-db/rpc/core/types"
+	ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
 	txs "github.com/eris-ltd/eris-db/txs"
 
 	. "github.com/tendermint/go-common"