diff --git a/client/tx/tx_test.go b/client/tx/tx_test.go
index 55758a0f1..ec9830a60 100644
--- a/client/tx/tx_test.go
+++ b/client/tx/tx_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/cosmos/cosmos-sdk/codec"
-	"github.com/cosmos/cosmos-sdk/codec/std"
+	"github.com/cosmos/cosmos-sdk/std"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/bank"
 )
diff --git a/codec/std/doc.go b/codec/std/doc.go
deleted file mode 100644
index 9b57bd591..000000000
--- a/codec/std/doc.go
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-Package std defines all the common and standard Cosmos SDK Protocol Buffer
-message definitions and type implementations. The std package defines and exposes
-a single concrete Codec type that implements all the necessary module codec
-interfaces along with all the types necessary to use those modules.
-
-Applications can choose to either use the codec directly or even extend it without
-having the need to redefine all the message and type implementations.
-*/
-package std
diff --git a/simapp/app.go b/simapp/app.go
index 71104982f..0f77240da 100644
--- a/simapp/app.go
+++ b/simapp/app.go
@@ -11,7 +11,6 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/std"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
@@ -141,8 +140,8 @@ func NewSimApp(
 ) *SimApp {
 
 	// TODO: Remove cdc in favor of appCodec once all modules are migrated.
-	cdc := codecstd.MakeCodec(ModuleBasics)
-	appCodec := codecstd.NewAppCodec(cdc)
+	cdc := std.MakeCodec(ModuleBasics)
+	appCodec := std.NewAppCodec(cdc)
 
 	bApp := baseapp.NewBaseApp(appName, logger, db, auth.DefaultTxDecoder(cdc), baseAppOptions...)
 	bApp.SetCommitMultiStoreTracer(traceStore)
diff --git a/simapp/cmd/simcli/main.go b/simapp/cmd/simcli/main.go
index 00f0ab231..fb61c810d 100644
--- a/simapp/cmd/simcli/main.go
+++ b/simapp/cmd/simcli/main.go
@@ -5,6 +5,8 @@ import (
 	"os"
 	"path"
 
+	"github.com/cosmos/cosmos-sdk/std"
+
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/tendermint/go-amino"
@@ -15,7 +17,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/keys"
 	"github.com/cosmos/cosmos-sdk/client/lcd"
 	"github.com/cosmos/cosmos-sdk/client/rpc"
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authclient "github.com/cosmos/cosmos-sdk/x/auth/client"
@@ -25,8 +26,8 @@ import (
 )
 
 var (
-	cdc      = codecstd.MakeCodec(simapp.ModuleBasics)
-	appCodec = codecstd.NewAppCodec(cdc)
+	cdc      = std.MakeCodec(simapp.ModuleBasics)
+	appCodec = std.NewAppCodec(cdc)
 )
 
 func init() {
diff --git a/simapp/cmd/simd/genaccounts.go b/simapp/cmd/simd/genaccounts.go
index a4085ca01..98efeedc7 100644
--- a/simapp/cmd/simd/genaccounts.go
+++ b/simapp/cmd/simd/genaccounts.go
@@ -5,6 +5,8 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/cosmos/cosmos-sdk/std"
+
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
@@ -12,7 +14,6 @@ import (
 	"github.com/tendermint/tendermint/libs/cli"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	"github.com/cosmos/cosmos-sdk/server"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -32,7 +33,7 @@ const (
 
 // AddGenesisAccountCmd returns add-genesis-account cobra Command.
 func AddGenesisAccountCmd(
-	ctx *server.Context, depCdc *amino.Codec, cdc *codecstd.Codec, defaultNodeHome, defaultClientHome string,
+	ctx *server.Context, depCdc *amino.Codec, cdc *std.Codec, defaultNodeHome, defaultClientHome string,
 ) *cobra.Command {
 
 	cmd := &cobra.Command{
diff --git a/simapp/cmd/simd/main.go b/simapp/cmd/simd/main.go
index ab9278cf5..cd393eeaa 100644
--- a/simapp/cmd/simd/main.go
+++ b/simapp/cmd/simd/main.go
@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"io"
 
+	"github.com/cosmos/cosmos-sdk/std"
+
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	abci "github.com/tendermint/tendermint/abci/types"
@@ -15,7 +17,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client/debug"
 	"github.com/cosmos/cosmos-sdk/client/flags"
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/server"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	"github.com/cosmos/cosmos-sdk/store"
@@ -30,8 +31,8 @@ const flagInvCheckPeriod = "inv-check-period"
 var invCheckPeriod uint
 
 func main() {
-	cdc := codecstd.MakeCodec(simapp.ModuleBasics)
-	appCodec := codecstd.NewAppCodec(cdc)
+	cdc := std.MakeCodec(simapp.ModuleBasics)
+	appCodec := std.NewAppCodec(cdc)
 
 	config := sdk.GetConfig()
 	config.SetBech32PrefixForAccount(sdk.Bech32PrefixAccAddr, sdk.Bech32PrefixAccPub)
diff --git a/simapp/genesis.go b/simapp/genesis.go
index c7432aab1..d3ff8cda9 100644
--- a/simapp/genesis.go
+++ b/simapp/genesis.go
@@ -3,7 +3,7 @@ package simapp
 import (
 	"encoding/json"
 
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
+	"github.com/cosmos/cosmos-sdk/std"
 )
 
 // The genesis state of the blockchain is represented here as a map of raw json
@@ -17,6 +17,6 @@ type GenesisState map[string]json.RawMessage
 
 // NewDefaultGenesisState generates the default state for the application.
 func NewDefaultGenesisState() GenesisState {
-	cdc := codecstd.MakeCodec(ModuleBasics)
+	cdc := std.MakeCodec(ModuleBasics)
 	return ModuleBasics.DefaultGenesis(cdc)
 }
diff --git a/simapp/utils_test.go b/simapp/utils_test.go
index c1f36e3c7..45ab3b693 100644
--- a/simapp/utils_test.go
+++ b/simapp/utils_test.go
@@ -4,16 +4,17 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/cosmos/cosmos-sdk/std"
+
 	"github.com/stretchr/testify/require"
 	tmkv "github.com/tendermint/tendermint/libs/kv"
 
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 )
 
 func TestGetSimulationLog(t *testing.T) {
-	cdc := codecstd.MakeCodec(ModuleBasics)
+	cdc := std.MakeCodec(ModuleBasics)
 
 	decoders := make(sdk.StoreDecoderRegistry)
 	decoders[auth.StoreKey] = func(kvAs, kvBs tmkv.Pair) string { return "10" }
diff --git a/codec/std/codec.go b/std/codec.go
similarity index 100%
rename from codec/std/codec.go
rename to std/codec.go
diff --git a/codec/std/codec.pb.go b/std/codec.pb.go
similarity index 91%
rename from codec/std/codec.pb.go
rename to std/codec.pb.go
index 8b9d4b4d4..269f6706f 100644
--- a/codec/std/codec.pb.go
+++ b/std/codec.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: codec/std/codec.proto
+// source: std/codec.proto
 
 package std
 
@@ -58,7 +58,7 @@ func (m *Account) Reset()         { *m = Account{} }
 func (m *Account) String() string { return proto.CompactTextString(m) }
 func (*Account) ProtoMessage()    {}
 func (*Account) Descriptor() ([]byte, []int) {
-	return fileDescriptor_daf09dc2dfa19bb4, []int{0}
+	return fileDescriptor_ff851c3a98ef46f7, []int{0}
 }
 func (m *Account) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -181,7 +181,7 @@ func (m *Supply) Reset()         { *m = Supply{} }
 func (m *Supply) String() string { return proto.CompactTextString(m) }
 func (*Supply) ProtoMessage()    {}
 func (*Supply) Descriptor() ([]byte, []int) {
-	return fileDescriptor_daf09dc2dfa19bb4, []int{1}
+	return fileDescriptor_ff851c3a98ef46f7, []int{1}
 }
 func (m *Supply) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -258,7 +258,7 @@ func (m *Evidence) Reset()         { *m = Evidence{} }
 func (m *Evidence) String() string { return proto.CompactTextString(m) }
 func (*Evidence) ProtoMessage()    {}
 func (*Evidence) Descriptor() ([]byte, []int) {
-	return fileDescriptor_daf09dc2dfa19bb4, []int{2}
+	return fileDescriptor_ff851c3a98ef46f7, []int{2}
 }
 func (m *Evidence) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -332,7 +332,7 @@ func (m *MsgSubmitEvidence) Reset()         { *m = MsgSubmitEvidence{} }
 func (m *MsgSubmitEvidence) String() string { return proto.CompactTextString(m) }
 func (*MsgSubmitEvidence) ProtoMessage()    {}
 func (*MsgSubmitEvidence) Descriptor() ([]byte, []int) {
-	return fileDescriptor_daf09dc2dfa19bb4, []int{3}
+	return fileDescriptor_ff851c3a98ef46f7, []int{3}
 }
 func (m *MsgSubmitEvidence) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -372,7 +372,7 @@ func (m *MsgSubmitProposal) Reset()         { *m = MsgSubmitProposal{} }
 func (m *MsgSubmitProposal) String() string { return proto.CompactTextString(m) }
 func (*MsgSubmitProposal) ProtoMessage()    {}
 func (*MsgSubmitProposal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_daf09dc2dfa19bb4, []int{4}
+	return fileDescriptor_ff851c3a98ef46f7, []int{4}
 }
 func (m *MsgSubmitProposal) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -412,7 +412,7 @@ func (m *Proposal) Reset()         { *m = Proposal{} }
 func (m *Proposal) String() string { return proto.CompactTextString(m) }
 func (*Proposal) ProtoMessage()    {}
 func (*Proposal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_daf09dc2dfa19bb4, []int{5}
+	return fileDescriptor_ff851c3a98ef46f7, []int{5}
 }
 func (m *Proposal) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -466,7 +466,7 @@ func (m *Content) Reset()         { *m = Content{} }
 func (m *Content) String() string { return proto.CompactTextString(m) }
 func (*Content) ProtoMessage()    {}
 func (*Content) Descriptor() ([]byte, []int) {
-	return fileDescriptor_daf09dc2dfa19bb4, []int{6}
+	return fileDescriptor_ff851c3a98ef46f7, []int{6}
 }
 func (m *Content) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -589,7 +589,7 @@ func (m *Transaction) Reset()         { *m = Transaction{} }
 func (m *Transaction) String() string { return proto.CompactTextString(m) }
 func (*Transaction) ProtoMessage()    {}
 func (*Transaction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_daf09dc2dfa19bb4, []int{7}
+	return fileDescriptor_ff851c3a98ef46f7, []int{7}
 }
 func (m *Transaction) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -648,7 +648,7 @@ func (m *Message) Reset()         { *m = Message{} }
 func (m *Message) String() string { return proto.CompactTextString(m) }
 func (*Message) ProtoMessage()    {}
 func (*Message) Descriptor() ([]byte, []int) {
-	return fileDescriptor_daf09dc2dfa19bb4, []int{8}
+	return fileDescriptor_ff851c3a98ef46f7, []int{8}
 }
 func (m *Message) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -913,7 +913,7 @@ func (m *SignDoc) Reset()         { *m = SignDoc{} }
 func (m *SignDoc) String() string { return proto.CompactTextString(m) }
 func (*SignDoc) ProtoMessage()    {}
 func (*SignDoc) Descriptor() ([]byte, []int) {
-	return fileDescriptor_daf09dc2dfa19bb4, []int{9}
+	return fileDescriptor_ff851c3a98ef46f7, []int{9}
 }
 func (m *SignDoc) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -961,7 +961,7 @@ func (m *StdFee) Reset()         { *m = StdFee{} }
 func (m *StdFee) String() string { return proto.CompactTextString(m) }
 func (*StdFee) ProtoMessage()    {}
 func (*StdFee) Descriptor() ([]byte, []int) {
-	return fileDescriptor_daf09dc2dfa19bb4, []int{10}
+	return fileDescriptor_ff851c3a98ef46f7, []int{10}
 }
 func (m *StdFee) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1001,7 +1001,7 @@ func (m *StdSignature) Reset()         { *m = StdSignature{} }
 func (m *StdSignature) String() string { return proto.CompactTextString(m) }
 func (*StdSignature) ProtoMessage()    {}
 func (*StdSignature) Descriptor() ([]byte, []int) {
-	return fileDescriptor_daf09dc2dfa19bb4, []int{11}
+	return fileDescriptor_ff851c3a98ef46f7, []int{11}
 }
 func (m *StdSignature) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1042,7 +1042,7 @@ func (m *StdTxBase) Reset()         { *m = StdTxBase{} }
 func (m *StdTxBase) String() string { return proto.CompactTextString(m) }
 func (*StdTxBase) ProtoMessage()    {}
 func (*StdTxBase) Descriptor() ([]byte, []int) {
-	return fileDescriptor_daf09dc2dfa19bb4, []int{12}
+	return fileDescriptor_ff851c3a98ef46f7, []int{12}
 }
 func (m *StdTxBase) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1106,7 +1106,7 @@ func (m *StdSignDocBase) Reset()         { *m = StdSignDocBase{} }
 func (m *StdSignDocBase) String() string { return proto.CompactTextString(m) }
 func (*StdSignDocBase) ProtoMessage()    {}
 func (*StdSignDocBase) Descriptor() ([]byte, []int) {
-	return fileDescriptor_daf09dc2dfa19bb4, []int{13}
+	return fileDescriptor_ff851c3a98ef46f7, []int{13}
 }
 func (m *StdSignDocBase) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1171,136 +1171,136 @@ func (m *StdSignDocBase) GetFee() StdFee {
 }
 
 func init() {
-	proto.RegisterType((*Account)(nil), "cosmos_sdk.codec.std.v1.Account")
-	proto.RegisterType((*Supply)(nil), "cosmos_sdk.codec.std.v1.Supply")
-	proto.RegisterType((*Evidence)(nil), "cosmos_sdk.codec.std.v1.Evidence")
-	proto.RegisterType((*MsgSubmitEvidence)(nil), "cosmos_sdk.codec.std.v1.MsgSubmitEvidence")
-	proto.RegisterType((*MsgSubmitProposal)(nil), "cosmos_sdk.codec.std.v1.MsgSubmitProposal")
-	proto.RegisterType((*Proposal)(nil), "cosmos_sdk.codec.std.v1.Proposal")
-	proto.RegisterType((*Content)(nil), "cosmos_sdk.codec.std.v1.Content")
-	proto.RegisterType((*Transaction)(nil), "cosmos_sdk.codec.std.v1.Transaction")
-	proto.RegisterType((*Message)(nil), "cosmos_sdk.codec.std.v1.Message")
-	proto.RegisterType((*SignDoc)(nil), "cosmos_sdk.codec.std.v1.SignDoc")
-	proto.RegisterType((*StdFee)(nil), "cosmos_sdk.codec.std.v1.StdFee")
-	proto.RegisterType((*StdSignature)(nil), "cosmos_sdk.codec.std.v1.StdSignature")
-	proto.RegisterType((*StdTxBase)(nil), "cosmos_sdk.codec.std.v1.StdTxBase")
-	proto.RegisterType((*StdSignDocBase)(nil), "cosmos_sdk.codec.std.v1.StdSignDocBase")
+	proto.RegisterType((*Account)(nil), "cosmos_sdk.std.v1.Account")
+	proto.RegisterType((*Supply)(nil), "cosmos_sdk.std.v1.Supply")
+	proto.RegisterType((*Evidence)(nil), "cosmos_sdk.std.v1.Evidence")
+	proto.RegisterType((*MsgSubmitEvidence)(nil), "cosmos_sdk.std.v1.MsgSubmitEvidence")
+	proto.RegisterType((*MsgSubmitProposal)(nil), "cosmos_sdk.std.v1.MsgSubmitProposal")
+	proto.RegisterType((*Proposal)(nil), "cosmos_sdk.std.v1.Proposal")
+	proto.RegisterType((*Content)(nil), "cosmos_sdk.std.v1.Content")
+	proto.RegisterType((*Transaction)(nil), "cosmos_sdk.std.v1.Transaction")
+	proto.RegisterType((*Message)(nil), "cosmos_sdk.std.v1.Message")
+	proto.RegisterType((*SignDoc)(nil), "cosmos_sdk.std.v1.SignDoc")
+	proto.RegisterType((*StdFee)(nil), "cosmos_sdk.std.v1.StdFee")
+	proto.RegisterType((*StdSignature)(nil), "cosmos_sdk.std.v1.StdSignature")
+	proto.RegisterType((*StdTxBase)(nil), "cosmos_sdk.std.v1.StdTxBase")
+	proto.RegisterType((*StdSignDocBase)(nil), "cosmos_sdk.std.v1.StdSignDocBase")
 }
 
-func init() { proto.RegisterFile("codec/std/codec.proto", fileDescriptor_daf09dc2dfa19bb4) }
+func init() { proto.RegisterFile("std/codec.proto", fileDescriptor_ff851c3a98ef46f7) }
 
-var fileDescriptor_daf09dc2dfa19bb4 = []byte{
-	// 1753 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x41, 0x73, 0x1b, 0x49,
-	0x15, 0x9e, 0x89, 0x15, 0x4b, 0x6e, 0x2b, 0x8e, 0xdd, 0x9b, 0x60, 0x61, 0xb2, 0x52, 0xa2, 0x85,
-	0xb0, 0x64, 0x89, 0xb4, 0xd9, 0xc0, 0x2e, 0x51, 0xb1, 0x45, 0x22, 0x3b, 0x2e, 0x99, 0x5d, 0x43,
-	0x6a, 0x9c, 0x98, 0x82, 0x5a, 0x98, 0x6a, 0xcd, 0xb4, 0xc7, 0x8d, 0xd5, 0xd3, 0xb3, 0xd3, 0x3d,
-	0xb2, 0x44, 0x15, 0x27, 0xaa, 0x28, 0xb8, 0x6d, 0x15, 0xc5, 0x7d, 0x81, 0xe2, 0x02, 0xd7, 0x3d,
-	0xf1, 0x03, 0xa8, 0xad, 0x3d, 0xe5, 0xc8, 0xc9, 0x50, 0xce, 0x85, 0xda, 0x63, 0x0e, 0x9c, 0xa9,
-	0xee, 0xe9, 0x19, 0xcd, 0x48, 0x63, 0xd9, 0x7b, 0xd8, 0x8b, 0x6a, 0xba, 0xdf, 0xfb, 0xbe, 0xf7,
-	0x4d, 0xf7, 0x7b, 0xfd, 0x7a, 0x04, 0xae, 0x3b, 0xcc, 0xc5, 0x4e, 0x9b, 0x0b, 0xb7, 0xad, 0x9e,
-	0x5a, 0x41, 0xc8, 0x04, 0x83, 0xeb, 0x0e, 0xe3, 0x94, 0x71, 0x9b, 0xbb, 0x47, 0xad, 0x78, 0x9e,
-	0x0b, 0xb7, 0x35, 0xbc, 0xb7, 0xf1, 0x86, 0x38, 0x24, 0xa1, 0x6b, 0x07, 0x28, 0x14, 0xe3, 0xb6,
-	0xf2, 0x6d, 0xc7, 0xae, 0x77, 0xb3, 0x83, 0x98, 0x65, 0xe3, 0xf6, 0xac, 0xb3, 0xc7, 0x3c, 0x36,
-	0x79, 0xd2, 0x7e, 0x6b, 0x62, 0x1c, 0x60, 0xde, 0x56, 0xbf, 0x7a, 0xaa, 0x36, 0x6a, 0xa3, 0x48,
-	0x1c, 0xb6, 0x67, 0x2d, 0x37, 0xb5, 0x65, 0x88, 0xb9, 0x20, 0xbe, 0xd7, 0x2e, 0xc4, 0xf6, 0x91,
-	0x7f, 0x54, 0x60, 0xd9, 0x18, 0xb5, 0x9d, 0x90, 0x70, 0xc2, 0x8b, 0x79, 0x5d, 0xc2, 0x45, 0x48,
-	0xfa, 0x91, 0x20, 0xcc, 0x2f, 0xf0, 0xb8, 0x31, 0x6a, 0xe3, 0x21, 0x71, 0xb1, 0xef, 0xe0, 0x02,
-	0xeb, 0xfa, 0xa8, 0xed, 0xb1, 0x61, 0x31, 0x8c, 0x0f, 0x10, 0x3f, 0x2c, 0x16, 0xfb, 0xb5, 0x51,
-	0x9b, 0x0b, 0x74, 0x54, 0x6c, 0x7c, 0x6d, 0xd4, 0x0e, 0x50, 0x88, 0x68, 0xa2, 0x37, 0x08, 0x59,
-	0xc0, 0x38, 0x1a, 0x4c, 0x33, 0x44, 0x81, 0x17, 0x22, 0xb7, 0x40, 0x55, 0xf3, 0x1f, 0x25, 0x50,
-	0x7e, 0xe4, 0x38, 0x2c, 0xf2, 0x05, 0xdc, 0x06, 0xd5, 0x3e, 0xe2, 0xd8, 0x46, 0xf1, 0xb8, 0x66,
-	0xde, 0x34, 0x5f, 0x5f, 0x7e, 0xeb, 0x56, 0x2b, 0xb3, 0xd7, 0xa3, 0x96, 0x5c, 0xdb, 0xd6, 0xf0,
-	0x5e, 0xab, 0x8b, 0x38, 0xd6, 0xc0, 0x9e, 0x61, 0x2d, 0xf7, 0x27, 0x43, 0x38, 0x04, 0x1b, 0x0e,
-	0xf3, 0x05, 0xf1, 0x23, 0x16, 0x71, 0x5b, 0xef, 0x43, 0xca, 0x7a, 0x49, 0xb1, 0xbe, 0x5d, 0xc4,
-	0x1a, 0x7b, 0x4a, 0xf6, 0xcd, 0x14, 0xbf, 0x1f, 0x4f, 0x4e, 0x42, 0xd5, 0x9c, 0x33, 0x6c, 0x90,
-	0x82, 0x75, 0x17, 0x0f, 0xd0, 0x18, 0xbb, 0x33, 0x41, 0x17, 0x54, 0xd0, 0xfb, 0xf3, 0x83, 0x6e,
-	0xc5, 0xe0, 0x99, 0x88, 0xd7, 0xdd, 0x22, 0x03, 0x0c, 0x40, 0x2d, 0xc0, 0x21, 0x61, 0x2e, 0x71,
-	0x66, 0xe2, 0x95, 0x54, 0xbc, 0xef, 0xcc, 0x8f, 0xf7, 0x44, 0xa3, 0x67, 0x02, 0x7e, 0x25, 0x28,
-	0xb4, 0xc0, 0xf7, 0xc1, 0x0a, 0x65, 0x6e, 0x34, 0x98, 0x6c, 0xd1, 0x65, 0x15, 0xe7, 0xb5, 0xe2,
-	0x2d, 0xda, 0x55, 0xbe, 0x13, 0xda, 0x2b, 0x34, 0x3b, 0xd1, 0x79, 0xf0, 0xd9, 0x27, 0x77, 0xbf,
-	0x7b, 0xc7, 0x23, 0xe2, 0x30, 0xea, 0xb7, 0x1c, 0x46, 0x75, 0x6d, 0x26, 0xf5, 0xca, 0xdd, 0xa3,
-	0xb6, 0x2e, 0x25, 0x3c, 0x0a, 0x58, 0x28, 0xb0, 0xdb, 0xd2, 0xd0, 0xee, 0x65, 0xb0, 0xc0, 0x23,
-	0xda, 0xfc, 0xad, 0x09, 0x16, 0xf7, 0xa2, 0x20, 0x18, 0x8c, 0xe1, 0xdb, 0x60, 0x91, 0xab, 0x27,
-	0x9d, 0x35, 0x37, 0xf2, 0x92, 0x64, 0xbd, 0x49, 0x49, 0xb1, 0x77, 0xcf, 0xb0, 0xb4, 0x77, 0xe7,
-	0xdd, 0xff, 0x7e, 0xdc, 0x30, 0x2f, 0x22, 0x44, 0x55, 0x6c, 0x2a, 0x24, 0xe6, 0xd9, 0x49, 0x84,
-	0xfc, 0xd9, 0x04, 0x95, 0xc7, 0xba, 0xf4, 0xe0, 0xfb, 0xa0, 0x8a, 0x3f, 0x8c, 0xc8, 0x90, 0x39,
-	0x48, 0x16, 0xaa, 0x16, 0x74, 0x3b, 0x2f, 0x28, 0x29, 0x54, 0x29, 0xea, 0x71, 0xc6, 0xbb, 0x67,
-	0x58, 0x39, 0x74, 0xe7, 0x91, 0x16, 0xf8, 0xe0, 0x1c, 0x7d, 0x69, 0xe5, 0xa7, 0x1a, 0x13, 0x41,
-	0x89, 0xc8, 0xbf, 0x9b, 0x60, 0x6d, 0x97, 0x7b, 0x7b, 0x51, 0x9f, 0x12, 0x91, 0xaa, 0xdd, 0x05,
-	0x25, 0x59, 0x3b, 0x5a, 0x65, 0xfb, 0x6c, 0x95, 0x33, 0x50, 0x59, 0x81, 0xdd, 0xca, 0xa7, 0x27,
-	0x0d, 0xe3, 0xf9, 0x49, 0xc3, 0xb4, 0x14, 0x0d, 0x7c, 0x17, 0x54, 0x12, 0x90, 0xae, 0xb4, 0x5c,
-	0xfd, 0x66, 0xcf, 0xea, 0x54, 0xa0, 0x95, 0x42, 0x3a, 0x95, 0xdf, 0x7d, 0xdc, 0x30, 0xe4, 0x1b,
-	0x37, 0xff, 0x92, 0x55, 0xfb, 0x44, 0x9f, 0x2b, 0xb0, 0x97, 0x53, 0x7b, 0x27, 0xaf, 0xd6, 0x63,
-	0xc3, 0x9c, 0xd0, 0x04, 0x55, 0x28, 0xb4, 0x03, 0xca, 0xb2, 0x90, 0x71, 0x7a, 0x22, 0xdc, 0x3c,
-	0x53, 0xe7, 0x66, 0xec, 0x67, 0x25, 0x80, 0x8c, 0xca, 0x3f, 0x98, 0xa0, 0x92, 0x8a, 0xfb, 0x41,
-	0x4e, 0xdc, 0xad, 0x42, 0x71, 0x73, 0x35, 0x3d, 0xfc, 0xc2, 0x9a, 0xba, 0x25, 0x49, 0x31, 0x51,
-	0x56, 0x52, 0xaa, 0xfe, 0x54, 0x02, 0x65, 0xed, 0x00, 0xdf, 0x01, 0x25, 0x81, 0x47, 0x62, 0xae,
-	0xa8, 0xa7, 0x78, 0x94, 0x2e, 0x56, 0xcf, 0xb0, 0x14, 0x00, 0x7e, 0x00, 0x56, 0xd5, 0xd9, 0x8e,
-	0x05, 0x0e, 0x6d, 0xe7, 0x10, 0xf9, 0x5e, 0xb2, 0xa3, 0x53, 0x49, 0x12, 0x77, 0x00, 0xf5, 0x72,
-	0x89, 0xff, 0xa6, 0x72, 0xcf, 0x50, 0x5e, 0x0d, 0xf2, 0x26, 0xf8, 0x73, 0xb0, 0xca, 0xd9, 0x81,
-	0x38, 0x46, 0x21, 0xb6, 0x75, 0x77, 0xd0, 0x87, 0xe4, 0x9b, 0x79, 0x76, 0x6d, 0x54, 0xc5, 0xab,
-	0x01, 0xcf, 0xe2, 0xa9, 0x2c, 0x3d, 0xcf, 0x9b, 0x60, 0x00, 0xd6, 0x1d, 0xe4, 0x3b, 0x78, 0x60,
-	0xcf, 0x44, 0x29, 0x15, 0x9d, 0xff, 0x99, 0x28, 0x9b, 0x0a, 0x77, 0x76, 0xac, 0xeb, 0x4e, 0x91,
-	0x03, 0x1c, 0x80, 0x6b, 0x0e, 0xa3, 0x34, 0xf2, 0x89, 0x18, 0xdb, 0x01, 0x63, 0x03, 0x9b, 0x07,
-	0xd8, 0x77, 0xf5, 0x09, 0xf9, 0xbd, 0x7c, 0xb8, 0x6c, 0x23, 0x8f, 0x77, 0x53, 0x23, 0x9f, 0x30,
-	0x36, 0xd8, 0x93, 0xb8, 0x4c, 0x40, 0xe8, 0xcc, 0x58, 0x3b, 0x0f, 0xf4, 0xa9, 0x70, 0xef, 0xbc,
-	0x63, 0x2b, 0x6d, 0xf9, 0x69, 0xc6, 0xe8, 0xd3, 0xe0, 0x8f, 0x26, 0x58, 0x7e, 0x1a, 0x22, 0x9f,
-	0x23, 0x47, 0xaa, 0x80, 0x5b, 0xb9, 0xe4, 0x6d, 0x9e, 0x99, 0x78, 0x7b, 0xc2, 0x7d, 0x3a, 0x52,
-	0xd9, 0x5b, 0x4d, 0xb2, 0xf7, 0x73, 0x99, 0x82, 0x49, 0x55, 0x95, 0x28, 0xf7, 0x78, 0xed, 0xd2,
-	0xcd, 0x85, 0xb9, 0xe9, 0xbb, 0x8b, 0x39, 0x47, 0x1e, 0xd6, 0xe9, 0xab, 0x30, 0x9d, 0x92, 0xac,
-	0xaa, 0xe6, 0x3f, 0xab, 0xa0, 0xac, 0xad, 0xb0, 0x03, 0x2a, 0x94, 0x7b, 0x36, 0x97, 0xeb, 0x18,
-	0xeb, 0x7a, 0xb5, 0xf8, 0x58, 0x97, 0x25, 0x8f, 0x7d, 0xb7, 0x67, 0x58, 0x65, 0x1a, 0x3f, 0xc2,
-	0x1f, 0x82, 0x15, 0x89, 0xa5, 0xd1, 0x40, 0x90, 0x98, 0xe1, 0xd2, 0xec, 0x9b, 0xe5, 0x18, 0x76,
-	0xa5, 0xab, 0xa6, 0xa9, 0xd2, 0xcc, 0x18, 0xfe, 0x02, 0x5c, 0x93, 0x5c, 0x43, 0x1c, 0x92, 0x83,
-	0xb1, 0x4d, 0xfc, 0x21, 0x0a, 0x09, 0x4a, 0xbb, 0xfa, 0xd4, 0x29, 0x14, 0x5f, 0xe0, 0x34, 0xe7,
-	0xbe, 0x82, 0xec, 0x24, 0x08, 0xb9, 0x9b, 0x74, 0x66, 0x16, 0xfa, 0xa0, 0x16, 0xbf, 0xa7, 0xb0,
-	0x8f, 0x89, 0x38, 0x74, 0x43, 0x74, 0x6c, 0x23, 0xd7, 0x0d, 0x31, 0xe7, 0x3a, 0x5d, 0xef, 0xcf,
-	0xcf, 0x1f, 0xf5, 0xfe, 0xe2, 0x27, 0x1a, 0xfb, 0x28, 0x86, 0xca, 0x5c, 0xa5, 0x45, 0x06, 0xf8,
-	0x6b, 0xf0, 0xaa, 0x8c, 0x97, 0xc6, 0x72, 0xf1, 0x00, 0x7b, 0x48, 0xb0, 0xd0, 0x0e, 0xf1, 0x31,
-	0x0a, 0x2f, 0x98, 0xb4, 0xbb, 0xdc, 0x4b, 0x88, 0xb7, 0x12, 0x02, 0x4b, 0xe1, 0x7b, 0x86, 0xb5,
-	0x41, 0xcf, 0xb4, 0xc2, 0xdf, 0x9b, 0xe0, 0x56, 0x2e, 0xfe, 0x10, 0x0d, 0x88, 0xab, 0xe2, 0xcb,
-	0x54, 0x27, 0x9c, 0xcb, 0xb6, 0xb9, 0xa8, 0x34, 0x7c, 0xff, 0xc2, 0x1a, 0xf6, 0x13, 0x92, 0xcd,
-	0x94, 0xa3, 0x67, 0x58, 0x75, 0x3a, 0xd7, 0x03, 0x1e, 0x81, 0x75, 0x29, 0xe5, 0x20, 0xf2, 0x5d,
-	0x3b, 0x5f, 0xbf, 0xb5, 0xb2, 0x12, 0xf0, 0xd6, 0xb9, 0x02, 0xb6, 0x23, 0xdf, 0xcd, 0x15, 0x70,
-	0xcf, 0xb0, 0x64, 0xbe, 0xcc, 0xcc, 0xc3, 0x0f, 0xc0, 0x2b, 0x6a, 0x9f, 0x55, 0x77, 0xb2, 0xd3,
-	0x3e, 0x59, 0x99, 0x4d, 0xa3, 0x7c, 0xb1, 0x4c, 0x77, 0xde, 0x9e, 0x61, 0xad, 0xd1, 0x99, 0x4e,
-	0x9e, 0x67, 0x4f, 0xae, 0xe2, 0xb5, 0xa5, 0x8b, 0xb2, 0x67, 0x8e, 0x9c, 0x09, 0x7b, 0xda, 0xdc,
-	0x1e, 0xc4, 0xb5, 0x38, 0x64, 0x02, 0xd7, 0x40, 0xd1, 0x15, 0x6b, 0xd2, 0x7d, 0xf7, 0x99, 0xc0,
-	0xba, 0x14, 0xe5, 0x23, 0xec, 0x82, 0x65, 0x09, 0x75, 0x71, 0xc0, 0x38, 0x11, 0xb5, 0x65, 0x85,
-	0x6e, 0x9c, 0x85, 0xde, 0x8a, 0xdd, 0x7a, 0x86, 0x05, 0x68, 0x3a, 0x82, 0x5b, 0x40, 0x8e, 0xec,
-	0xc8, 0xff, 0x25, 0x22, 0x83, 0x5a, 0xb5, 0xe8, 0xda, 0x99, 0x7c, 0xc4, 0x68, 0x9e, 0x67, 0xca,
-	0xb5, 0x67, 0x58, 0x4b, 0x34, 0x19, 0x40, 0x3b, 0x2e, 0x64, 0x27, 0xc4, 0x48, 0xe0, 0x49, 0xda,
-	0xd5, 0xae, 0x28, 0xbe, 0x37, 0xa6, 0xf8, 0xe2, 0xcf, 0x1e, 0x4d, 0xb7, 0xa9, 0x30, 0x69, 0x0a,
-	0xe9, 0x4a, 0x9e, 0x9a, 0x85, 0x3f, 0x05, 0x72, 0xd6, 0xc6, 0x2e, 0x11, 0x19, 0xfa, 0x15, 0x45,
-	0xff, 0xad, 0x79, 0xf4, 0x8f, 0x5d, 0x22, 0xb2, 0xe4, 0xab, 0x74, 0x6a, 0x0e, 0xee, 0x80, 0x6a,
-	0xbc, 0x8a, 0xaa, 0x98, 0x70, 0xed, 0xaa, 0x22, 0xfd, 0xfa, 0x3c, 0x52, 0x5d, 0x78, 0x72, 0x33,
-	0x96, 0xe9, 0x64, 0x98, 0x2c, 0x43, 0x1f, 0x7b, 0xc4, 0xb7, 0x43, 0x9c, 0x52, 0xae, 0x9e, 0xbf,
-	0x0c, 0x5d, 0x89, 0xb1, 0x52, 0x88, 0x5e, 0x86, 0xa9, 0x59, 0xf8, 0xe3, 0xf8, 0xf0, 0x8d, 0xfc,
-	0x94, 0x7a, 0xad, 0xe8, 0x12, 0x9c, 0xa7, 0x7e, 0xe6, 0x67, 0x58, 0xaf, 0xd0, 0xec, 0x44, 0xe7,
-	0xce, 0x67, 0x9f, 0xdc, 0xbd, 0x3d, 0xb7, 0xd5, 0xc5, 0x4d, 0x4e, 0x2a, 0xd4, 0x0d, 0xee, 0x23,
-	0x13, 0x94, 0xf7, 0x88, 0xe7, 0x6f, 0x31, 0x07, 0xee, 0xe4, 0x9a, 0xdb, 0x37, 0xe7, 0x35, 0x37,
-	0x0d, 0xf9, 0x32, 0x3a, 0x5c, 0xf3, 0x37, 0xf2, 0x7b, 0x45, 0xb8, 0xdb, 0x58, 0xde, 0x7f, 0x16,
-	0x11, 0xd5, 0x5f, 0xb9, 0x92, 0xe8, 0x95, 0x2c, 0x91, 0xba, 0x11, 0x10, 0xbf, 0xfb, 0xa6, 0xc4,
-	0xfe, 0xed, 0xdf, 0x8d, 0xd7, 0x2f, 0xf0, 0xe6, 0x12, 0xc0, 0x2d, 0x4d, 0x0a, 0x57, 0xc1, 0x82,
-	0x87, 0xb8, 0x6a, 0x79, 0x25, 0x4b, 0x3e, 0x66, 0xee, 0xac, 0xbf, 0x02, 0x55, 0xfd, 0x9e, 0x48,
-	0x44, 0x21, 0x86, 0xdb, 0xa0, 0x1c, 0x44, 0x7d, 0xfb, 0x08, 0xc7, 0xdf, 0x4e, 0xd5, 0xee, 0xdd,
-	0xcf, 0x4f, 0x1a, 0xd7, 0x82, 0xa8, 0x3f, 0x20, 0x8e, 0x9c, 0xfd, 0x36, 0xa3, 0x44, 0x60, 0x1a,
-	0x88, 0xf1, 0xcb, 0x93, 0xc6, 0xda, 0x18, 0xd1, 0x41, 0xa7, 0x39, 0xb1, 0x36, 0xad, 0xc5, 0x20,
-	0xea, 0xbf, 0x87, 0xc7, 0xf0, 0x06, 0x58, 0xe2, 0x09, 0xa9, 0x8a, 0x5c, 0xb5, 0x26, 0x13, 0xba,
-	0xbb, 0xff, 0xd5, 0x04, 0x4b, 0xe9, 0x0d, 0x02, 0xbe, 0x03, 0x16, 0x0e, 0x70, 0xb2, 0x2b, 0x8d,
-	0x79, 0xbb, 0xb2, 0x8d, 0x93, 0x95, 0x94, 0x08, 0xf8, 0x1e, 0x00, 0x29, 0x73, 0xb2, 0x15, 0xdf,
-	0x38, 0x6f, 0x57, 0x95, 0xb7, 0x66, 0xc9, 0xc0, 0x21, 0x04, 0x25, 0x8a, 0x29, 0x53, 0xdd, 0x7c,
-	0xc9, 0x52, 0xcf, 0xcd, 0xff, 0x99, 0x60, 0x25, 0x9f, 0x0c, 0xf2, 0x00, 0x74, 0x0e, 0x11, 0xf1,
-	0x6d, 0x12, 0x5f, 0x46, 0x96, 0xba, 0xf5, 0xd3, 0x93, 0x46, 0x79, 0x53, 0xce, 0xed, 0x6c, 0xbd,
-	0x3c, 0x69, 0x5c, 0x8d, 0x97, 0x26, 0x71, 0x6a, 0x5a, 0x65, 0xf5, 0xb8, 0xe3, 0xc2, 0x87, 0x60,
-	0x45, 0x7f, 0x30, 0xdb, 0x7e, 0x44, 0xfb, 0x38, 0x8c, 0x37, 0xa6, 0xfb, 0xd5, 0x97, 0x27, 0x8d,
-	0xeb, 0x31, 0x2a, 0x6f, 0x6f, 0x5a, 0x57, 0xf4, 0xc4, 0x8f, 0xd4, 0x18, 0x6e, 0x80, 0x0a, 0xc7,
-	0x1f, 0x46, 0xaa, 0x5d, 0x2c, 0xa8, 0x4d, 0x4d, 0xc7, 0xa9, 0xfe, 0xd2, 0x44, 0x7f, 0xb2, 0xb2,
-	0x97, 0xbf, 0xe8, 0xca, 0x76, 0x1f, 0x7e, 0x7a, 0x5a, 0x37, 0x9f, 0x9f, 0xd6, 0xcd, 0xff, 0x9c,
-	0xd6, 0xcd, 0x8f, 0x5e, 0xd4, 0x8d, 0xe7, 0x2f, 0xea, 0xc6, 0xbf, 0x5e, 0xd4, 0x8d, 0x9f, 0xcd,
-	0x2f, 0xbf, 0xf4, 0x6f, 0xba, 0xfe, 0xa2, 0xfa, 0x63, 0xe7, 0xfe, 0xff, 0x03, 0x00, 0x00, 0xff,
-	0xff, 0x02, 0x85, 0x89, 0xbb, 0xba, 0x13, 0x00, 0x00,
+var fileDescriptor_ff851c3a98ef46f7 = []byte{
+	// 1746 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcf, 0x6f, 0x1b, 0xc7,
+	0x15, 0xde, 0x8d, 0x68, 0x91, 0x1a, 0xd1, 0xb2, 0x34, 0xb1, 0x6b, 0x46, 0x71, 0x48, 0x9b, 0x29,
+	0x8c, 0xd4, 0xa9, 0xc9, 0x38, 0x4e, 0x93, 0x9a, 0xe8, 0x2f, 0x93, 0xb2, 0x40, 0xb5, 0x51, 0x6b,
+	0xac, 0x6c, 0x15, 0x2d, 0xda, 0x2e, 0x86, 0xbb, 0xe3, 0xd5, 0x54, 0x9c, 0x9d, 0xcd, 0xce, 0x2c,
+	0x45, 0x16, 0xe8, 0xa9, 0x45, 0xd1, 0x1c, 0x0a, 0xf4, 0xda, 0x43, 0x81, 0xb4, 0x40, 0x2f, 0x3d,
+	0xe7, 0x94, 0xbf, 0x20, 0xc8, 0xc9, 0xc7, 0x9e, 0xd4, 0x42, 0xbe, 0x14, 0x39, 0x15, 0xfe, 0x0b,
+	0x8a, 0x99, 0x9d, 0x5d, 0xee, 0x92, 0x4b, 0x4a, 0x05, 0x7a, 0x21, 0x76, 0xe6, 0xbd, 0xef, 0x7b,
+	0xdf, 0xce, 0xbc, 0x37, 0x6f, 0x96, 0xe0, 0x0a, 0x17, 0x6e, 0xdb, 0x61, 0x2e, 0x76, 0x5a, 0x41,
+	0xc8, 0x04, 0x83, 0x5b, 0x0e, 0xe3, 0x94, 0x71, 0x9b, 0xbb, 0xc7, 0x2d, 0x2e, 0xdc, 0xd6, 0xe8,
+	0xde, 0xf6, 0xdb, 0xe2, 0x88, 0x84, 0xae, 0x1d, 0xa0, 0x50, 0x4c, 0xda, 0xca, 0xab, 0x1d, 0x3b,
+	0xdd, 0xcd, 0x0e, 0x62, 0xfc, 0xf6, 0xed, 0x79, 0x67, 0x8f, 0x79, 0x6c, 0xfa, 0xa4, 0xfd, 0xb6,
+	0xc4, 0x24, 0xc0, 0xbc, 0xad, 0x7e, 0xf5, 0x54, 0x6d, 0xdc, 0x46, 0x91, 0x38, 0x6a, 0xcf, 0x5b,
+	0x6e, 0x6a, 0xcb, 0x08, 0x73, 0x41, 0x7c, 0xaf, 0x5d, 0x88, 0x1d, 0x20, 0xff, 0xb8, 0xc0, 0xb2,
+	0x3d, 0x6e, 0x3b, 0x21, 0xe1, 0x84, 0x17, 0xf3, 0xba, 0x84, 0x8b, 0x90, 0x0c, 0x22, 0x41, 0x98,
+	0x5f, 0xe0, 0x71, 0x63, 0xdc, 0xc6, 0x23, 0xe2, 0x62, 0xdf, 0xc1, 0x05, 0xd6, 0xeb, 0xe3, 0xb6,
+	0xc7, 0x46, 0xc5, 0x30, 0x3e, 0x44, 0xfc, 0xa8, 0x58, 0xec, 0xeb, 0xe3, 0x36, 0x17, 0xe8, 0xb8,
+	0xd8, 0xf8, 0xe6, 0xb8, 0x1d, 0xa0, 0x10, 0xd1, 0x44, 0x6f, 0x10, 0xb2, 0x80, 0x71, 0x34, 0x9c,
+	0x65, 0x88, 0x02, 0x2f, 0x44, 0x6e, 0x81, 0xaa, 0xe6, 0x67, 0x25, 0x50, 0x7e, 0xe8, 0x38, 0x2c,
+	0xf2, 0x05, 0xdc, 0x05, 0xd5, 0x01, 0xe2, 0xd8, 0x46, 0xf1, 0xb8, 0x66, 0xde, 0x34, 0xdf, 0x5a,
+	0x7f, 0xf7, 0x56, 0x2b, 0xb3, 0xcb, 0xe3, 0x96, 0x5c, 0xdb, 0xd6, 0xe8, 0x5e, 0xab, 0x8b, 0x38,
+	0xd6, 0xc0, 0xbe, 0x61, 0xad, 0x0f, 0xa6, 0x43, 0x38, 0x02, 0xdb, 0x0e, 0xf3, 0x05, 0xf1, 0x23,
+	0x16, 0x71, 0x5b, 0xef, 0x43, 0xca, 0xfa, 0x8a, 0x62, 0x7d, 0xbf, 0x88, 0x35, 0xf6, 0x94, 0xec,
+	0xbd, 0x14, 0x7f, 0x18, 0x4f, 0x4e, 0x43, 0xd5, 0x9c, 0x05, 0x36, 0x48, 0xc1, 0x75, 0x17, 0x0f,
+	0xd1, 0x04, 0xbb, 0x73, 0x41, 0x57, 0x54, 0xd0, 0xfb, 0xcb, 0x83, 0xee, 0xc4, 0xe0, 0xb9, 0x88,
+	0xd7, 0xdc, 0x22, 0x03, 0x0c, 0x40, 0x2d, 0xc0, 0x21, 0x61, 0x2e, 0x71, 0xe6, 0xe2, 0x95, 0x54,
+	0xbc, 0xf7, 0x96, 0xc7, 0x7b, 0xac, 0xd1, 0x73, 0x01, 0xbf, 0x12, 0x14, 0x5a, 0xe0, 0x87, 0x60,
+	0x83, 0x32, 0x37, 0x1a, 0x4e, 0xb7, 0xe8, 0x92, 0x8a, 0xf3, 0x66, 0xf1, 0x16, 0xed, 0x2b, 0xdf,
+	0x29, 0xed, 0x65, 0x9a, 0x9d, 0xe8, 0x3c, 0xf8, 0xe2, 0xd3, 0xbb, 0xdf, 0xb8, 0xe3, 0x11, 0x71,
+	0x14, 0x0d, 0x5a, 0x0e, 0xa3, 0xba, 0x36, 0x93, 0x7a, 0xe5, 0xee, 0x71, 0x5b, 0x97, 0x12, 0x1e,
+	0x07, 0x2c, 0x14, 0xd8, 0x6d, 0x69, 0x68, 0xf7, 0x12, 0x58, 0xe1, 0x11, 0x6d, 0xfe, 0xce, 0x04,
+	0xab, 0x07, 0x51, 0x10, 0x0c, 0x27, 0xf0, 0x7d, 0xb0, 0xca, 0xd5, 0x93, 0xce, 0x9a, 0x1b, 0x79,
+	0x49, 0xb2, 0xde, 0xa4, 0xa4, 0xd8, 0xbb, 0x6f, 0x58, 0xda, 0xbb, 0xf3, 0xed, 0x7f, 0x7f, 0xd2,
+	0x30, 0x2f, 0x22, 0x44, 0x55, 0x6c, 0x2a, 0x24, 0xe6, 0xd9, 0x4b, 0x84, 0xfc, 0xd5, 0x04, 0x95,
+	0x47, 0xba, 0xf4, 0xe0, 0x87, 0xa0, 0x8a, 0x3f, 0x8a, 0xc8, 0x88, 0x39, 0x48, 0x16, 0xaa, 0x16,
+	0x74, 0x3b, 0x2f, 0x28, 0x29, 0x54, 0x29, 0xea, 0x51, 0xc6, 0xbb, 0x6f, 0x58, 0x39, 0x74, 0xe7,
+	0xa1, 0x16, 0xf8, 0xe0, 0x1c, 0x7d, 0x69, 0xe5, 0xa7, 0x1a, 0x13, 0x41, 0x89, 0xc8, 0xbf, 0x99,
+	0x60, 0x6b, 0x9f, 0x7b, 0x07, 0xd1, 0x80, 0x12, 0x91, 0xaa, 0xdd, 0x07, 0x25, 0x59, 0x3b, 0x5a,
+	0x65, 0x7b, 0xb1, 0xca, 0x39, 0xa8, 0xac, 0xc0, 0x6e, 0xe5, 0xf3, 0xd3, 0x86, 0xf1, 0xfc, 0xb4,
+	0x61, 0x5a, 0x8a, 0x06, 0x7e, 0x00, 0x2a, 0x09, 0x48, 0x57, 0xda, 0xeb, 0xad, 0xb9, 0x53, 0x3a,
+	0x95, 0x66, 0xa5, 0xce, 0x9d, 0xca, 0xef, 0x3f, 0x69, 0x18, 0xf2, 0x5d, 0x9b, 0x7f, 0xce, 0xea,
+	0x7c, 0xac, 0x4f, 0x14, 0xd8, 0xcf, 0xe9, 0xbc, 0x93, 0xd7, 0xe9, 0xb1, 0x51, 0x4e, 0x62, 0x82,
+	0x2a, 0x94, 0xf8, 0x1e, 0x28, 0xcb, 0x12, 0xc6, 0xe9, 0x59, 0xb0, 0x5d, 0xa0, 0xb0, 0x17, 0x7b,
+	0x58, 0x89, 0x6b, 0x46, 0xdf, 0x1f, 0x4c, 0x50, 0x49, 0x65, 0x7d, 0x37, 0x27, 0xeb, 0x56, 0xa1,
+	0xac, 0xa5, 0x6a, 0x3a, 0xff, 0x83, 0x9a, 0x6e, 0x49, 0x82, 0xa7, 0x9a, 0x4a, 0x4a, 0xcf, 0x5f,
+	0x4a, 0xa0, 0xac, 0x1d, 0xe0, 0x07, 0xa0, 0x24, 0xf0, 0x58, 0x2c, 0x95, 0xf3, 0x04, 0x8f, 0xd3,
+	0x05, 0xea, 0x1b, 0x96, 0x02, 0xc0, 0x9f, 0x81, 0x4d, 0x75, 0x92, 0x63, 0x81, 0x43, 0xdb, 0x39,
+	0x42, 0xbe, 0x97, 0xec, 0xdf, 0x4c, 0x4a, 0xc4, 0xe7, 0xbd, 0x7a, 0xad, 0xc4, 0xbf, 0xa7, 0xdc,
+	0x33, 0x94, 0x57, 0x82, 0xbc, 0x09, 0xfe, 0x1c, 0x6c, 0x72, 0xf6, 0x4c, 0x9c, 0xa0, 0x10, 0xdb,
+	0xba, 0x17, 0xe8, 0x23, 0xf1, 0x9d, 0x3c, 0xbb, 0x36, 0xaa, 0x52, 0xd5, 0x80, 0xa7, 0xf1, 0x54,
+	0x96, 0x9e, 0xe7, 0x4d, 0x30, 0x00, 0xd7, 0x1d, 0xe4, 0x3b, 0x78, 0x68, 0xcf, 0x45, 0x29, 0x15,
+	0x9d, 0xf6, 0x99, 0x28, 0x3d, 0x85, 0x5b, 0x1c, 0xeb, 0x9a, 0x53, 0xe4, 0x00, 0x87, 0xe0, 0xaa,
+	0xc3, 0x28, 0x8d, 0x7c, 0x22, 0x26, 0x76, 0xc0, 0xd8, 0xd0, 0xe6, 0x01, 0xf6, 0x5d, 0x7d, 0x1e,
+	0x7e, 0x33, 0x1f, 0x2e, 0xdb, 0xb6, 0xe3, 0xdd, 0xd4, 0xc8, 0xc7, 0x8c, 0x0d, 0x0f, 0x24, 0x2e,
+	0x13, 0x10, 0x3a, 0x73, 0xd6, 0xce, 0x03, 0x7d, 0x06, 0xdc, 0x3b, 0xef, 0x90, 0x4a, 0x1b, 0x7c,
+	0x9a, 0x31, 0xba, 0xf6, 0x3f, 0x36, 0xc1, 0xfa, 0x93, 0x10, 0xf9, 0x1c, 0x39, 0x52, 0x05, 0xfc,
+	0x4e, 0x2e, 0x6d, 0x6f, 0x14, 0xa4, 0xdc, 0x81, 0x70, 0x9f, 0x8c, 0x55, 0xc6, 0x56, 0x93, 0x8c,
+	0xfd, 0x52, 0x26, 0x5f, 0x52, 0x43, 0x25, 0xca, 0x3d, 0x5e, 0x7b, 0xe5, 0xe6, 0xca, 0x82, 0x94,
+	0xdd, 0xc7, 0x9c, 0x23, 0x0f, 0xeb, 0x94, 0x55, 0xde, 0x9d, 0x92, 0xac, 0xa1, 0xe6, 0x67, 0x55,
+	0x50, 0xd6, 0x56, 0xd8, 0x01, 0x15, 0xca, 0x3d, 0x9b, 0xcb, 0xb5, 0x8b, 0xb5, 0xbc, 0x51, 0x7c,
+	0x70, 0xcb, 0xd2, 0xc6, 0xbe, 0xdb, 0x37, 0xac, 0x32, 0x8d, 0x1f, 0xe1, 0xf7, 0xc1, 0x86, 0xc4,
+	0xd2, 0x68, 0x28, 0x48, 0xcc, 0x10, 0x27, 0x6c, 0x73, 0x21, 0xc3, 0xbe, 0x74, 0xd5, 0x34, 0x55,
+	0x9a, 0x19, 0xc3, 0x5f, 0x80, 0xab, 0x92, 0x6b, 0x84, 0x43, 0xf2, 0x6c, 0x62, 0x13, 0x7f, 0x84,
+	0x42, 0x82, 0xd2, 0xbe, 0x3d, 0x73, 0xda, 0xc4, 0x57, 0x34, 0xcd, 0x79, 0xa8, 0x20, 0x7b, 0x09,
+	0x42, 0xee, 0x20, 0x9d, 0x9b, 0x85, 0x3e, 0xa8, 0xc5, 0xef, 0x29, 0xec, 0x13, 0x22, 0x8e, 0xdc,
+	0x10, 0x9d, 0xd8, 0xc8, 0x75, 0x43, 0xcc, 0xb9, 0x4e, 0xd1, 0xfb, 0xcb, 0x73, 0x46, 0xbd, 0xbf,
+	0xf8, 0xb1, 0xc6, 0x3e, 0x8c, 0xa1, 0x32, 0x3f, 0x69, 0x91, 0x01, 0xfe, 0x1a, 0xbc, 0x21, 0xe3,
+	0xa5, 0xb1, 0x5c, 0x3c, 0xc4, 0x1e, 0x12, 0x2c, 0xb4, 0x43, 0x7c, 0x82, 0xc2, 0x0b, 0x26, 0xea,
+	0x3e, 0xf7, 0x12, 0xe2, 0x9d, 0x84, 0xc0, 0x52, 0xf8, 0xbe, 0x61, 0x6d, 0xd3, 0x85, 0x56, 0xf8,
+	0xb1, 0x09, 0x6e, 0xe5, 0xe2, 0x8f, 0xd0, 0x90, 0xb8, 0x2a, 0xbe, 0x4c, 0x6f, 0xc2, 0xb9, 0x6c,
+	0x8c, 0xab, 0x4a, 0xc3, 0xb7, 0x2e, 0xac, 0xe1, 0x30, 0x21, 0xe9, 0xa5, 0x1c, 0x7d, 0xc3, 0xaa,
+	0xd3, 0xa5, 0x1e, 0xf0, 0x18, 0x5c, 0x97, 0x52, 0x9e, 0x45, 0xbe, 0x6b, 0xe7, 0x6b, 0xb6, 0x56,
+	0x56, 0x02, 0xde, 0x3d, 0x57, 0xc0, 0x6e, 0xe4, 0xbb, 0xb9, 0xa2, 0xed, 0x1b, 0x96, 0xcc, 0x97,
+	0xb9, 0x79, 0x78, 0x08, 0x5e, 0x55, 0xfb, 0xac, 0xba, 0x90, 0x9d, 0x76, 0xc2, 0x8a, 0x0a, 0xf4,
+	0xd5, 0xa2, 0x32, 0x99, 0xed, 0xaa, 0x7d, 0xc3, 0xda, 0xa2, 0x73, 0x5d, 0x3a, 0xcf, 0x9b, 0x5c,
+	0xb3, 0x6b, 0x6b, 0xe7, 0xf3, 0x66, 0x8e, 0x96, 0x29, 0x6f, 0xda, 0xbe, 0x1e, 0xc4, 0xf5, 0x37,
+	0x62, 0x02, 0xd7, 0x40, 0xd1, 0xc5, 0x69, 0xda, 0x59, 0x0f, 0x99, 0xc0, 0xba, 0xfc, 0xe4, 0x23,
+	0xec, 0x82, 0x75, 0x09, 0x75, 0x71, 0xc0, 0x38, 0x11, 0xb5, 0x75, 0x85, 0x6e, 0x2c, 0x42, 0xef,
+	0xc4, 0x6e, 0x7d, 0xc3, 0x02, 0x34, 0x1d, 0xc1, 0x1d, 0x20, 0x47, 0x76, 0xe4, 0xff, 0x12, 0x91,
+	0x61, 0xad, 0x5a, 0x74, 0x99, 0x4c, 0x3e, 0x4d, 0x34, 0xcf, 0x53, 0xe5, 0xda, 0x37, 0xac, 0x35,
+	0x9a, 0x0c, 0xa0, 0x1d, 0x17, 0xaf, 0x13, 0x62, 0x24, 0xf0, 0x34, 0xd5, 0x6a, 0x97, 0x15, 0xdf,
+	0xdb, 0x33, 0x7c, 0xf1, 0xc7, 0x8c, 0xa6, 0xeb, 0x29, 0x4c, 0x9a, 0x36, 0xba, 0x7a, 0x67, 0x66,
+	0xe1, 0x4f, 0x80, 0x9c, 0xb5, 0xb1, 0x4b, 0x44, 0x86, 0x7e, 0x43, 0xd1, 0x7f, 0x6d, 0x19, 0xfd,
+	0x23, 0x97, 0x88, 0x2c, 0xf9, 0x26, 0x9d, 0x99, 0x83, 0x7b, 0xa0, 0x1a, 0xaf, 0xa2, 0x2a, 0x20,
+	0x5c, 0xbb, 0x32, 0xbf, 0xa3, 0xb3, 0xa4, 0xba, 0xd8, 0xe4, 0x66, 0xac, 0xd3, 0xe9, 0x30, 0x59,
+	0x86, 0x01, 0xf6, 0x88, 0x6f, 0x87, 0x38, 0xa5, 0xdc, 0x3c, 0x7f, 0x19, 0xba, 0x12, 0x63, 0xa5,
+	0x10, 0xbd, 0x0c, 0x33, 0xb3, 0xf0, 0x47, 0xf1, 0x81, 0x1b, 0xf9, 0x29, 0xf5, 0x56, 0xd1, 0xd5,
+	0x36, 0x4f, 0xfd, 0xd4, 0xcf, 0xb0, 0x5e, 0xa6, 0xd9, 0x89, 0xce, 0x9d, 0x2f, 0x3e, 0xbd, 0x7b,
+	0x7b, 0x69, 0x4b, 0x8b, 0x9b, 0x99, 0x54, 0xa8, 0x1b, 0xd9, 0x6f, 0x4d, 0x50, 0x3e, 0x20, 0x9e,
+	0xbf, 0xc3, 0x1c, 0xd8, 0x5b, 0x7c, 0xf7, 0x9a, 0x36, 0x31, 0xed, 0xfc, 0xff, 0xed, 0x64, 0xcd,
+	0xdf, 0xc8, 0x2f, 0x0f, 0xe1, 0xee, 0x62, 0x79, 0xb7, 0x59, 0x45, 0x54, 0x7f, 0xaf, 0x4a, 0x8a,
+	0x57, 0xb3, 0x14, 0xaa, 0xdb, 0x13, 0xbf, 0xfb, 0x8e, 0xc4, 0xfe, 0xfd, 0x9f, 0x8d, 0xb7, 0x2e,
+	0xf0, 0xb6, 0x12, 0xc0, 0x2d, 0x4d, 0x0a, 0x37, 0xc1, 0x8a, 0x87, 0xb8, 0x6a, 0x6d, 0x25, 0x4b,
+	0x3e, 0x66, 0x6e, 0xa2, 0xbf, 0x02, 0x55, 0xfd, 0x86, 0x48, 0x44, 0x21, 0x86, 0xbb, 0xa0, 0x1c,
+	0x44, 0x03, 0xfb, 0x18, 0xc7, 0x5f, 0x41, 0xd5, 0xee, 0xdd, 0x2f, 0x4f, 0x1b, 0x57, 0x83, 0x68,
+	0x30, 0x24, 0x8e, 0x9c, 0xfd, 0x3a, 0xa3, 0x44, 0x60, 0x1a, 0x88, 0xc9, 0xcb, 0xd3, 0xc6, 0xd6,
+	0x04, 0xd1, 0x61, 0xa7, 0x39, 0xb5, 0x36, 0xad, 0xd5, 0x20, 0x1a, 0xfc, 0x00, 0x4f, 0xe0, 0x0d,
+	0xb0, 0xc6, 0x13, 0x52, 0x15, 0xb9, 0x6a, 0x4d, 0x27, 0x74, 0x17, 0xff, 0x93, 0x09, 0xd6, 0xd2,
+	0x3b, 0x02, 0xbc, 0x07, 0x56, 0x9e, 0xe1, 0x64, 0x27, 0x5e, 0x2b, 0xde, 0x89, 0x5d, 0x9c, 0xac,
+	0xa1, 0xf4, 0x85, 0x8f, 0x00, 0x48, 0x39, 0x93, 0xe5, 0x6f, 0x2c, 0xde, 0x43, 0xe5, 0xa7, 0xf1,
+	0x19, 0x20, 0x84, 0xa0, 0x44, 0x31, 0x65, 0xaa, 0x53, 0xaf, 0x59, 0xea, 0xb9, 0xf9, 0x1f, 0x13,
+	0x6c, 0xe4, 0xb7, 0x5e, 0x1e, 0x74, 0xce, 0x11, 0x22, 0xbe, 0x4d, 0xe2, 0x8b, 0xc6, 0x5a, 0xb7,
+	0x7e, 0x76, 0xda, 0x28, 0xf7, 0xe4, 0xdc, 0xde, 0xce, 0xcb, 0xd3, 0xc6, 0x95, 0x78, 0x39, 0x12,
+	0xa7, 0xa6, 0x55, 0x56, 0x8f, 0x7b, 0x2e, 0xfc, 0x1e, 0xd8, 0xd0, 0x9f, 0xbb, 0xb6, 0x1f, 0xd1,
+	0x01, 0x0e, 0xe3, 0xcd, 0xe8, 0xbe, 0xf6, 0xf2, 0xb4, 0x71, 0x2d, 0x46, 0xe5, 0xed, 0x4d, 0xeb,
+	0xb2, 0x9e, 0xf8, 0xa1, 0x1a, 0xc3, 0x6d, 0x50, 0xe1, 0xf8, 0xa3, 0x48, 0xb5, 0x82, 0x15, 0xb5,
+	0x91, 0xe9, 0x38, 0xd5, 0x5f, 0x9a, 0xea, 0x4f, 0x56, 0xf3, 0xd2, 0xc5, 0x57, 0xb3, 0xdb, 0xf9,
+	0xfc, 0xac, 0x6e, 0x3e, 0x3f, 0xab, 0x9b, 0xff, 0x3a, 0xab, 0x9b, 0x7f, 0x7c, 0x51, 0x37, 0x9e,
+	0xbf, 0xa8, 0x1b, 0xff, 0x78, 0x51, 0x37, 0x7e, 0x7a, 0x73, 0x69, 0xca, 0x71, 0xe1, 0x0e, 0x56,
+	0xd5, 0x5f, 0x31, 0xf7, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x66, 0xa7, 0xb1, 0x54, 0x60, 0x13,
+	0x00, 0x00,
 }
 
 func (this *Supply) Equal(that interface{}) bool {
diff --git a/codec/std/codec.proto b/std/codec.proto
similarity index 98%
rename from codec/std/codec.proto
rename to std/codec.proto
index adf1e023b..67ca3e77c 100644
--- a/codec/std/codec.proto
+++ b/std/codec.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package cosmos_sdk.codec.std.v1;
+package cosmos_sdk.std.v1;
 
 import "third_party/proto/cosmos-proto/cosmos.proto";
 import "third_party/proto/gogoproto/gogo.proto";
@@ -16,7 +16,7 @@ import "x/staking/types/types.proto";
 import "x/params/types/proposal/types.proto";
 import "x/upgrade/types/types.proto";
 
-option go_package = "github.com/cosmos/cosmos-sdk/codec/std";
+option go_package = "github.com/cosmos/cosmos-sdk/std";
 
 // Account defines the application-level Account type.
 message Account {
diff --git a/codec/std/msgs.go b/std/msgs.go
similarity index 100%
rename from codec/std/msgs.go
rename to std/msgs.go
diff --git a/codec/std/msgs_test.go b/std/msgs_test.go
similarity index 97%
rename from codec/std/msgs_test.go
rename to std/msgs_test.go
index 0eda4809b..603dcf0f7 100644
--- a/codec/std/msgs_test.go
+++ b/std/msgs_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/cosmos/cosmos-sdk/codec/std"
+	"github.com/cosmos/cosmos-sdk/std"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/evidence"
 )
diff --git a/codec/std/tx.go b/std/tx.go
similarity index 100%
rename from codec/std/tx.go
rename to std/tx.go
diff --git a/codec/std/tx_test.go b/std/tx_test.go
similarity index 96%
rename from codec/std/tx_test.go
rename to std/tx_test.go
index 78d6eed85..fb625b279 100644
--- a/codec/std/tx_test.go
+++ b/std/tx_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/cosmos/cosmos-sdk/codec/std"
+	std "github.com/cosmos/cosmos-sdk/std"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/bank"
 )
diff --git a/x/auth/keeper/keeper_test.go b/x/auth/keeper/keeper_test.go
index 814d0f510..3bbc68048 100644
--- a/x/auth/keeper/keeper_test.go
+++ b/x/auth/keeper/keeper_test.go
@@ -1,11 +1,11 @@
 package keeper_test
 
 import (
+	"github.com/cosmos/cosmos-sdk/std"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
@@ -107,7 +107,7 @@ func TestSupply_ValidatePermissions(t *testing.T) {
 	maccPerms[multiPerm] = []string{types.Burner, types.Minter, types.Staking}
 	maccPerms[randomPerm] = []string{"random"}
 
-	appCodec := codecstd.NewAppCodec(app.Codec())
+	appCodec := std.NewAppCodec(app.Codec())
 	keeper := auth.NewAccountKeeper(
 		appCodec, app.GetKey(types.StoreKey), app.GetSubspace(types.ModuleName),
 		types.ProtoBaseAccount, maccPerms,
diff --git a/x/auth/simulation/decoder_test.go b/x/auth/simulation/decoder_test.go
index 0ed44e92f..e4f189c01 100644
--- a/x/auth/simulation/decoder_test.go
+++ b/x/auth/simulation/decoder_test.go
@@ -4,12 +4,13 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/cosmos/cosmos-sdk/std"
+
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/tendermint/crypto/ed25519"
 	tmkv "github.com/tendermint/tendermint/libs/kv"
 
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/simulation"
@@ -22,7 +23,7 @@ var (
 )
 
 func TestDecodeStore(t *testing.T) {
-	cdc := codecstd.NewAppCodec(codecstd.MakeCodec(simapp.ModuleBasics))
+	cdc := std.NewAppCodec(std.MakeCodec(simapp.ModuleBasics))
 	acc := types.NewBaseAccountWithAddress(delAddr1)
 	dec := simulation.NewDecodeStore(cdc)
 
diff --git a/x/auth/types/common_test.go b/x/auth/types/common_test.go
index 70214acb3..1ba524bca 100644
--- a/x/auth/types/common_test.go
+++ b/x/auth/types/common_test.go
@@ -1,11 +1,11 @@
 package types_test
 
 import (
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/simapp"
+	"github.com/cosmos/cosmos-sdk/std"
 )
 
 var (
 	app      = simapp.Setup(false)
-	appCodec = codecstd.NewAppCodec(app.Codec())
+	appCodec = std.NewAppCodec(app.Codec())
 )
diff --git a/x/auth/vesting/types/common_test.go b/x/auth/vesting/types/common_test.go
index 70214acb3..1ba524bca 100644
--- a/x/auth/vesting/types/common_test.go
+++ b/x/auth/vesting/types/common_test.go
@@ -1,11 +1,11 @@
 package types_test
 
 import (
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/simapp"
+	"github.com/cosmos/cosmos-sdk/std"
 )
 
 var (
 	app      = simapp.Setup(false)
-	appCodec = codecstd.NewAppCodec(app.Codec())
+	appCodec = std.NewAppCodec(app.Codec())
 )
diff --git a/x/bank/keeper/keeper_test.go b/x/bank/keeper/keeper_test.go
index ee3de2b6b..2ae3f8131 100644
--- a/x/bank/keeper/keeper_test.go
+++ b/x/bank/keeper/keeper_test.go
@@ -1,6 +1,7 @@
 package keeper_test
 
 import (
+	"github.com/cosmos/cosmos-sdk/std"
 	"testing"
 	"time"
 
@@ -9,7 +10,6 @@ import (
 	tmkv "github.com/tendermint/tendermint/libs/kv"
 	tmtime "github.com/tendermint/tendermint/types/time"
 
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
@@ -91,7 +91,7 @@ func (suite *IntegrationTestSuite) TestSupply() {
 func (suite *IntegrationTestSuite) TestSupply_SendCoins() {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, abci.Header{Height: 1})
-	appCodec := codecstd.NewAppCodec(app.Codec())
+	appCodec := std.NewAppCodec(app.Codec())
 
 	// add module accounts to supply keeper
 	maccPerms := simapp.GetMaccPerms()
@@ -154,7 +154,7 @@ func (suite *IntegrationTestSuite) TestSupply_SendCoins() {
 func (suite *IntegrationTestSuite) TestSupply_MintCoins() {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, abci.Header{Height: 1})
-	appCodec := codecstd.NewAppCodec(app.Codec())
+	appCodec := std.NewAppCodec(app.Codec())
 
 	// add module accounts to supply keeper
 	maccPerms := simapp.GetMaccPerms()
@@ -208,7 +208,7 @@ func (suite *IntegrationTestSuite) TestSupply_MintCoins() {
 func (suite *IntegrationTestSuite) TestSupply_BurnCoins() {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, abci.Header{Height: 1})
-	appCodec := codecstd.NewAppCodec(app.Codec())
+	appCodec := std.NewAppCodec(app.Codec())
 
 	// add module accounts to supply keeper
 	maccPerms := simapp.GetMaccPerms()
diff --git a/x/bank/simulation/decoder_test.go b/x/bank/simulation/decoder_test.go
index 60cd01461..3a87993c4 100644
--- a/x/bank/simulation/decoder_test.go
+++ b/x/bank/simulation/decoder_test.go
@@ -2,12 +2,12 @@ package simulation_test
 
 import (
 	"fmt"
+	"github.com/cosmos/cosmos-sdk/std"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 	tmkv "github.com/tendermint/tendermint/libs/kv"
 
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/bank/simulation"
@@ -15,7 +15,7 @@ import (
 )
 
 func TestDecodeStore(t *testing.T) {
-	cdc := codecstd.NewAppCodec(codecstd.MakeCodec(simapp.ModuleBasics))
+	cdc := std.NewAppCodec(std.MakeCodec(simapp.ModuleBasics))
 	dec := simulation.NewDecodeStore(cdc)
 
 	totalSupply := types.NewSupply(sdk.NewCoins(sdk.NewInt64Coin(sdk.DefaultBondDenom, 1000)))
diff --git a/x/distribution/simulation/decoder_test.go b/x/distribution/simulation/decoder_test.go
index a9d4859e4..5f910425b 100644
--- a/x/distribution/simulation/decoder_test.go
+++ b/x/distribution/simulation/decoder_test.go
@@ -2,6 +2,7 @@ package simulation_test
 
 import (
 	"fmt"
+	"github.com/cosmos/cosmos-sdk/std"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -9,7 +10,6 @@ import (
 	"github.com/tendermint/tendermint/crypto/ed25519"
 	tmkv "github.com/tendermint/tendermint/libs/kv"
 
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/distribution/simulation"
@@ -24,7 +24,7 @@ var (
 )
 
 func TestDecodeDistributionStore(t *testing.T) {
-	cdc := codecstd.NewAppCodec(codecstd.MakeCodec(simapp.ModuleBasics))
+	cdc := std.NewAppCodec(std.MakeCodec(simapp.ModuleBasics))
 	dec := simulation.NewDecodeStore(cdc)
 
 	decCoins := sdk.DecCoins{sdk.NewDecCoinFromDec(sdk.DefaultBondDenom, sdk.OneDec())}
diff --git a/x/evidence/handler_test.go b/x/evidence/handler_test.go
index d6c59762a..9c4b665e8 100644
--- a/x/evidence/handler_test.go
+++ b/x/evidence/handler_test.go
@@ -5,12 +5,13 @@ import (
 	"testing"
 	"time"
 
+	"github.com/cosmos/cosmos-sdk/std"
+
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/crypto/ed25519"
 
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/evidence"
@@ -25,8 +26,8 @@ type HandlerTestSuite struct {
 	app     *simapp.SimApp
 }
 
-func testMsgSubmitEvidence(r *require.Assertions, e exported.Evidence, s sdk.AccAddress) codecstd.MsgSubmitEvidence {
-	msg, err := codecstd.NewMsgSubmitEvidence(e, s)
+func testMsgSubmitEvidence(r *require.Assertions, e exported.Evidence, s sdk.AccAddress) std.MsgSubmitEvidence {
+	msg, err := std.NewMsgSubmitEvidence(e, s)
 	r.NoError(err)
 	return msg
 }
@@ -55,7 +56,7 @@ func (suite *HandlerTestSuite) SetupTest() {
 
 	// recreate keeper in order to use custom testing types
 	evidenceKeeper := evidence.NewKeeper(
-		codecstd.NewAppCodec(app.Codec()), app.GetKey(evidence.StoreKey),
+		std.NewAppCodec(app.Codec()), app.GetKey(evidence.StoreKey),
 		app.StakingKeeper, app.SlashingKeeper,
 	)
 	router := evidence.NewRouter()
@@ -118,7 +119,7 @@ func (suite *HandlerTestSuite) TestMsgSubmitEvidence() {
 			suite.Require().NoError(err, "unexpected error; tc #%d", i)
 			suite.Require().NotNil(res, "expected non-nil result; tc #%d", i)
 
-			msg := tc.msg.(codecstd.MsgSubmitEvidence)
+			msg := tc.msg.(std.MsgSubmitEvidence)
 			suite.Require().Equal(msg.GetEvidence().Hash().Bytes(), res.Data, "invalid hash; tc #%d", i)
 		}
 	}
diff --git a/x/evidence/keeper/keeper_test.go b/x/evidence/keeper/keeper_test.go
index 7c0c8e470..87544446e 100644
--- a/x/evidence/keeper/keeper_test.go
+++ b/x/evidence/keeper/keeper_test.go
@@ -6,7 +6,8 @@ import (
 	"testing"
 	"time"
 
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
+	"github.com/cosmos/cosmos-sdk/std"
+
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
@@ -83,7 +84,7 @@ func (suite *KeeperTestSuite) SetupTest() {
 
 	// recreate keeper in order to use custom testing types
 	evidenceKeeper := evidence.NewKeeper(
-		codecstd.NewAppCodec(app.Codec()), app.GetKey(evidence.StoreKey),
+		std.NewAppCodec(app.Codec()), app.GetKey(evidence.StoreKey),
 		app.StakingKeeper, app.SlashingKeeper,
 	)
 	router := evidence.NewRouter()
diff --git a/x/evidence/keeper/querier_test.go b/x/evidence/keeper/querier_test.go
index d7522d28d..9c0883d73 100644
--- a/x/evidence/keeper/querier_test.go
+++ b/x/evidence/keeper/querier_test.go
@@ -3,7 +3,8 @@ package keeper_test
 import (
 	"strings"
 
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
+	"github.com/cosmos/cosmos-sdk/std"
+
 	"github.com/cosmos/cosmos-sdk/x/evidence/exported"
 	"github.com/cosmos/cosmos-sdk/x/evidence/types"
 
@@ -17,7 +18,7 @@ const (
 func (suite *KeeperTestSuite) TestQueryEvidence_Existing() {
 	ctx := suite.ctx.WithIsCheckTx(false)
 	numEvidence := 100
-	cdc := codecstd.NewAppCodec(suite.app.Codec())
+	cdc := std.NewAppCodec(suite.app.Codec())
 
 	evidence := suite.populateEvidence(ctx, numEvidence)
 	query := abci.RequestQuery{
@@ -36,7 +37,7 @@ func (suite *KeeperTestSuite) TestQueryEvidence_Existing() {
 
 func (suite *KeeperTestSuite) TestQueryEvidence_NonExisting() {
 	ctx := suite.ctx.WithIsCheckTx(false)
-	cdc := codecstd.NewAppCodec(suite.app.Codec())
+	cdc := std.NewAppCodec(suite.app.Codec())
 	numEvidence := 100
 
 	suite.populateEvidence(ctx, numEvidence)
@@ -52,7 +53,7 @@ func (suite *KeeperTestSuite) TestQueryEvidence_NonExisting() {
 
 func (suite *KeeperTestSuite) TestQueryAllEvidence() {
 	ctx := suite.ctx.WithIsCheckTx(false)
-	cdc := codecstd.NewAppCodec(suite.app.Codec())
+	cdc := std.NewAppCodec(suite.app.Codec())
 	numEvidence := 100
 
 	suite.populateEvidence(ctx, numEvidence)
@@ -72,7 +73,7 @@ func (suite *KeeperTestSuite) TestQueryAllEvidence() {
 
 func (suite *KeeperTestSuite) TestQueryAllEvidence_InvalidPagination() {
 	ctx := suite.ctx.WithIsCheckTx(false)
-	cdc := codecstd.NewAppCodec(suite.app.Codec())
+	cdc := std.NewAppCodec(suite.app.Codec())
 	numEvidence := 100
 
 	suite.populateEvidence(ctx, numEvidence)
diff --git a/x/evidence/simulation/decoder_test.go b/x/evidence/simulation/decoder_test.go
index c7f1ad30c..8e8f82172 100644
--- a/x/evidence/simulation/decoder_test.go
+++ b/x/evidence/simulation/decoder_test.go
@@ -5,11 +5,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/cosmos/cosmos-sdk/std"
+
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/tendermint/crypto/ed25519"
 	tmkv "github.com/tendermint/tendermint/libs/kv"
 
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/evidence/simulation"
@@ -17,7 +18,7 @@ import (
 )
 
 func TestDecodeStore(t *testing.T) {
-	cdc := codecstd.NewAppCodec(codecstd.MakeCodec(simapp.ModuleBasics))
+	cdc := std.NewAppCodec(std.MakeCodec(simapp.ModuleBasics))
 	dec := simulation.NewDecodeStore(cdc)
 
 	delPk1 := ed25519.GenPrivKey().PubKey()
diff --git a/x/evidence/types/codec_test.go b/x/evidence/types/codec_test.go
index cfe2a6483..ef24835d1 100644
--- a/x/evidence/types/codec_test.go
+++ b/x/evidence/types/codec_test.go
@@ -4,10 +4,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/cosmos/cosmos-sdk/std"
+
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/tendermint/crypto/ed25519"
 
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	"github.com/cosmos/cosmos-sdk/x/evidence/exported"
 	"github.com/cosmos/cosmos-sdk/x/evidence/types"
@@ -15,7 +16,7 @@ import (
 
 func TestCodec(t *testing.T) {
 	app := simapp.Setup(false)
-	appCodec := codecstd.NewAppCodec(app.Codec())
+	appCodec := std.NewAppCodec(app.Codec())
 	pk := ed25519.GenPrivKey()
 
 	var e exported.Evidence = &types.Equivocation{
diff --git a/x/evidence/types/msgs_test.go b/x/evidence/types/msgs_test.go
index 73d4ef67e..639f2ffe1 100644
--- a/x/evidence/types/msgs_test.go
+++ b/x/evidence/types/msgs_test.go
@@ -4,7 +4,8 @@ import (
 	"testing"
 	"time"
 
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
+	"github.com/cosmos/cosmos-sdk/std"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/evidence/exported"
 	"github.com/cosmos/cosmos-sdk/x/evidence/types"
@@ -13,8 +14,8 @@ import (
 	"github.com/tendermint/tendermint/crypto/ed25519"
 )
 
-func testMsgSubmitEvidence(t *testing.T, e exported.Evidence, s sdk.AccAddress) codecstd.MsgSubmitEvidence {
-	msg, err := codecstd.NewMsgSubmitEvidence(e, s)
+func testMsgSubmitEvidence(t *testing.T, e exported.Evidence, s sdk.AccAddress) std.MsgSubmitEvidence {
+	msg, err := std.NewMsgSubmitEvidence(e, s)
 	require.NoError(t, err)
 	return msg
 }
diff --git a/x/gov/abci_test.go b/x/gov/abci_test.go
index 94e461329..ba251dc4b 100644
--- a/x/gov/abci_test.go
+++ b/x/gov/abci_test.go
@@ -1,11 +1,10 @@
 package gov_test
 
 import (
+	"github.com/cosmos/cosmos-sdk/std"
 	"testing"
 	"time"
 
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
-
 	"github.com/stretchr/testify/require"
 	abci "github.com/tendermint/tendermint/abci/types"
 
@@ -29,7 +28,7 @@ func TestTickExpiredDepositPeriod(t *testing.T) {
 	require.False(t, inactiveQueue.Valid())
 	inactiveQueue.Close()
 
-	newProposalMsg, err := codecstd.NewMsgSubmitProposal(
+	newProposalMsg, err := std.NewMsgSubmitProposal(
 		gov.ContentFromProposalType("test", "test", gov.ProposalTypeText),
 		sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)},
 		addrs[0],
@@ -81,7 +80,7 @@ func TestTickMultipleExpiredDepositPeriod(t *testing.T) {
 	require.False(t, inactiveQueue.Valid())
 	inactiveQueue.Close()
 
-	newProposalMsg, err := codecstd.NewMsgSubmitProposal(
+	newProposalMsg, err := std.NewMsgSubmitProposal(
 		gov.ContentFromProposalType("test", "test", gov.ProposalTypeText),
 		sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)},
 		addrs[0],
@@ -104,7 +103,7 @@ func TestTickMultipleExpiredDepositPeriod(t *testing.T) {
 	require.False(t, inactiveQueue.Valid())
 	inactiveQueue.Close()
 
-	newProposalMsg2, err := codecstd.NewMsgSubmitProposal(
+	newProposalMsg2, err := std.NewMsgSubmitProposal(
 		gov.ContentFromProposalType("test2", "test2", gov.ProposalTypeText),
 		sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)},
 		addrs[0],
@@ -161,7 +160,7 @@ func TestTickPassedDepositPeriod(t *testing.T) {
 	require.False(t, activeQueue.Valid())
 	activeQueue.Close()
 
-	newProposalMsg, err := codecstd.NewMsgSubmitProposal(
+	newProposalMsg, err := std.NewMsgSubmitProposal(
 		gov.ContentFromProposalType("test2", "test2", gov.ProposalTypeText),
 		sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)},
 		addrs[0],
@@ -217,7 +216,7 @@ func TestTickPassedVotingPeriod(t *testing.T) {
 	activeQueue.Close()
 
 	proposalCoins := sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, sdk.TokensFromConsensusPower(5))}
-	newProposalMsg, err := codecstd.NewMsgSubmitProposal(TestProposal, proposalCoins, addrs[0])
+	newProposalMsg, err := std.NewMsgSubmitProposal(TestProposal, proposalCoins, addrs[0])
 	require.NoError(t, err)
 
 	res, err := govHandler(ctx, newProposalMsg)
diff --git a/x/gov/keeper/common_test.go b/x/gov/keeper/common_test.go
index 90b645b79..b2e1b6d88 100644
--- a/x/gov/keeper/common_test.go
+++ b/x/gov/keeper/common_test.go
@@ -1,8 +1,8 @@
 package keeper_test
 
 import (
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/simapp"
+	"github.com/cosmos/cosmos-sdk/std"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/gov/types"
 	"github.com/cosmos/cosmos-sdk/x/staking"
@@ -17,7 +17,7 @@ func createValidators(ctx sdk.Context, app *simapp.SimApp, powers []int64) ([]sd
 	valAddrs := simapp.ConvertAddrsToValAddrs(addrs)
 	pks := simapp.CreateTestPubKeys(5)
 
-	appCodec := codecstd.NewAppCodec(app.Codec())
+	appCodec := std.NewAppCodec(app.Codec())
 	app.StakingKeeper = staking.NewKeeper(
 		appCodec,
 		app.GetKey(staking.StoreKey),
diff --git a/x/gov/keeper/querier_test.go b/x/gov/keeper/querier_test.go
index f0377d2f2..5ed372281 100644
--- a/x/gov/keeper/querier_test.go
+++ b/x/gov/keeper/querier_test.go
@@ -1,6 +1,7 @@
 package keeper_test
 
 import (
+	"github.com/cosmos/cosmos-sdk/std"
 	"math/rand"
 	"strings"
 	"testing"
@@ -10,7 +11,6 @@ import (
 	abci "github.com/tendermint/tendermint/abci/types"
 
 	"github.com/cosmos/cosmos-sdk/codec"
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/gov/keeper"
@@ -147,7 +147,7 @@ func getQueriedVotes(t *testing.T, ctx sdk.Context, cdc codec.JSONMarshaler, que
 func TestQueries(t *testing.T) {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, abci.Header{})
-	appCodec := codecstd.NewAppCodec(app.Codec())
+	appCodec := std.NewAppCodec(app.Codec())
 
 	querier := keeper.NewQuerier(app.GovKeeper)
 
@@ -295,7 +295,7 @@ func TestQueries(t *testing.T) {
 func TestPaginatedVotesQuery(t *testing.T) {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, abci.Header{})
-	appCodec := codecstd.NewAppCodec(app.Codec())
+	appCodec := std.NewAppCodec(app.Codec())
 
 	proposal := types.Proposal{
 		ProposalBase: types.ProposalBase{
diff --git a/x/gov/simulation/decoder_test.go b/x/gov/simulation/decoder_test.go
index 64cb81ac1..3e34ecfc3 100644
--- a/x/gov/simulation/decoder_test.go
+++ b/x/gov/simulation/decoder_test.go
@@ -3,6 +3,7 @@ package simulation_test
 import (
 	"encoding/binary"
 	"fmt"
+	"github.com/cosmos/cosmos-sdk/std"
 	"testing"
 	"time"
 
@@ -11,7 +12,6 @@ import (
 	"github.com/tendermint/tendermint/crypto/ed25519"
 	tmkv "github.com/tendermint/tendermint/libs/kv"
 
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/gov/simulation"
@@ -24,7 +24,7 @@ var (
 )
 
 func TestDecodeStore(t *testing.T) {
-	cdc := codecstd.NewAppCodec(codecstd.MakeCodec(simapp.ModuleBasics))
+	cdc := std.NewAppCodec(std.MakeCodec(simapp.ModuleBasics))
 	dec := simulation.NewDecodeStore(cdc)
 
 	endTime := time.Now().UTC()
diff --git a/x/gov/simulation/operations.go b/x/gov/simulation/operations.go
index c45069eec..5c82f235e 100644
--- a/x/gov/simulation/operations.go
+++ b/x/gov/simulation/operations.go
@@ -5,12 +5,11 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/cosmos/cosmos-sdk/codec/std"
-
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/simapp/helpers"
 	simappparams "github.com/cosmos/cosmos-sdk/simapp/params"
+	std "github.com/cosmos/cosmos-sdk/std"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 	"github.com/cosmos/cosmos-sdk/x/gov/keeper"
diff --git a/x/ibc/04-channel/keeper/keeper_test.go b/x/ibc/04-channel/keeper/keeper_test.go
index 8737002e9..52f60c0a4 100644
--- a/x/ibc/04-channel/keeper/keeper_test.go
+++ b/x/ibc/04-channel/keeper/keeper_test.go
@@ -46,7 +46,7 @@ const (
 
 	trustingPeriod time.Duration = time.Hour * 24 * 7 * 2
 	ubdPeriod      time.Duration = time.Hour * 24 * 7 * 3
-  maxClockDrift  time.Duration = time.Second * 10
+	maxClockDrift  time.Duration = time.Second * 10
 
 	timeoutHeight            = 100
 	timeoutTimestamp         = 100
diff --git a/x/mint/simulation/decoder_test.go b/x/mint/simulation/decoder_test.go
index 07cd5bd77..d85844778 100644
--- a/x/mint/simulation/decoder_test.go
+++ b/x/mint/simulation/decoder_test.go
@@ -4,11 +4,12 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/cosmos/cosmos-sdk/std"
+
 	"github.com/stretchr/testify/require"
 
 	tmkv "github.com/tendermint/tendermint/libs/kv"
 
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/mint/simulation"
@@ -16,7 +17,7 @@ import (
 )
 
 func TestDecodeStore(t *testing.T) {
-	cdc := codecstd.NewAppCodec(codecstd.MakeCodec(simapp.ModuleBasics))
+	cdc := std.NewAppCodec(std.MakeCodec(simapp.ModuleBasics))
 	dec := simulation.NewDecodeStore(cdc)
 
 	minter := types.NewMinter(sdk.OneDec(), sdk.NewDec(15))
diff --git a/x/slashing/simulation/decoder_test.go b/x/slashing/simulation/decoder_test.go
index d9af238ef..83a265a64 100644
--- a/x/slashing/simulation/decoder_test.go
+++ b/x/slashing/simulation/decoder_test.go
@@ -2,6 +2,7 @@ package simulation_test
 
 import (
 	"fmt"
+	"github.com/cosmos/cosmos-sdk/std"
 	"testing"
 	"time"
 
@@ -12,7 +13,6 @@ import (
 	"github.com/tendermint/tendermint/crypto/ed25519"
 	tmkv "github.com/tendermint/tendermint/libs/kv"
 
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/slashing/simulation"
@@ -28,7 +28,7 @@ var (
 )
 
 func TestDecodeStore(t *testing.T) {
-	cdc := codecstd.NewAppCodec(codecstd.MakeCodec(simapp.ModuleBasics))
+	cdc := std.NewAppCodec(std.MakeCodec(simapp.ModuleBasics))
 	dec := simulation.NewDecodeStore(cdc)
 
 	info := types.NewValidatorSigningInfo(consAddr1, 0, 1, time.Now().UTC(), false, 0)
diff --git a/x/staking/common_test.go b/x/staking/common_test.go
index 85bec932f..578442d5d 100644
--- a/x/staking/common_test.go
+++ b/x/staking/common_test.go
@@ -1,12 +1,12 @@
 package staking_test
 
 import (
+	"github.com/cosmos/cosmos-sdk/std"
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/crypto"
 	"github.com/tendermint/tendermint/crypto/secp256k1"
 
 	"github.com/cosmos/cosmos-sdk/codec"
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/staking"
@@ -43,7 +43,7 @@ func getBaseSimappWithCustomKeeper() (*codec.Codec, *simapp.SimApp, sdk.Context)
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, abci.Header{})
 
-	appCodec := codecstd.NewAppCodec(codec.New())
+	appCodec := std.NewAppCodec(codec.New())
 
 	app.StakingKeeper = keeper.NewKeeper(
 		appCodec,
diff --git a/x/staking/keeper/common_test.go b/x/staking/keeper/common_test.go
index 579dc4afb..d91ccf351 100644
--- a/x/staking/keeper/common_test.go
+++ b/x/staking/keeper/common_test.go
@@ -1,12 +1,12 @@
 package keeper_test
 
 import (
+	"github.com/cosmos/cosmos-sdk/std"
 	"testing"
 
 	abci "github.com/tendermint/tendermint/abci/types"
 
 	"github.com/cosmos/cosmos-sdk/codec"
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/staking"
@@ -24,7 +24,7 @@ func createTestInput() (*codec.Codec, *simapp.SimApp, sdk.Context) {
 	app := simapp.Setup(false)
 	ctx := app.BaseApp.NewContext(false, abci.Header{})
 
-	appCodec := codecstd.NewAppCodec(codec.New())
+	appCodec := std.NewAppCodec(codec.New())
 
 	app.StakingKeeper = keeper.NewKeeper(
 		appCodec,
diff --git a/x/staking/simulation/decoder_test.go b/x/staking/simulation/decoder_test.go
index 01979b501..b1568eb3a 100644
--- a/x/staking/simulation/decoder_test.go
+++ b/x/staking/simulation/decoder_test.go
@@ -2,6 +2,7 @@ package simulation_test
 
 import (
 	"fmt"
+	"github.com/cosmos/cosmos-sdk/std"
 	"testing"
 	"time"
 
@@ -11,7 +12,6 @@ import (
 	tmkv "github.com/tendermint/tendermint/libs/kv"
 
 	"github.com/cosmos/cosmos-sdk/codec"
-	codecstd "github.com/cosmos/cosmos-sdk/codec/std"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/staking/simulation"
@@ -33,7 +33,7 @@ func makeTestCodec() (cdc *codec.Codec) {
 }
 
 func TestDecodeStore(t *testing.T) {
-	cdc := codecstd.NewAppCodec(codecstd.MakeCodec(simapp.ModuleBasics))
+	cdc := std.NewAppCodec(std.MakeCodec(simapp.ModuleBasics))
 	dec := simulation.NewDecodeStore(cdc)
 
 	bondTime := time.Now().UTC()