diff --git a/client/builder/builder.go b/client/core/core.go
similarity index 99%
rename from client/builder/builder.go
rename to client/core/core.go
index ce8ad04958..0295ae5abd 100644
--- a/client/builder/builder.go
+++ b/client/core/core.go
@@ -1,4 +1,4 @@
-package builder
+package core
 
 import (
 	"fmt"
diff --git a/client/tx/broadcast.go b/client/tx/broadcast.go
index b9367645fe..709364173a 100644
--- a/client/tx/broadcast.go
+++ b/client/tx/broadcast.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/cosmos/cosmos-sdk/client/builder"
+	"github.com/cosmos/cosmos-sdk/client/core"
 )
 
 type BroadcastTxBody struct {
@@ -22,7 +22,7 @@ func BroadcastTxRequestHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	res, err := builder.BroadcastTx([]byte(m.TxBytes))
+	res, err := core.BroadcastTx([]byte(m.TxBytes))
 	if err != nil {
 		w.WriteHeader(500)
 		w.Write([]byte(err.Error()))
diff --git a/examples/democoin/x/cool/commands/tx.go b/examples/democoin/x/cool/commands/tx.go
index ab817309cf..d195071dbd 100644
--- a/examples/democoin/x/cool/commands/tx.go
+++ b/examples/democoin/x/cool/commands/tx.go
@@ -8,7 +8,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/client/builder"
+	"github.com/cosmos/cosmos-sdk/client/core"
 	"github.com/cosmos/cosmos-sdk/wire"
 
 	"github.com/cosmos/cosmos-sdk/examples/democoin/x/cool"
@@ -25,7 +25,7 @@ func QuizTxCmd(cdc *wire.Codec) *cobra.Command {
 			}
 
 			// get the from address from the name flag
-			from, err := builder.GetFromAddress()
+			from, err := core.GetFromAddress()
 			if err != nil {
 				return err
 			}
@@ -37,7 +37,7 @@ func QuizTxCmd(cdc *wire.Codec) *cobra.Command {
 			name := viper.GetString(client.FlagName)
 
 			// build and sign the transaction, then broadcast to Tendermint
-			res, err := builder.SignBuildBroadcast(name, msg, cdc)
+			res, err := core.SignBuildBroadcast(name, msg, cdc)
 			if err != nil {
 				return err
 			}
@@ -59,7 +59,7 @@ func SetTrendTxCmd(cdc *wire.Codec) *cobra.Command {
 			}
 
 			// get the from address from the name flag
-			from, err := builder.GetFromAddress()
+			from, err := core.GetFromAddress()
 			if err != nil {
 				return err
 			}
@@ -71,7 +71,7 @@ func SetTrendTxCmd(cdc *wire.Codec) *cobra.Command {
 			msg := cool.NewSetTrendMsg(from, args[0])
 
 			// build and sign the transaction, then broadcast to Tendermint
-			res, err := builder.SignBuildBroadcast(name, msg, cdc)
+			res, err := core.SignBuildBroadcast(name, msg, cdc)
 			if err != nil {
 				return err
 			}
diff --git a/x/auth/commands/account.go b/x/auth/commands/account.go
index 02af73f167..49d6ec2ab6 100644
--- a/x/auth/commands/account.go
+++ b/x/auth/commands/account.go
@@ -8,7 +8,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/cosmos/cosmos-sdk/client/builder"
+	"github.com/cosmos/cosmos-sdk/client/core"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/wire"
 	"github.com/cosmos/cosmos-sdk/x/auth"
@@ -64,7 +64,7 @@ func (c commander) getAccountCmd(cmd *cobra.Command, args []string) error {
 	}
 	key := sdk.Address(bz)
 
-	res, err := builder.Query(key, c.storeName)
+	res, err := core.Query(key, c.storeName)
 	if err != nil {
 		return err
 	}
diff --git a/x/auth/rest/query.go b/x/auth/rest/query.go
index 22c364ccda..0e73ea02d3 100644
--- a/x/auth/rest/query.go
+++ b/x/auth/rest/query.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/cosmos/cosmos-sdk/client/builder"
+	"github.com/cosmos/cosmos-sdk/client/core"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/wire"
 )
@@ -33,7 +33,7 @@ func QueryAccountRequestHandler(storeName string, cdc *wire.Codec, decoder sdk.A
 		}
 		key := sdk.Address(bz)
 
-		res, err := builder.Query(key, c.storeName)
+		res, err := core.Query(key, c.storeName)
 		if err != nil {
 			w.WriteHeader(http.StatusInternalServerError)
 			w.Write([]byte(fmt.Sprintf("Could't query account. Error: %s", err.Error())))
diff --git a/x/bank/commands/sendtx.go b/x/bank/commands/sendtx.go
index 5619b4d0f3..9dc2daa7df 100644
--- a/x/bank/commands/sendtx.go
+++ b/x/bank/commands/sendtx.go
@@ -8,7 +8,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/client/builder"
+	"github.com/cosmos/cosmos-sdk/client/core"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/wire"
 	"github.com/cosmos/cosmos-sdk/x/bank"
@@ -39,7 +39,7 @@ type Commander struct {
 
 func (c Commander) sendTxCmd(cmd *cobra.Command, args []string) error {
 	// get the from address
-	from, err := builder.GetFromAddress()
+	from, err := core.GetFromAddress()
 	if err != nil {
 		return err
 	}
@@ -66,7 +66,7 @@ func (c Commander) sendTxCmd(cmd *cobra.Command, args []string) error {
 	msg := BuildMsg(from, to, coins)
 
 	// build and sign the transaction, then broadcast to Tendermint
-	res, err := builder.SignBuildBroadcast(name, msg, c.Cdc)
+	res, err := core.SignBuildBroadcast(name, msg, c.Cdc)
 	if err != nil {
 		return err
 	}
diff --git a/x/bank/rest/sendtx.go b/x/bank/rest/sendtx.go
index 85b9dc4d50..c496fc818a 100644
--- a/x/bank/rest/sendtx.go
+++ b/x/bank/rest/sendtx.go
@@ -11,7 +11,7 @@ import (
 	"github.com/tendermint/go-crypto/keys"
 
 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/client/builder"
+	"github.com/cosmos/cosmos-sdk/client/core"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/wire"
 	"github.com/cosmos/cosmos-sdk/x/bank/commands"
@@ -75,7 +75,7 @@ func SendRequestHandler(cdc *wire.Codec, kb keys.Keybase) func(http.ResponseWrit
 		// sign
 		// XXX: OMG
 		viper.Set(client.FlagSequence, m.Sequence)
-		txBytes, err := builder.SignAndBuild(m.LocalAccountName, m.Password, msg, c.Cdc)
+		txBytes, err := core.SignAndBuild(m.LocalAccountName, m.Password, msg, c.Cdc)
 		if err != nil {
 			w.WriteHeader(http.StatusUnauthorized)
 			w.Write([]byte(err.Error()))
@@ -83,7 +83,7 @@ func SendRequestHandler(cdc *wire.Codec, kb keys.Keybase) func(http.ResponseWrit
 		}
 
 		// send
-		res, err := builder.BroadcastTx(txBytes)
+		res, err := core.BroadcastTx(txBytes)
 		if err != nil {
 			w.WriteHeader(http.StatusInternalServerError)
 			w.Write([]byte(err.Error()))
diff --git a/x/ibc/commands/ibctx.go b/x/ibc/commands/ibctx.go
index 4d8476ff16..e063b82b2d 100644
--- a/x/ibc/commands/ibctx.go
+++ b/x/ibc/commands/ibctx.go
@@ -8,7 +8,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/client/builder"
+	"github.com/cosmos/cosmos-sdk/client/core"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	wire "github.com/cosmos/cosmos-sdk/wire"
@@ -40,7 +40,7 @@ type sendCommander struct {
 
 func (c sendCommander) sendIBCTransfer(cmd *cobra.Command, args []string) error {
 	// get the from address
-	from, err := builder.GetFromAddress()
+	from, err := core.GetFromAddress()
 	if err != nil {
 		return err
 	}
@@ -54,7 +54,7 @@ func (c sendCommander) sendIBCTransfer(cmd *cobra.Command, args []string) error
 	// get password
 	name := viper.GetString(client.FlagName)
 
-	res, err := builder.SignBuildBroadcast(name, msg, c.cdc)
+	res, err := core.SignBuildBroadcast(name, msg, c.cdc)
 	if err != nil {
 		return err
 	}
diff --git a/x/ibc/commands/relay.go b/x/ibc/commands/relay.go
index 9170248118..305b09d877 100644
--- a/x/ibc/commands/relay.go
+++ b/x/ibc/commands/relay.go
@@ -10,7 +10,7 @@ import (
 	"github.com/tendermint/tmlibs/log"
 
 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/client/builder"
+	"github.com/cosmos/cosmos-sdk/client/core"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	wire "github.com/cosmos/cosmos-sdk/wire"
@@ -74,7 +74,7 @@ func (c relayCommander) runIBCRelay(cmd *cobra.Command, args []string) {
 	fromChainNode := viper.GetString(FlagFromChainNode)
 	toChainID := viper.GetString(FlagToChainID)
 	toChainNode := viper.GetString(FlagToChainNode)
-	address, err := builder.GetFromAddress()
+	address, err := core.GetFromAddress()
 	if err != nil {
 		panic(err)
 	}
@@ -86,7 +86,7 @@ func (c relayCommander) runIBCRelay(cmd *cobra.Command, args []string) {
 func (c relayCommander) loop(fromChainID, fromChainNode, toChainID, toChainNode string) {
 	// get password
 	name := viper.GetString(client.FlagName)
-	passphrase, err := builder.GetPassphraseFromStdin(name)
+	passphrase, err := core.GetPassphraseFromStdin(name)
 	if err != nil {
 		panic(err)
 	}
@@ -150,16 +150,16 @@ OUTER:
 func query(node string, key []byte, storeName string) (res []byte, err error) {
 	orig := viper.GetString(client.FlagNode)
 	viper.Set(client.FlagNode, node)
-	res, err = builder.Query(key, storeName)
+	res, err = core.Query(key, storeName)
 	viper.Set(client.FlagNode, orig)
 	return res, err
 }
 
 func (c relayCommander) broadcastTx(node string, tx []byte) error {
-	orig := viper.GetString(client.FlagNode)
 	viper.Set(client.FlagNode, node)
-	_, err := builder.BroadcastTx(tx)
-	viper.Set(client.FlagNode, orig)
+	seq := c.getSequence(node) + 1
+	viper.Set(client.FlagSequence, seq)
+	_, err := core.BroadcastTx(tx)
 	return err
 }
 
@@ -194,7 +194,7 @@ func (c relayCommander) refine(bz []byte, sequence int64, passphrase string) []b
 	}
 
 	name := viper.GetString(client.FlagName)
-	res, err := builder.SignAndBuild(name, passphrase, msg, c.cdc)
+	res, err := core.SignAndBuild(name, passphrase, msg, c.cdc)
 	if err != nil {
 		panic(err)
 	}
diff --git a/x/ibc/rest/transfer.go b/x/ibc/rest/transfer.go
index f47159160e..974b6edd90 100644
--- a/x/ibc/rest/transfer.go
+++ b/x/ibc/rest/transfer.go
@@ -11,7 +11,7 @@ import (
 	"github.com/tendermint/go-crypto/keys"
 
 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/client/builder"
+	"github.com/cosmos/cosmos-sdk/client/core"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/wire"
 	"github.com/cosmos/cosmos-sdk/x/bank/commands"
@@ -73,7 +73,7 @@ func TransferRequestHandler(cdc *wire.Codec, kb keys.Keybase) func(http.Response
 		// sign
 		// XXX: OMG
 		viper.Set(client.FlagSequence, m.Sequence)
-		txBytes, err := builder.SignAndBuild(m.LocalAccountName, m.Password, msg, c.Cdc)
+		txBytes, err := core.SignAndBuild(m.LocalAccountName, m.Password, msg, c.Cdc)
 		if err != nil {
 			w.WriteHeader(http.StatusUnauthorized)
 			w.Write([]byte(err.Error()))
@@ -81,7 +81,7 @@ func TransferRequestHandler(cdc *wire.Codec, kb keys.Keybase) func(http.Response
 		}
 
 		// send
-		res, err := builder.BroadcastTx(txBytes)
+		res, err := core.BroadcastTx(txBytes)
 		if err != nil {
 			w.WriteHeader(http.StatusInternalServerError)
 			w.Write([]byte(err.Error()))
diff --git a/x/simplestake/commands/commands.go b/x/simplestake/commands/commands.go
index 19d6cddbf9..bf35f545a1 100644
--- a/x/simplestake/commands/commands.go
+++ b/x/simplestake/commands/commands.go
@@ -10,7 +10,7 @@ import (
 	crypto "github.com/tendermint/go-crypto"
 
 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/client/builder"
+	"github.com/cosmos/cosmos-sdk/client/core"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/wire"
 	"github.com/cosmos/cosmos-sdk/x/simplestake"
@@ -48,7 +48,7 @@ type commander struct {
 }
 
 func (co commander) bondTxCmd(cmd *cobra.Command, args []string) error {
-	from, err := builder.GetFromAddress()
+	from, err := core.GetFromAddress()
 	if err != nil {
 		return err
 	}
@@ -82,7 +82,7 @@ func (co commander) bondTxCmd(cmd *cobra.Command, args []string) error {
 }
 
 func (co commander) unbondTxCmd(cmd *cobra.Command, args []string) error {
-	from, err := builder.GetFromAddress()
+	from, err := core.GetFromAddress()
 	if err != nil {
 		return err
 	}
@@ -94,7 +94,7 @@ func (co commander) unbondTxCmd(cmd *cobra.Command, args []string) error {
 
 func (co commander) sendMsg(msg sdk.Msg) error {
 	name := viper.GetString(client.FlagName)
-	res, err := builder.SignBuildBroadcast(name, msg, co.cdc)
+	res, err := core.SignBuildBroadcast(name, msg, co.cdc)
 	if err != nil {
 		return err
 	}
diff --git a/x/stake/commands/query.go b/x/stake/commands/query.go
index ed436305c3..474f5438ba 100644
--- a/x/stake/commands/query.go
+++ b/x/stake/commands/query.go
@@ -11,7 +11,7 @@ import (
 
 	crypto "github.com/tendermint/go-crypto"
 
-	"github.com/cosmos/cosmos-sdk/client/builder"
+	"github.com/cosmos/cosmos-sdk/client/core"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/wire" // XXX fix
 	"github.com/cosmos/cosmos-sdk/x/stake"
@@ -47,7 +47,7 @@ func GetCmdQueryCandidates(cdc *wire.Codec, storeName string) *cobra.Command {
 
 			key := PrefixedKey(stake.MsgType, stake.CandidatesKey)
 
-			res, err := builder.Query(key, storeName)
+			res, err := core.Query(key, storeName)
 			if err != nil {
 				return err
 			}
@@ -87,7 +87,7 @@ func GetCmdQueryCandidate(cdc *wire.Codec, storeName string) *cobra.Command {
 
 			key := PrefixedKey(stake.MsgType, stake.GetCandidateKey(addr))
 
-			res, err := builder.Query(key, storeName)
+			res, err := core.Query(key, storeName)
 			if err != nil {
 				return err
 			}
@@ -133,7 +133,7 @@ func GetCmdQueryDelegatorBond(cdc *wire.Codec, storeName string) *cobra.Command
 
 			key := PrefixedKey(stake.MsgType, stake.GetDelegatorBondKey(delegator, addr, cdc))
 
-			res, err := builder.Query(key, storeName)
+			res, err := core.Query(key, storeName)
 			if err != nil {
 				return err
 			}
@@ -175,7 +175,7 @@ func GetCmdQueryDelegatorBonds(cdc *wire.Codec, storeName string) *cobra.Command
 
 			key := PrefixedKey(stake.MsgType, stake.GetDelegatorBondsKey(delegator, cdc))
 
-			res, err := builder.Query(key, storeName)
+			res, err := core.Query(key, storeName)
 			if err != nil {
 				return err
 			}
diff --git a/x/stake/commands/tx.go b/x/stake/commands/tx.go
index 90b289de79..732743dda7 100644
--- a/x/stake/commands/tx.go
+++ b/x/stake/commands/tx.go
@@ -11,7 +11,7 @@ import (
 	crypto "github.com/tendermint/go-crypto"
 
 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/client/builder"
+	"github.com/cosmos/cosmos-sdk/client/core"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/wire"
 	"github.com/cosmos/cosmos-sdk/x/stake"
@@ -93,7 +93,7 @@ func GetCmdDeclareCandidacy(cdc *wire.Codec) *cobra.Command {
 
 			// build and sign the transaction, then broadcast to Tendermint
 			name := viper.GetString(client.FlagName)
-			res, err := builder.SignBuildBroadcast(name, msg, cdc)
+			res, err := core.SignBuildBroadcast(name, msg, cdc)
 			if err != nil {
 				return err
 			}
@@ -130,7 +130,7 @@ func GetCmdEditCandidacy(cdc *wire.Codec) *cobra.Command {
 
 			// build and sign the transaction, then broadcast to Tendermint
 			name := viper.GetString(client.FlagName)
-			res, err := builder.SignBuildBroadcast(name, msg, cdc)
+			res, err := core.SignBuildBroadcast(name, msg, cdc)
 			if err != nil {
 				return err
 			}
@@ -166,7 +166,7 @@ func GetCmdDelegate(cdc *wire.Codec) *cobra.Command {
 
 			// build and sign the transaction, then broadcast to Tendermint
 			name := viper.GetString(client.FlagName)
-			res, err := builder.SignBuildBroadcast(name, msg, cdc)
+			res, err := core.SignBuildBroadcast(name, msg, cdc)
 			if err != nil {
 				return err
 			}
@@ -213,7 +213,7 @@ func GetCmdUnbond(cdc *wire.Codec) *cobra.Command {
 
 			// build and sign the transaction, then broadcast to Tendermint
 			name := viper.GetString(client.FlagName)
-			res, err := builder.SignBuildBroadcast(name, msg, cdc)
+			res, err := core.SignBuildBroadcast(name, msg, cdc)
 			if err != nil {
 				return err
 			}