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 c2ebfa113d3f0ee3dbebb4fdea3984bbda83c141..86d99f8a5640d342ff1b8371536a87061fef52a3 100644
--- a/rpc/tendermint/core/accounts.go
+++ b/rpc/tendermint/core/accounts.go
@@ -4,7 +4,7 @@ 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 39e1b8f6650880141221cbe06a1739fb487b5e23..78afb7121b410591928241a2442a839ff4a7c545 100644
--- a/rpc/tendermint/core/mempool.go
+++ b/rpc/tendermint/core/mempool.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"
 	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 d87a19805d0097153849ed1e13e921e00e940618..2842feda6ae5bb13724e45a482e447cffd85502b 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 c3fe2fb413b4437c91c5cb74a35181c133836cdd..ab9ed78414fb049a7b9617c11a8933c6aa8ed3ac 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..2f7489ae664f82db475f4236b36d25c2bc3296ea 100644
--- a/rpc/tendermint/test/helpers.go
+++ b/rpc/tendermint/test/helpers.go
@@ -6,16 +6,16 @@ import (
 	"testing"
 
 	acm "github.com/eris-ltd/eris-db/account"
+	"github.com/eris-ltd/eris-db/server"
 	edb "github.com/eris-ltd/eris-db/core"
 	erismint "github.com/eris-ltd/eris-db/manager/eris-mint"
 	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"
+	edbcli "github.com/eris-ltd/eris-db/rpc/tendermint/client"
+	ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
 	txs "github.com/eris-ltd/eris-db/txs"
 
 	. "github.com/tendermint/go-common"
-	cfg "github.com/tendermint/go-config"
 	"github.com/tendermint/go-crypto"
 	dbm "github.com/tendermint/go-db"
 	"github.com/tendermint/go-events"
@@ -30,7 +30,7 @@ import (
 
 // global variables for use across all tests
 var (
-	config            cfg.Config
+	config            server.ServerConfig
 	node              *nm.Node
 	mempoolCount      = 0
 	chainID           string