ibc: applications restructure (#7425)

* ibc: applications refactor * update proto files * try fix castrepeated * fix proto * update spec Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
2020-10-01 17:32:53 +02:00 · 2020-10-01 17:32:53 +02:00 · 92ffed01bb
parent 72353902e2
commit 92ffed01bb
59 changed files with 221 additions and 210 deletions
--- a/proto/ibc/applications/transfer/v1/genesis.proto
+++ b/proto/ibc/applications/transfer/v1/genesis.proto
@ -1,14 +1,14 @@
 syntax = "proto3";
-package ibc.transfer;
+package ibc.applications.transfer.v1;

-option go_package = "github.com/cosmos/cosmos-sdk/x/ibc-transfer/types";
+option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types";

 import "gogoproto/gogo.proto";
-import "ibc/transfer/transfer.proto";
+import "ibc/applications/transfer/v1/transfer.proto";

 // GenesisState defines the ibc-transfer genesis state
 message GenesisState {
-  string   port_id                 = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
+  string              port_id      = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
  repeated DenomTrace denom_traces = 2 [
    (gogoproto.castrepeated) = "Traces",
    (gogoproto.nullable)     = false,
--- a/proto/ibc/applications/transfer/v1/query.proto
+++ b/proto/ibc/applications/transfer/v1/query.proto
@ -1,12 +1,12 @@
 syntax = "proto3";
-package ibc.transfer;
+package ibc.applications.transfer.v1;

 import "gogoproto/gogo.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
-import "ibc/transfer/transfer.proto";
+import "ibc/applications/transfer/v1/transfer.proto";
 import "google/api/annotations.proto";

-option go_package = "github.com/cosmos/cosmos-sdk/x/ibc-transfer/types";
+option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types";

 // Query provides defines the gRPC querier service.
 service Query {
--- a/proto/ibc/applications/transfer/v1/transfer.proto
+++ b/proto/ibc/applications/transfer/v1/transfer.proto
@ -1,7 +1,7 @@
 syntax = "proto3";
-package ibc.transfer;
+package ibc.applications.transfer.v1;

-option go_package = "github.com/cosmos/cosmos-sdk/x/ibc-transfer/types";
+option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types";

 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
--- a/simapp/app.go
+++ b/simapp/app.go
@ -55,12 +55,12 @@ import (
 	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc"
-	transfer "github.com/cosmos/cosmos-sdk/x/ibc-transfer"
-	ibctransferkeeper "github.com/cosmos/cosmos-sdk/x/ibc-transfer/keeper"
-	ibctransfertypes "github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
 	ibcclient "github.com/cosmos/cosmos-sdk/x/ibc/02-client"
 	porttypes "github.com/cosmos/cosmos-sdk/x/ibc/05-port/types"
 	ibchost "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
+	transfer "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer"
+	ibctransferkeeper "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/keeper"
+	ibctransfertypes "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 	ibckeeper "github.com/cosmos/cosmos-sdk/x/ibc/keeper"
 	ibcmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock"
 	"github.com/cosmos/cosmos-sdk/x/mint"
--- a/simapp/sim_test.go
+++ b/simapp/sim_test.go
@ -24,8 +24,8 @@ import (
 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
-	ibctransfertypes "github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
 	ibchost "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
+	ibctransfertypes "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	"github.com/cosmos/cosmos-sdk/x/simulation"
--- a/x/ibc/04-channel/client/cli/tx.go
+++ b/x/ibc/04-channel/client/cli/tx.go
@ -9,10 +9,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
-	ibctransfertypes "github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
 	connectionutils "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/client/utils"
 	"github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
+	ibctransfertypes "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 )

 // IBC Channel flags
--- a/x/ibc/applications/transfer/client/cli/cli.go
+++ b/x/ibc/applications/transfer/client/cli/cli.go
--- a/x/ibc/applications/transfer/client/cli/query.go
+++ b/x/ibc/applications/transfer/client/cli/query.go
@ -9,7 +9,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/version"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 )

 // GetCmdQueryDenomTrace defines the command to query a a denomination trace from a given hash.
--- a/x/ibc/applications/transfer/client/cli/tx.go
+++ b/x/ibc/applications/transfer/client/cli/tx.go
@ -11,9 +11,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/version"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
 	channelutils "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/client/utils"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 )

 const (
--- a/x/ibc/applications/transfer/handler.go
+++ b/x/ibc/applications/transfer/handler.go
@ -3,8 +3,8 @@ package transfer
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/keeper"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/keeper"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 )

 // NewHandler returns sdk.Handler for IBC token transfer module messages
--- a/x/ibc/applications/transfer/handler_test.go
+++ b/x/ibc/applications/transfer/handler_test.go
@ -6,9 +6,9 @@ import (
 	"github.com/stretchr/testify/suite"

 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
 	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/applications/transfer/keeper/encoding.go
+++ b/x/ibc/applications/transfer/keeper/encoding.go
@ -1,7 +1,7 @@
 package keeper

 import (
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 )

 // UnmarshalDenomTrace attempts to decode and return an DenomTrace object from
--- a/x/ibc/applications/transfer/keeper/genesis.go
+++ b/x/ibc/applications/transfer/keeper/genesis.go
@ -4,7 +4,7 @@ import (
 	"fmt"

 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 )

 // InitGenesis initializes the ibc-transfer state and binds to PortID.
--- a/x/ibc/applications/transfer/keeper/genesis_test.go
+++ b/x/ibc/applications/transfer/keeper/genesis_test.go
@ -3,7 +3,7 @@ package keeper_test
 import (
 	"fmt"

-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 )

 func (suite *KeeperTestSuite) TestGenesis() {
--- a/x/ibc/applications/transfer/keeper/grpc_query.go
+++ b/x/ibc/applications/transfer/keeper/grpc_query.go
@ -11,7 +11,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/types/query"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 )

 var _ types.QueryServer = Keeper{}
--- a/x/ibc/applications/transfer/keeper/grpc_query_test.go
+++ b/x/ibc/applications/transfer/keeper/grpc_query_test.go
@ -5,7 +5,7 @@ import (

 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/query"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 )

 func (suite *KeeperTestSuite) TestQueryDenomTrace() {
--- a/x/ibc/applications/transfer/keeper/keeper.go
+++ b/x/ibc/applications/transfer/keeper/keeper.go
@ -13,9 +13,9 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper"
 	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
 	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 )

--- a/x/ibc/applications/transfer/keeper/keeper_test.go
+++ b/x/ibc/applications/transfer/keeper/keeper_test.go
@ -8,7 +8,7 @@ import (

 	"github.com/cosmos/cosmos-sdk/baseapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/applications/transfer/keeper/params.go
+++ b/x/ibc/applications/transfer/keeper/params.go
@ -2,7 +2,7 @@ package keeper

 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 )

 // GetSendEnabled retrieves the send enabled boolean from the paramstore
--- a/x/ibc/applications/transfer/keeper/params_test.go
+++ b/x/ibc/applications/transfer/keeper/params_test.go
@ -1,6 +1,6 @@
 package keeper_test

-import "github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
+import "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"

 func (suite *KeeperTestSuite) TestParams() {
 	expParams := types.DefaultParams()
--- a/x/ibc/applications/transfer/keeper/relay.go
+++ b/x/ibc/applications/transfer/keeper/relay.go
@ -5,10 +5,10 @@ import (

 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
 	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 )

 // SendTransfer handles transfer sending logic. There are 2 possible cases:
--- a/x/ibc/applications/transfer/keeper/relay_test.go
+++ b/x/ibc/applications/transfer/keeper/relay_test.go
@ -4,10 +4,10 @@ import (
 	"fmt"

 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
 	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/applications/transfer/module.go
+++ b/x/ibc/applications/transfer/module.go
@ -22,13 +22,13 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/client/cli"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/keeper"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/simulation"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
 	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
 	porttypes "github.com/cosmos/cosmos-sdk/x/ibc/05-port/types"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/client/cli"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/keeper"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/simulation"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 )

 var (
--- a/x/ibc/applications/transfer/module_test.go
+++ b/x/ibc/applications/transfer/module_test.go
@ -2,9 +2,9 @@ package transfer_test

 import (
 	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
 	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/applications/transfer/simulation/decoder.go
+++ b/x/ibc/applications/transfer/simulation/decoder.go
@ -5,7 +5,7 @@ import (
 	"fmt"

 	"github.com/cosmos/cosmos-sdk/types/kv"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 )

 // TransferUnmarshaler defines the expected encoding store functions.
--- a/x/ibc/applications/transfer/simulation/decoder_test.go
+++ b/x/ibc/applications/transfer/simulation/decoder_test.go
@ -8,8 +8,8 @@ import (

 	"github.com/cosmos/cosmos-sdk/simapp"
 	"github.com/cosmos/cosmos-sdk/types/kv"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/simulation"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/simulation"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 )

 func TestDecodeStore(t *testing.T) {
--- a/x/ibc/applications/transfer/simulation/genesis.go
+++ b/x/ibc/applications/transfer/simulation/genesis.go
@ -8,7 +8,7 @@ import (

 	"github.com/cosmos/cosmos-sdk/types/module"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 )

 // Simulation parameter constants
--- a/x/ibc/applications/transfer/simulation/genesis_test.go
+++ b/x/ibc/applications/transfer/simulation/genesis_test.go
@ -11,8 +11,8 @@ import (
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/simulation"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/simulation"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 )

 // TestRandomizedGenState tests the normal scenario of applying RandomizedGenState.
--- a/x/ibc/applications/transfer/simulation/params.go
+++ b/x/ibc/applications/transfer/simulation/params.go
@ -9,7 +9,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/simulation"

 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 )

 // ParamChanges defines the parameters that can be modified by param change proposals
--- a/x/ibc/applications/transfer/simulation/params_test.go
+++ b/x/ibc/applications/transfer/simulation/params_test.go
@ -6,7 +6,7 @@ import (

 	"github.com/stretchr/testify/require"

-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/simulation"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/simulation"
 )

 func TestParamChanges(t *testing.T) {
--- a/x/ibc/applications/transfer/spec/01_concepts.md
+++ b/x/ibc/applications/transfer/spec/01_concepts.md
--- a/x/ibc/applications/transfer/spec/02_state.md
+++ b/x/ibc/applications/transfer/spec/02_state.md
--- a/x/ibc/applications/transfer/spec/03_state_transitions.md
+++ b/x/ibc/applications/transfer/spec/03_state_transitions.md
--- a/x/ibc/applications/transfer/spec/04_messages.md
+++ b/x/ibc/applications/transfer/spec/04_messages.md
--- a/x/ibc/applications/transfer/spec/05_events.md
+++ b/x/ibc/applications/transfer/spec/05_events.md
--- a/x/ibc/applications/transfer/spec/06_params.md
+++ b/x/ibc/applications/transfer/spec/06_params.md
--- a/x/ibc/applications/transfer/spec/README.md
+++ b/x/ibc/applications/transfer/spec/README.md
--- a/x/ibc/applications/transfer/types/codec.go
+++ b/x/ibc/applications/transfer/types/codec.go
--- a/x/ibc/applications/transfer/types/coin.go
+++ b/x/ibc/applications/transfer/types/coin.go
--- a/x/ibc/applications/transfer/types/errors.go
+++ b/x/ibc/applications/transfer/types/errors.go
--- a/x/ibc/applications/transfer/types/events.go
+++ b/x/ibc/applications/transfer/types/events.go
--- a/x/ibc/applications/transfer/types/expected_keepers.go
+++ b/x/ibc/applications/transfer/types/expected_keepers.go
--- a/x/ibc/applications/transfer/types/genesis.go
+++ b/x/ibc/applications/transfer/types/genesis.go
--- a/x/ibc/applications/transfer/types/genesis.pb.go
+++ b/x/ibc/applications/transfer/types/genesis.pb.go
@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: ibc/transfer/genesis.proto
+// source: ibc/applications/transfer/v1/genesis.proto

 package types

@ -34,7 +34,7 @@ func (m *GenesisState) Reset()         { *m = GenesisState{} }
 func (m *GenesisState) String() string { return proto.CompactTextString(m) }
 func (*GenesisState) ProtoMessage()    {}
 func (*GenesisState) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c13b8463155e05c2, []int{0}
+	return fileDescriptor_a4f788affd5bea89, []int{0}
 }
 func (m *GenesisState) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@ -85,32 +85,35 @@ func (m *GenesisState) GetParams() Params {
 }

 func init() {
-	proto.RegisterType((*GenesisState)(nil), "ibc.transfer.GenesisState")
+	proto.RegisterType((*GenesisState)(nil), "ibc.applications.transfer.v1.GenesisState")
 }

-func init() { proto.RegisterFile("ibc/transfer/genesis.proto", fileDescriptor_c13b8463155e05c2) }
+func init() {
+	proto.RegisterFile("ibc/applications/transfer/v1/genesis.proto", fileDescriptor_a4f788affd5bea89)
+}

-var fileDescriptor_c13b8463155e05c2 = []byte{
-	// 296 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xca, 0x4c, 0x4a, 0xd6,
-	0x2f, 0x29, 0x4a, 0xcc, 0x2b, 0x4e, 0x4b, 0x2d, 0xd2, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c,
-	0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0xc9, 0x4c, 0x4a, 0xd6, 0x83, 0xc9, 0x49, 0x89,
-	0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x25, 0xf4, 0x41, 0x2c, 0x88, 0x1a, 0x29, 0x69, 0x14, 0xfd, 0x30,
-	0x06, 0x44, 0x52, 0xe9, 0x32, 0x23, 0x17, 0x8f, 0x3b, 0xc4, 0xc8, 0xe0, 0x92, 0xc4, 0x92, 0x54,
-	0x21, 0x6d, 0x2e, 0xf6, 0x82, 0xfc, 0xa2, 0x92, 0xf8, 0xcc, 0x14, 0x09, 0x46, 0x05, 0x46, 0x0d,
-	0x4e, 0x27, 0xa1, 0x4f, 0xf7, 0xe4, 0xf9, 0x2a, 0x13, 0x73, 0x73, 0xac, 0x94, 0xa0, 0x12, 0x4a,
-	0x41, 0x6c, 0x20, 0x96, 0x67, 0x8a, 0x50, 0x12, 0x17, 0x4f, 0x4a, 0x6a, 0x5e, 0x7e, 0x6e, 0x7c,
-	0x49, 0x51, 0x62, 0x72, 0x6a, 0xb1, 0x04, 0x93, 0x02, 0xb3, 0x06, 0xb7, 0x91, 0x84, 0x1e, 0xb2,
-	0xab, 0xf4, 0x5c, 0x40, 0x2a, 0x42, 0x40, 0x0a, 0x9c, 0x54, 0x4f, 0xdc, 0x93, 0x67, 0xf8, 0x74,
-	0x4f, 0x5e, 0x18, 0x62, 0x1e, 0xb2, 0x5e, 0xa5, 0x55, 0xf7, 0xe5, 0xd9, 0xc0, 0xaa, 0x8a, 0x83,
-	0xb8, 0x53, 0xe0, 0x5a, 0x8a, 0x85, 0x8c, 0xb8, 0xd8, 0x0a, 0x12, 0x8b, 0x12, 0x73, 0x8b, 0x25,
-	0x98, 0x15, 0x18, 0x35, 0xb8, 0x8d, 0x44, 0x50, 0x4d, 0x0f, 0x00, 0xcb, 0x39, 0xb1, 0x80, 0x4c,
-	0x0e, 0x82, 0xaa, 0x74, 0xf2, 0x3e, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f,
-	0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28,
-	0xc3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0xe4, 0xfc, 0xe2, 0xdc,
-	0xfc, 0x62, 0x28, 0xa5, 0x5b, 0x9c, 0x92, 0xad, 0x5f, 0xa1, 0x9f, 0x99, 0x94, 0xac, 0x8b, 0x08,
-	0xab, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0x48, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff,
-	0xd5, 0x5e, 0x5e, 0x5a, 0x88, 0x01, 0x00, 0x00,
+var fileDescriptor_a4f788affd5bea89 = []byte{
+	// 317 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xca, 0x4c, 0x4a, 0xd6,
+	0x4f, 0x2c, 0x28, 0xc8, 0xc9, 0x4c, 0x4e, 0x2c, 0xc9, 0xcc, 0xcf, 0x2b, 0xd6, 0x2f, 0x29, 0x4a,
+	0xcc, 0x2b, 0x4e, 0x4b, 0x2d, 0xd2, 0x2f, 0x33, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c,
+	0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0xc9, 0x4c, 0x4a, 0xd6, 0x43, 0x56, 0xab, 0x07,
+	0x53, 0xab, 0x57, 0x66, 0x28, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa8, 0x0f, 0x62, 0x41,
+	0xf4, 0x48, 0x69, 0xe3, 0x35, 0x1f, 0xae, 0x1f, 0xac, 0x58, 0xe9, 0x33, 0x23, 0x17, 0x8f, 0x3b,
+	0xc4, 0xca, 0xe0, 0x92, 0xc4, 0x92, 0x54, 0x21, 0x6d, 0x2e, 0xf6, 0x82, 0xfc, 0xa2, 0x92, 0xf8,
+	0xcc, 0x14, 0x09, 0x46, 0x05, 0x46, 0x0d, 0x4e, 0x27, 0xa1, 0x4f, 0xf7, 0xe4, 0xf9, 0x2a, 0x13,
+	0x73, 0x73, 0xac, 0x94, 0xa0, 0x12, 0x4a, 0x41, 0x6c, 0x20, 0x96, 0x67, 0x8a, 0x50, 0x11, 0x17,
+	0x4f, 0x4a, 0x6a, 0x5e, 0x7e, 0x6e, 0x7c, 0x49, 0x51, 0x62, 0x72, 0x6a, 0xb1, 0x04, 0x93, 0x02,
+	0xb3, 0x06, 0xb7, 0x91, 0x86, 0x1e, 0x3e, 0x57, 0xeb, 0xb9, 0x80, 0x74, 0x84, 0x80, 0x34, 0x38,
+	0xa9, 0x9e, 0xb8, 0x27, 0xcf, 0xf0, 0xe9, 0x9e, 0xbc, 0x30, 0xc4, 0x7c, 0x64, 0xb3, 0x94, 0x56,
+	0xdd, 0x97, 0x67, 0x03, 0xab, 0x2a, 0x0e, 0xe2, 0x4e, 0x81, 0x6b, 0x29, 0x16, 0x72, 0xe2, 0x62,
+	0x2b, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0x96, 0x60, 0x56, 0x60, 0xd4, 0xe0, 0x36, 0x52, 0xc1, 0x6f,
+	0x5b, 0x00, 0x58, 0xad, 0x13, 0x0b, 0xc8, 0xa6, 0x20, 0xa8, 0x4e, 0xa7, 0x88, 0x13, 0x8f, 0xe4,
+	0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f,
+	0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xb2, 0x4b, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b,
+	0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0x86, 0x52, 0xba, 0xc5, 0x29, 0xd9, 0xfa,
+	0x15, 0xfa, 0xb8, 0xc3, 0xb6, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0xac, 0xc6, 0x80,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0xda, 0xbb, 0x81, 0x1e, 0xe5, 0x01, 0x00, 0x00,
 }

 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
--- a/x/ibc/applications/transfer/types/genesis_test.go
+++ b/x/ibc/applications/transfer/types/genesis_test.go
@ -5,7 +5,7 @@ import (

 	"github.com/stretchr/testify/require"

-	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 )

 func TestValidateGenesis(t *testing.T) {
--- a/x/ibc/applications/transfer/types/keys.go
+++ b/x/ibc/applications/transfer/types/keys.go
--- a/x/ibc/applications/transfer/types/msgs.go
+++ b/x/ibc/applications/transfer/types/msgs.go
--- a/x/ibc/applications/transfer/types/msgs_test.go
+++ b/x/ibc/applications/transfer/types/msgs_test.go
--- a/x/ibc/applications/transfer/types/packet.go
+++ b/x/ibc/applications/transfer/types/packet.go
--- a/x/ibc/applications/transfer/types/packet_test.go
+++ b/x/ibc/applications/transfer/types/packet_test.go
--- a/x/ibc/applications/transfer/types/params.go
+++ b/x/ibc/applications/transfer/types/params.go
--- a/x/ibc/applications/transfer/types/params_test.go
+++ b/x/ibc/applications/transfer/types/params_test.go
--- a/x/ibc/applications/transfer/types/query.pb.go
+++ b/x/ibc/applications/transfer/types/query.pb.go
@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: ibc/transfer/query.proto
+// source: ibc/applications/transfer/v1/query.proto

 package types

@ -41,7 +41,7 @@ func (m *QueryDenomTraceRequest) Reset()         { *m = QueryDenomTraceRequest{}
 func (m *QueryDenomTraceRequest) String() string { return proto.CompactTextString(m) }
 func (*QueryDenomTraceRequest) ProtoMessage()    {}
 func (*QueryDenomTraceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_26b3e8b4e9dff1c1, []int{0}
+	return fileDescriptor_a638e2800a01538c, []int{0}
 }
 func (m *QueryDenomTraceRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@ -88,7 +88,7 @@ func (m *QueryDenomTraceResponse) Reset()         { *m = QueryDenomTraceResponse
 func (m *QueryDenomTraceResponse) String() string { return proto.CompactTextString(m) }
 func (*QueryDenomTraceResponse) ProtoMessage()    {}
 func (*QueryDenomTraceResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_26b3e8b4e9dff1c1, []int{1}
+	return fileDescriptor_a638e2800a01538c, []int{1}
 }
 func (m *QueryDenomTraceResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@ -135,7 +135,7 @@ func (m *QueryDenomTracesRequest) Reset()         { *m = QueryDenomTracesRequest
 func (m *QueryDenomTracesRequest) String() string { return proto.CompactTextString(m) }
 func (*QueryDenomTracesRequest) ProtoMessage()    {}
 func (*QueryDenomTracesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_26b3e8b4e9dff1c1, []int{2}
+	return fileDescriptor_a638e2800a01538c, []int{2}
 }
 func (m *QueryDenomTracesRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@ -184,7 +184,7 @@ func (m *QueryDenomTracesResponse) Reset()         { *m = QueryDenomTracesRespon
 func (m *QueryDenomTracesResponse) String() string { return proto.CompactTextString(m) }
 func (*QueryDenomTracesResponse) ProtoMessage()    {}
 func (*QueryDenomTracesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_26b3e8b4e9dff1c1, []int{3}
+	return fileDescriptor_a638e2800a01538c, []int{3}
 }
 func (m *QueryDenomTracesResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@ -235,7 +235,7 @@ func (m *QueryParamsRequest) Reset()         { *m = QueryParamsRequest{} }
 func (m *QueryParamsRequest) String() string { return proto.CompactTextString(m) }
 func (*QueryParamsRequest) ProtoMessage()    {}
 func (*QueryParamsRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_26b3e8b4e9dff1c1, []int{4}
+	return fileDescriptor_a638e2800a01538c, []int{4}
 }
 func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@ -274,7 +274,7 @@ func (m *QueryParamsResponse) Reset()         { *m = QueryParamsResponse{} }
 func (m *QueryParamsResponse) String() string { return proto.CompactTextString(m) }
 func (*QueryParamsResponse) ProtoMessage()    {}
 func (*QueryParamsResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_26b3e8b4e9dff1c1, []int{5}
+	return fileDescriptor_a638e2800a01538c, []int{5}
 }
 func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@ -311,50 +311,54 @@ func (m *QueryParamsResponse) GetParams() *Params {
 }

 func init() {
-	proto.RegisterType((*QueryDenomTraceRequest)(nil), "ibc.transfer.QueryDenomTraceRequest")
-	proto.RegisterType((*QueryDenomTraceResponse)(nil), "ibc.transfer.QueryDenomTraceResponse")
-	proto.RegisterType((*QueryDenomTracesRequest)(nil), "ibc.transfer.QueryDenomTracesRequest")
-	proto.RegisterType((*QueryDenomTracesResponse)(nil), "ibc.transfer.QueryDenomTracesResponse")
-	proto.RegisterType((*QueryParamsRequest)(nil), "ibc.transfer.QueryParamsRequest")
-	proto.RegisterType((*QueryParamsResponse)(nil), "ibc.transfer.QueryParamsResponse")
+	proto.RegisterType((*QueryDenomTraceRequest)(nil), "ibc.applications.transfer.v1.QueryDenomTraceRequest")
+	proto.RegisterType((*QueryDenomTraceResponse)(nil), "ibc.applications.transfer.v1.QueryDenomTraceResponse")
+	proto.RegisterType((*QueryDenomTracesRequest)(nil), "ibc.applications.transfer.v1.QueryDenomTracesRequest")
+	proto.RegisterType((*QueryDenomTracesResponse)(nil), "ibc.applications.transfer.v1.QueryDenomTracesResponse")
+	proto.RegisterType((*QueryParamsRequest)(nil), "ibc.applications.transfer.v1.QueryParamsRequest")
+	proto.RegisterType((*QueryParamsResponse)(nil), "ibc.applications.transfer.v1.QueryParamsResponse")
 }

-func init() { proto.RegisterFile("ibc/transfer/query.proto", fileDescriptor_26b3e8b4e9dff1c1) }
+func init() {
+	proto.RegisterFile("ibc/applications/transfer/v1/query.proto", fileDescriptor_a638e2800a01538c)
+}

-var fileDescriptor_26b3e8b4e9dff1c1 = []byte{
-	// 512 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0x31, 0x6f, 0xd3, 0x40,
-	0x14, 0xc7, 0x73, 0x2d, 0x44, 0xe2, 0xa5, 0x62, 0x38, 0x22, 0xb0, 0x4c, 0xe5, 0x06, 0x2b, 0x14,
-	0x28, 0xed, 0x9d, 0x52, 0x26, 0xd6, 0x82, 0x60, 0xe8, 0x52, 0xa2, 0x4e, 0x2c, 0xd5, 0xd9, 0x39,
-	0x1c, 0x0b, 0xe2, 0x73, 0x7d, 0x17, 0x44, 0x85, 0x58, 0x98, 0x18, 0x18, 0x90, 0x90, 0xf8, 0x10,
-	0x4c, 0x7c, 0x8c, 0x8e, 0x95, 0x58, 0x98, 0x00, 0x25, 0x7c, 0x10, 0xe4, 0xbb, 0x73, 0x6d, 0x2b,
-	0x51, 0x3c, 0xe5, 0x74, 0xef, 0xff, 0xde, 0xfb, 0xbd, 0xff, 0xbd, 0x18, 0x9c, 0x38, 0x08, 0xa9,
-	0xca, 0x58, 0x22, 0x5f, 0xf1, 0x8c, 0x9e, 0x4e, 0x79, 0x76, 0x46, 0xd2, 0x4c, 0x28, 0x81, 0x37,
-	0xe2, 0x20, 0x24, 0x45, 0xc4, 0xed, 0x46, 0x22, 0x12, 0x3a, 0x40, 0xf3, 0x93, 0xd1, 0xb8, 0x3b,
-	0xa1, 0x90, 0x13, 0x21, 0x69, 0xc0, 0x24, 0x37, 0xc9, 0xf4, 0xed, 0x20, 0xe0, 0x8a, 0x0d, 0x68,
-	0xca, 0xa2, 0x38, 0x61, 0x2a, 0x16, 0x89, 0xd5, 0xde, 0xae, 0x75, 0x2a, 0x0e, 0x36, 0xb8, 0x19,
-	0x09, 0x11, 0xbd, 0xe1, 0x94, 0xa5, 0x31, 0x65, 0x49, 0x22, 0x94, 0xce, 0x94, 0x26, 0xea, 0xef,
-	0xc2, 0xcd, 0x17, 0x79, 0xf1, 0xa7, 0x3c, 0x11, 0x93, 0xe3, 0x8c, 0x85, 0x7c, 0xc8, 0x4f, 0xa7,
-	0x5c, 0x2a, 0x8c, 0xe1, 0xca, 0x98, 0xc9, 0xb1, 0x83, 0x7a, 0xe8, 0xfe, 0xb5, 0xa1, 0x3e, 0xfb,
-	0xc7, 0x70, 0x6b, 0x41, 0x2d, 0x53, 0x91, 0x48, 0x8e, 0x1f, 0x43, 0x67, 0x94, 0xdf, 0x9e, 0xa8,
-	0xfc, 0x5a, 0x67, 0x75, 0xf6, 0x1d, 0x52, 0x9d, 0x94, 0x54, 0xd2, 0x60, 0x74, 0x79, 0xf6, 0xd9,
-	0x42, 0x55, 0x59, 0x40, 0x3c, 0x03, 0x28, 0xa7, 0xb5, 0x45, 0xb7, 0x89, 0xb1, 0x86, 0xe4, 0xd6,
-	0x10, 0xe3, 0xab, 0xb5, 0x86, 0x1c, 0xb1, 0xa8, 0x18, 0x60, 0x58, 0xc9, 0xf4, 0x7f, 0x20, 0x70,
-	0x16, 0x7b, 0x58, 0xf4, 0x43, 0xd8, 0xa8, 0xa0, 0x4b, 0x07, 0xf5, 0xd6, 0x57, 0xb1, 0x1f, 0x5c,
-	0x3f, 0xff, 0xbd, 0xd5, 0xfa, 0xfe, 0x67, 0xab, 0x6d, 0xeb, 0x74, 0xca, 0x59, 0x24, 0x7e, 0x5e,
-	0x23, 0x5e, 0xd3, 0xc4, 0xf7, 0x1a, 0x89, 0x0d, 0x49, 0x0d, 0xb9, 0x0b, 0x58, 0x13, 0x1f, 0xb1,
-	0x8c, 0x4d, 0x0a, 0x43, 0xfc, 0x27, 0x70, 0xa3, 0x76, 0x6b, 0x47, 0xd8, 0x85, 0x76, 0xaa, 0x6f,
-	0xac, 0x47, 0xdd, 0x3a, 0xbc, 0x55, 0x5b, 0xcd, 0xfe, 0xb7, 0x75, 0xb8, 0xaa, 0xab, 0xe0, 0xcf,
-	0x08, 0xa0, 0x9c, 0x0c, 0xf7, 0xeb, 0x69, 0xcb, 0x37, 0xc3, 0xbd, 0xdb, 0xa0, 0x32, 0x4c, 0xfe,
-	0xe0, 0xe3, 0xcf, 0x7f, 0x5f, 0xd7, 0x1e, 0xe2, 0x07, 0x34, 0x0e, 0xc2, 0x93, 0xcb, 0xf5, 0x2c,
-	0xb6, 0xb8, 0x6a, 0x39, 0x7d, 0x9f, 0xaf, 0xd7, 0x07, 0xfc, 0x09, 0x41, 0xa7, 0xf2, 0x42, 0x78,
-	0x75, 0xa7, 0xc2, 0x14, 0x77, 0xbb, 0x49, 0x66, 0x89, 0x76, 0x34, 0x51, 0x1f, 0xfb, 0xcd, 0x44,
-	0x58, 0x42, 0xdb, 0xb8, 0x86, 0x7b, 0x4b, 0xaa, 0xd7, 0x1e, 0xc5, 0xbd, 0xb3, 0x42, 0x61, 0x5b,
-	0xf7, 0x75, 0x6b, 0x0f, 0x6f, 0x2e, 0x6f, 0x6d, 0x1e, 0xe6, 0xe0, 0xf0, 0x7c, 0xe6, 0xa1, 0x8b,
-	0x99, 0x87, 0xfe, 0xce, 0x3c, 0xf4, 0x65, 0xee, 0xb5, 0x2e, 0xe6, 0x5e, 0xeb, 0xd7, 0xdc, 0x6b,
-	0xbd, 0x1c, 0x44, 0xb1, 0x1a, 0x4f, 0x03, 0x12, 0x8a, 0x09, 0xb5, 0x5f, 0x06, 0xf3, 0xb3, 0x27,
-	0x47, 0xaf, 0xe9, 0xbb, 0xbc, 0xea, 0x5e, 0xf9, 0x05, 0x38, 0x4b, 0xb9, 0x0c, 0xda, 0xfa, 0x1f,
-	0xfe, 0xe8, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x53, 0x09, 0x7d, 0xcb, 0x88, 0x04, 0x00, 0x00,
+var fileDescriptor_a638e2800a01538c = []byte{
+	// 532 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x4f, 0x6f, 0xd3, 0x30,
+	0x14, 0xaf, 0x37, 0xa8, 0xc4, 0x2b, 0xe2, 0x60, 0x26, 0xa8, 0xa2, 0x2a, 0x9b, 0xa2, 0x0a, 0xca,
+	0x06, 0x36, 0x19, 0x7f, 0x4e, 0x88, 0xc3, 0x84, 0x40, 0xdc, 0x46, 0xe1, 0x80, 0xe0, 0x30, 0x39,
+	0xa9, 0x49, 0x23, 0xd6, 0x38, 0x8b, 0xdd, 0x8a, 0x09, 0x71, 0xe1, 0x13, 0x20, 0xed, 0x4b, 0x20,
+	0xc4, 0x87, 0xe0, 0xb8, 0xe3, 0x24, 0x2e, 0x9c, 0x00, 0xb5, 0x7c, 0x07, 0xae, 0x28, 0xb6, 0xb3,
+	0xa6, 0xea, 0xe8, 0x96, 0x53, 0xad, 0xd7, 0xf7, 0x7b, 0xbf, 0x3f, 0xcf, 0x31, 0x74, 0xe2, 0x20,
+	0xa4, 0x2c, 0x4d, 0x77, 0xe3, 0x90, 0xa9, 0x58, 0x24, 0x92, 0xaa, 0x8c, 0x25, 0xf2, 0x0d, 0xcf,
+	0xe8, 0xc8, 0xa7, 0x7b, 0x43, 0x9e, 0xed, 0x93, 0x34, 0x13, 0x4a, 0xe0, 0x56, 0x1c, 0x84, 0xa4,
+	0xdc, 0x49, 0x8a, 0x4e, 0x32, 0xf2, 0x9d, 0x95, 0x48, 0x44, 0x42, 0x37, 0xd2, 0xfc, 0x64, 0x30,
+	0xce, 0x7a, 0x28, 0xe4, 0x40, 0x48, 0x1a, 0x30, 0xc9, 0xcd, 0x30, 0x3a, 0xf2, 0x03, 0xae, 0x98,
+	0x4f, 0x53, 0x16, 0xc5, 0x89, 0x1e, 0x64, 0x7b, 0x37, 0x16, 0x2a, 0x39, 0xe6, 0x32, 0xcd, 0xad,
+	0x48, 0x88, 0x68, 0x97, 0x53, 0x96, 0xc6, 0x94, 0x25, 0x89, 0x50, 0x56, 0x92, 0xfe, 0xd7, 0xbb,
+	0x09, 0x57, 0x9e, 0xe5, 0x64, 0x8f, 0x78, 0x22, 0x06, 0x2f, 0x32, 0x16, 0xf2, 0x2e, 0xdf, 0x1b,
+	0x72, 0xa9, 0x30, 0x86, 0x73, 0x7d, 0x26, 0xfb, 0x4d, 0xb4, 0x86, 0x3a, 0x17, 0xba, 0xfa, 0xec,
+	0xf5, 0xe0, 0xea, 0x5c, 0xb7, 0x4c, 0x45, 0x22, 0x39, 0x7e, 0x0a, 0x8d, 0x5e, 0x5e, 0xdd, 0x51,
+	0x79, 0x59, 0xa3, 0x1a, 0x9b, 0x1d, 0xb2, 0x28, 0x09, 0x52, 0x1a, 0x03, 0xbd, 0xe3, 0xb3, 0xc7,
+	0xe6, 0x58, 0x64, 0x21, 0xea, 0x31, 0xc0, 0x34, 0x0d, 0x4b, 0x72, 0x8d, 0x98, 0xe8, 0x48, 0x1e,
+	0x1d, 0x31, 0x7b, 0xb0, 0xd1, 0x91, 0x6d, 0x16, 0x15, 0x86, 0xba, 0x25, 0xa4, 0xf7, 0x0d, 0x41,
+	0x73, 0x9e, 0xc3, 0x5a, 0x79, 0x0d, 0x17, 0x4b, 0x56, 0x64, 0x13, 0xad, 0x2d, 0x57, 0xf1, 0xb2,
+	0x75, 0xe9, 0xf0, 0xe7, 0x6a, 0xed, 0xcb, 0xaf, 0xd5, 0xba, 0x9d, 0xdb, 0x98, 0x7a, 0x93, 0xf8,
+	0xc9, 0x8c, 0x83, 0x25, 0xed, 0xe0, 0xfa, 0xa9, 0x0e, 0x8c, 0xb2, 0x19, 0x0b, 0x2b, 0x80, 0xb5,
+	0x83, 0x6d, 0x96, 0xb1, 0x41, 0x11, 0x90, 0xf7, 0x1c, 0x2e, 0xcf, 0x54, 0xad, 0xa5, 0x07, 0x50,
+	0x4f, 0x75, 0xc5, 0x66, 0xd6, 0x5e, 0x6c, 0xc6, 0xa2, 0x2d, 0x66, 0xf3, 0xef, 0x32, 0x9c, 0xd7,
+	0x53, 0xf1, 0x57, 0x04, 0x30, 0x75, 0x8a, 0xef, 0x2e, 0x1e, 0x73, 0xf2, 0xcd, 0x72, 0xee, 0x55,
+	0x44, 0x19, 0x0f, 0x9e, 0xff, 0xf1, 0xfb, 0x9f, 0x83, 0xa5, 0x0d, 0x7c, 0x83, 0xc6, 0x41, 0xb8,
+	0x53, 0xba, 0xf1, 0xe6, 0x2b, 0x29, 0xaf, 0x8c, 0xbe, 0xcf, 0xaf, 0xeb, 0x07, 0xfc, 0x19, 0x41,
+	0xa3, 0xb4, 0x61, 0x5c, 0x8d, 0xb9, 0x08, 0xd5, 0xb9, 0x5f, 0x15, 0x66, 0x15, 0xaf, 0x6b, 0xc5,
+	0x6d, 0xec, 0x9d, 0xae, 0x18, 0x1f, 0x20, 0xa8, 0x9b, 0xd8, 0xf1, 0xed, 0x33, 0xd0, 0xcd, 0x6c,
+	0xdd, 0xf1, 0x2b, 0x20, 0xac, 0xb6, 0xb6, 0xd6, 0xe6, 0xe2, 0xd6, 0xc9, 0xda, 0xcc, 0xe6, 0xb7,
+	0x5e, 0x1e, 0x8e, 0x5d, 0x74, 0x34, 0x76, 0xd1, 0xef, 0xb1, 0x8b, 0x3e, 0x4d, 0xdc, 0xda, 0xd1,
+	0xc4, 0xad, 0xfd, 0x98, 0xb8, 0xb5, 0x57, 0x0f, 0xa3, 0x58, 0xf5, 0x87, 0x01, 0x09, 0xc5, 0x80,
+	0xda, 0xa7, 0xcb, 0xfc, 0xdc, 0x92, 0xbd, 0xb7, 0xf4, 0x1d, 0xfd, 0xff, 0x13, 0xa5, 0xf6, 0x53,
+	0x2e, 0x83, 0xba, 0x7e, 0x7f, 0xee, 0xfc, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x19, 0x46, 0xdf, 0x94,
+	0x56, 0x05, 0x00, 0x00,
 }

 // Reference imports to suppress errors if they are not otherwise used.
@ -387,7 +391,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient {

 func (c *queryClient) DenomTrace(ctx context.Context, in *QueryDenomTraceRequest, opts ...grpc.CallOption) (*QueryDenomTraceResponse, error) {
 	out := new(QueryDenomTraceResponse)
-	err := c.cc.Invoke(ctx, "/ibc.transfer.Query/DenomTrace", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/ibc.applications.transfer.v1.Query/DenomTrace", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@ -396,7 +400,7 @@ func (c *queryClient) DenomTrace(ctx context.Context, in *QueryDenomTraceRequest

 func (c *queryClient) DenomTraces(ctx context.Context, in *QueryDenomTracesRequest, opts ...grpc.CallOption) (*QueryDenomTracesResponse, error) {
 	out := new(QueryDenomTracesResponse)
-	err := c.cc.Invoke(ctx, "/ibc.transfer.Query/DenomTraces", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/ibc.applications.transfer.v1.Query/DenomTraces", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@ -405,7 +409,7 @@ func (c *queryClient) DenomTraces(ctx context.Context, in *QueryDenomTracesReque

 func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) {
 	out := new(QueryParamsResponse)
-	err := c.cc.Invoke(ctx, "/ibc.transfer.Query/Params", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/ibc.applications.transfer.v1.Query/Params", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@ -450,7 +454,7 @@ func _Query_DenomTrace_Handler(srv interface{}, ctx context.Context, dec func(in
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/ibc.transfer.Query/DenomTrace",
+		FullMethod: "/ibc.applications.transfer.v1.Query/DenomTrace",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(QueryServer).DenomTrace(ctx, req.(*QueryDenomTraceRequest))
@ -468,7 +472,7 @@ func _Query_DenomTraces_Handler(srv interface{}, ctx context.Context, dec func(i
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/ibc.transfer.Query/DenomTraces",
+		FullMethod: "/ibc.applications.transfer.v1.Query/DenomTraces",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(QueryServer).DenomTraces(ctx, req.(*QueryDenomTracesRequest))
@ -486,7 +490,7 @@ func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interf
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/ibc.transfer.Query/Params",
+		FullMethod: "/ibc.applications.transfer.v1.Query/Params",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(QueryServer).Params(ctx, req.(*QueryParamsRequest))
@ -495,7 +499,7 @@ func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interf
 }

 var _Query_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "ibc.transfer.Query",
+	ServiceName: "ibc.applications.transfer.v1.Query",
 	HandlerType: (*QueryServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
@ -512,7 +516,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "ibc/transfer/query.proto",
+	Metadata: "ibc/applications/transfer/v1/query.proto",
 }

 func (m *QueryDenomTraceRequest) Marshal() (dAtA []byte, err error) {
--- a/x/ibc/applications/transfer/types/query.pb.gw.go
+++ b/x/ibc/applications/transfer/types/query.pb.gw.go
@ -1,5 +1,5 @@
 // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT.
-// source: ibc/transfer/query.proto
+// source: ibc/applications/transfer/v1/query.proto

 /*
 Package types is a reverse proxy.
--- a/x/ibc/applications/transfer/types/trace.go
+++ b/x/ibc/applications/transfer/types/trace.go
--- a/x/ibc/applications/transfer/types/trace_test.go
+++ b/x/ibc/applications/transfer/types/trace_test.go
--- a/x/ibc/applications/transfer/types/transfer.pb.go
+++ b/x/ibc/applications/transfer/types/transfer.pb.go
@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: ibc/transfer/transfer.proto
+// source: ibc/applications/transfer/v1/transfer.proto

 package types

@ -51,7 +51,7 @@ func (m *MsgTransfer) Reset()         { *m = MsgTransfer{} }
 func (m *MsgTransfer) String() string { return proto.CompactTextString(m) }
 func (*MsgTransfer) ProtoMessage()    {}
 func (*MsgTransfer) Descriptor() ([]byte, []int) {
-	return fileDescriptor_08134a70fd29e656, []int{0}
+	return fileDescriptor_5041673e96e97901, []int{0}
 }
 func (m *MsgTransfer) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@ -98,7 +98,7 @@ func (m *FungibleTokenPacketData) Reset()         { *m = FungibleTokenPacketData
 func (m *FungibleTokenPacketData) String() string { return proto.CompactTextString(m) }
 func (*FungibleTokenPacketData) ProtoMessage()    {}
 func (*FungibleTokenPacketData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_08134a70fd29e656, []int{1}
+	return fileDescriptor_5041673e96e97901, []int{1}
 }
 func (m *FungibleTokenPacketData) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@ -169,7 +169,7 @@ func (m *DenomTrace) Reset()         { *m = DenomTrace{} }
 func (m *DenomTrace) String() string { return proto.CompactTextString(m) }
 func (*DenomTrace) ProtoMessage()    {}
 func (*DenomTrace) Descriptor() ([]byte, []int) {
-	return fileDescriptor_08134a70fd29e656, []int{2}
+	return fileDescriptor_5041673e96e97901, []int{2}
 }
 func (m *DenomTrace) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@ -229,7 +229,7 @@ func (m *Params) Reset()         { *m = Params{} }
 func (m *Params) String() string { return proto.CompactTextString(m) }
 func (*Params) ProtoMessage()    {}
 func (*Params) Descriptor() ([]byte, []int) {
-	return fileDescriptor_08134a70fd29e656, []int{3}
+	return fileDescriptor_5041673e96e97901, []int{3}
 }
 func (m *Params) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@ -273,52 +273,55 @@ func (m *Params) GetReceiveEnabled() bool {
 }

 func init() {
-	proto.RegisterType((*MsgTransfer)(nil), "ibc.transfer.MsgTransfer")
-	proto.RegisterType((*FungibleTokenPacketData)(nil), "ibc.transfer.FungibleTokenPacketData")
-	proto.RegisterType((*DenomTrace)(nil), "ibc.transfer.DenomTrace")
-	proto.RegisterType((*Params)(nil), "ibc.transfer.Params")
+	proto.RegisterType((*MsgTransfer)(nil), "ibc.applications.transfer.v1.MsgTransfer")
+	proto.RegisterType((*FungibleTokenPacketData)(nil), "ibc.applications.transfer.v1.FungibleTokenPacketData")
+	proto.RegisterType((*DenomTrace)(nil), "ibc.applications.transfer.v1.DenomTrace")
+	proto.RegisterType((*Params)(nil), "ibc.applications.transfer.v1.Params")
 }

-func init() { proto.RegisterFile("ibc/transfer/transfer.proto", fileDescriptor_08134a70fd29e656) }
+func init() {
+	proto.RegisterFile("ibc/applications/transfer/v1/transfer.proto", fileDescriptor_5041673e96e97901)
+}

-var fileDescriptor_08134a70fd29e656 = []byte{
-	// 574 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_5041673e96e97901 = []byte{
+	// 590 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0xcd, 0x6e, 0xd3, 0x4c,
-	0x14, 0xb5, 0x5b, 0x37, 0x5f, 0x3b, 0x69, 0xfb, 0xc1, 0x50, 0x12, 0x37, 0x50, 0x3b, 0xf2, 0x2a,
-	0x9b, 0xda, 0x0a, 0x08, 0x21, 0x65, 0x03, 0x72, 0x0a, 0x02, 0x21, 0xa4, 0xc8, 0xca, 0x02, 0xb1,
-	0x89, 0xc6, 0x93, 0xc1, 0xb1, 0x12, 0xcf, 0x44, 0xf6, 0xa4, 0xa2, 0xe2, 0x05, 0x60, 0xc7, 0x23,
-	0x54, 0x3c, 0x4d, 0x97, 0x5d, 0xb2, 0xb2, 0x50, 0xb2, 0x61, 0x9d, 0x27, 0x40, 0xf3, 0x93, 0x34,
-	0x41, 0x62, 0x35, 0x73, 0xce, 0xb9, 0xe7, 0x5e, 0xdf, 0x7b, 0x3d, 0xe0, 0x51, 0x1a, 0xe3, 0x80,
-	0xe7, 0x88, 0x16, 0x9f, 0x48, 0xbe, 0xbe, 0xf8, 0xd3, 0x9c, 0x71, 0x06, 0x0f, 0xd3, 0x18, 0xfb,
-	0x2b, 0xae, 0x71, 0x92, 0xb0, 0x84, 0x49, 0x21, 0x10, 0x37, 0x15, 0xd3, 0x70, 0x30, 0x2b, 0x32,
-	0x56, 0x04, 0x31, 0x2a, 0x48, 0x70, 0xd9, 0x8e, 0x09, 0x47, 0xed, 0x00, 0xb3, 0x94, 0x6a, 0xbd,
-	0x2e, 0x0a, 0xe0, 0x49, 0x4a, 0x28, 0xd7, 0x87, 0x12, 0xbc, 0x1f, 0xbb, 0xa0, 0xfa, 0xbe, 0x48,
-	0xfa, 0x3a, 0x3d, 0x7c, 0x0e, 0xaa, 0x05, 0x9b, 0xe5, 0x98, 0x0c, 0xa6, 0x2c, 0xe7, 0xb6, 0xd9,
-	0x34, 0x5b, 0x07, 0x61, 0x6d, 0x59, 0xba, 0xf0, 0x0a, 0x65, 0x93, 0x8e, 0xb7, 0x21, 0x7a, 0x11,
-	0x50, 0xa8, 0xc7, 0x72, 0x0e, 0x5f, 0x82, 0x63, 0xad, 0xe1, 0x11, 0xa2, 0x94, 0x4c, 0xec, 0x1d,
-	0xe9, 0x3d, 0x5d, 0x96, 0xee, 0xc3, 0x2d, 0xaf, 0xd6, 0xbd, 0xe8, 0x48, 0x11, 0x5d, 0x85, 0xe1,
-	0x33, 0xb0, 0xc7, 0xd9, 0x98, 0x50, 0x7b, 0xb7, 0x69, 0xb6, 0xaa, 0x4f, 0x4e, 0x7d, 0xd5, 0x93,
-	0x2f, 0x7a, 0xf2, 0x75, 0x4f, 0x7e, 0x97, 0xa5, 0x34, 0xb4, 0x6e, 0x4a, 0xd7, 0x88, 0x54, 0x34,
-	0xac, 0x81, 0x4a, 0x41, 0xe8, 0x90, 0xe4, 0xb6, 0x25, 0x0a, 0x46, 0x1a, 0xc1, 0x06, 0xd8, 0xcf,
-	0x09, 0x26, 0xe9, 0x25, 0xc9, 0xed, 0x3d, 0xa9, 0xac, 0x31, 0xfc, 0x00, 0x8e, 0x79, 0x9a, 0x11,
-	0x36, 0xe3, 0x83, 0x11, 0x49, 0x93, 0x11, 0xb7, 0x2b, 0xb2, 0x26, 0xf4, 0xc5, 0xac, 0xf5, 0x80,
-	0xde, 0x48, 0x25, 0x3c, 0x13, 0xc5, 0xee, 0x9a, 0xd8, 0xf6, 0x79, 0xd1, 0x91, 0x26, 0x54, 0x34,
-	0x7c, 0x0b, 0xee, 0xaf, 0x22, 0xc4, 0x59, 0x70, 0x94, 0x4d, 0xed, 0xff, 0x9a, 0x66, 0xcb, 0x0a,
-	0x1f, 0x2f, 0x4b, 0xd7, 0xde, 0x4e, 0xb2, 0x0e, 0xf1, 0xa2, 0x7b, 0x9a, 0xeb, 0xaf, 0xa8, 0xce,
-	0xfe, 0xd7, 0x6b, 0xd7, 0xf8, 0x7d, 0xed, 0x1a, 0xde, 0x17, 0x50, 0x7f, 0x3d, 0xa3, 0x49, 0x1a,
-	0x4f, 0x48, 0x5f, 0xf4, 0xdc, 0x43, 0x78, 0x4c, 0xf8, 0x05, 0xe2, 0x08, 0x9e, 0x80, 0xbd, 0x21,
-	0xa1, 0x2c, 0x53, 0x9b, 0x8a, 0x14, 0x10, 0x33, 0x41, 0x19, 0x9b, 0x51, 0x2e, 0x97, 0x60, 0x45,
-	0x1a, 0x6d, 0xcc, 0x6a, 0xf7, 0x9f, 0xb3, 0xb2, 0xb6, 0x67, 0xe5, 0xbd, 0x00, 0xe0, 0x42, 0x24,
-	0xed, 0xe7, 0x08, 0x13, 0x08, 0x81, 0x35, 0x45, 0x7c, 0xa4, 0xcb, 0xc9, 0x3b, 0x3c, 0x03, 0x40,
-	0xec, 0x68, 0xa0, 0x3e, 0x44, 0xae, 0x3d, 0x3a, 0x10, 0x8c, 0xf4, 0x79, 0xdf, 0x4c, 0x50, 0xe9,
-	0xa1, 0x1c, 0x65, 0x05, 0xec, 0x80, 0x43, 0x51, 0x71, 0x40, 0x28, 0x8a, 0x27, 0x64, 0x28, 0xb3,
-	0xec, 0x87, 0xf5, 0x65, 0xe9, 0x3e, 0xd0, 0xbf, 0xc8, 0x86, 0xea, 0x45, 0x55, 0x01, 0x5f, 0x29,
-	0x04, 0xbb, 0xe0, 0x7f, 0xfd, 0x4d, 0x6b, 0xfb, 0x8e, 0xb4, 0x37, 0x96, 0xa5, 0x5b, 0x53, 0xf6,
-	0xbf, 0x02, 0xbc, 0xe8, 0x58, 0x33, 0x3a, 0x49, 0xf8, 0xee, 0x66, 0xee, 0x98, 0xb7, 0x73, 0xc7,
-	0xfc, 0x35, 0x77, 0xcc, 0xef, 0x0b, 0xc7, 0xb8, 0x5d, 0x38, 0xc6, 0xcf, 0x85, 0x63, 0x7c, 0x6c,
-	0x27, 0x29, 0x1f, 0xcd, 0x62, 0x1f, 0xb3, 0x2c, 0xd0, 0x8f, 0x49, 0x1d, 0xe7, 0xc5, 0x70, 0x1c,
-	0x7c, 0x0e, 0xd2, 0x18, 0x9f, 0xdf, 0xbd, 0xd0, 0xab, 0x29, 0x29, 0xe2, 0x8a, 0x7c, 0x42, 0x4f,
-	0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x68, 0xe6, 0x1f, 0xf1, 0xbe, 0x03, 0x00, 0x00,
+	0x14, 0x8d, 0x5b, 0x37, 0x5f, 0x3b, 0xf9, 0x5a, 0x60, 0x28, 0xad, 0x1b, 0xb5, 0x76, 0xe5, 0x55,
+	0x25, 0x84, 0xad, 0x80, 0x10, 0x52, 0x17, 0x80, 0xdc, 0x82, 0x60, 0x81, 0x54, 0x59, 0x59, 0x54,
+	0x6c, 0xa2, 0xf1, 0x64, 0x70, 0x46, 0xb5, 0x67, 0x2c, 0xcf, 0x24, 0xa2, 0xe2, 0x05, 0x60, 0xc7,
+	0x23, 0x54, 0x3c, 0x4d, 0x97, 0x5d, 0xb2, 0xb2, 0x50, 0xbb, 0x61, 0x9d, 0x27, 0x40, 0xf3, 0xd3,
+	0x90, 0x20, 0x75, 0xe5, 0x39, 0xf7, 0x9c, 0x73, 0xef, 0xdc, 0x7b, 0x3d, 0xe0, 0x31, 0xcd, 0x70,
+	0x8c, 0xaa, 0xaa, 0xa0, 0x18, 0x49, 0xca, 0x99, 0x88, 0x65, 0x8d, 0x98, 0xf8, 0x44, 0xea, 0x78,
+	0xd2, 0x9b, 0x9d, 0xa3, 0xaa, 0xe6, 0x92, 0xc3, 0x5d, 0x9a, 0xe1, 0x68, 0x5e, 0x1c, 0xcd, 0x04,
+	0x93, 0x5e, 0x77, 0x33, 0xe7, 0x39, 0xd7, 0xc2, 0x58, 0x9d, 0x8c, 0xa7, 0xeb, 0x63, 0x2e, 0x4a,
+	0x2e, 0xe2, 0x0c, 0x09, 0x12, 0x4f, 0x7a, 0x19, 0x91, 0xa8, 0x17, 0x63, 0x4e, 0x99, 0xe5, 0xb7,
+	0xd5, 0x05, 0x70, 0x41, 0x09, 0x93, 0xf6, 0x63, 0x88, 0xf0, 0xc7, 0x32, 0xe8, 0x7c, 0x10, 0x79,
+	0xdf, 0x56, 0x80, 0x2f, 0x40, 0x47, 0xf0, 0x71, 0x8d, 0xc9, 0xa0, 0xe2, 0xb5, 0xf4, 0x9c, 0x7d,
+	0xe7, 0x60, 0x2d, 0xd9, 0x9a, 0x36, 0x01, 0x3c, 0x47, 0x65, 0x71, 0x18, 0xce, 0x91, 0x61, 0x0a,
+	0x0c, 0x3a, 0xe1, 0xb5, 0x84, 0xaf, 0xc1, 0x86, 0xe5, 0xf0, 0x08, 0x31, 0x46, 0x0a, 0x6f, 0x49,
+	0x7b, 0x77, 0xa6, 0x4d, 0xf0, 0x68, 0xc1, 0x6b, 0xf9, 0x30, 0x5d, 0x37, 0x81, 0x23, 0x83, 0xe1,
+	0x73, 0xb0, 0x22, 0xf9, 0x19, 0x61, 0xde, 0xf2, 0xbe, 0x73, 0xd0, 0x79, 0xba, 0x13, 0x99, 0x9e,
+	0x22, 0xd5, 0x53, 0x64, 0x7b, 0x8a, 0x8e, 0x38, 0x65, 0x89, 0x7b, 0xd9, 0x04, 0xad, 0xd4, 0xa8,
+	0xe1, 0x16, 0x68, 0x0b, 0xc2, 0x86, 0xa4, 0xf6, 0x5c, 0x55, 0x30, 0xb5, 0x08, 0x76, 0xc1, 0x6a,
+	0x4d, 0x30, 0xa1, 0x13, 0x52, 0x7b, 0x2b, 0x9a, 0x99, 0x61, 0x78, 0x0a, 0x36, 0x24, 0x2d, 0x09,
+	0x1f, 0xcb, 0xc1, 0x88, 0xd0, 0x7c, 0x24, 0xbd, 0xb6, 0xae, 0x09, 0x23, 0x35, 0x7b, 0x3b, 0xa0,
+	0x77, 0x9a, 0x49, 0xf6, 0x54, 0xb1, 0xbf, 0x4d, 0x2c, 0xfa, 0xc2, 0x74, 0xdd, 0x06, 0x8c, 0x1a,
+	0xbe, 0x07, 0x0f, 0x6e, 0x15, 0xea, 0x2b, 0x24, 0x2a, 0x2b, 0xef, 0xbf, 0x7d, 0xe7, 0xc0, 0x4d,
+	0x76, 0xa7, 0x4d, 0xe0, 0x2d, 0x26, 0x99, 0x49, 0xc2, 0xf4, 0xbe, 0x8d, 0xf5, 0x6f, 0x43, 0x87,
+	0xab, 0x5f, 0x2f, 0x82, 0xd6, 0xef, 0x8b, 0xa0, 0x15, 0x7e, 0x01, 0xdb, 0x6f, 0xc7, 0x2c, 0xa7,
+	0x59, 0x41, 0xfa, 0xaa, 0xe7, 0x13, 0x84, 0xcf, 0x88, 0x3c, 0x46, 0x12, 0xc1, 0x4d, 0xb0, 0x32,
+	0x24, 0x8c, 0x97, 0x66, 0x53, 0xa9, 0x01, 0x6a, 0x26, 0xa8, 0xe4, 0x63, 0x26, 0xf5, 0x12, 0xdc,
+	0xd4, 0xa2, 0xb9, 0x59, 0x2d, 0xdf, 0x39, 0x2b, 0x77, 0x71, 0x56, 0xe1, 0x2b, 0x00, 0x8e, 0x55,
+	0xd2, 0x7e, 0x8d, 0x30, 0x81, 0x10, 0xb8, 0x15, 0x92, 0x23, 0x5b, 0x4e, 0x9f, 0xe1, 0x1e, 0x00,
+	0x6a, 0x47, 0x03, 0x73, 0x11, 0xbd, 0xf6, 0x74, 0x4d, 0x45, 0xb4, 0x2f, 0xfc, 0xe6, 0x80, 0xf6,
+	0x09, 0xaa, 0x51, 0x29, 0xe0, 0x21, 0xf8, 0x5f, 0x55, 0x1c, 0x10, 0x86, 0xb2, 0x82, 0x0c, 0x75,
+	0x96, 0xd5, 0x64, 0x7b, 0xda, 0x04, 0x0f, 0xed, 0x2f, 0x32, 0xc7, 0x86, 0x69, 0x47, 0xc1, 0x37,
+	0x06, 0xc1, 0x23, 0x70, 0xcf, 0xde, 0x69, 0x66, 0x5f, 0xd2, 0xf6, 0xee, 0xb4, 0x09, 0xb6, 0x8c,
+	0xfd, 0x1f, 0x41, 0x98, 0x6e, 0xd8, 0x88, 0x4d, 0x92, 0x9c, 0x5e, 0x5e, 0xfb, 0xce, 0xd5, 0xb5,
+	0xef, 0xfc, 0xba, 0xf6, 0x9d, 0xef, 0x37, 0x7e, 0xeb, 0xea, 0xc6, 0x6f, 0xfd, 0xbc, 0xf1, 0x5b,
+	0x1f, 0x5f, 0xe6, 0x54, 0x8e, 0xc6, 0x59, 0x84, 0x79, 0x19, 0xdb, 0xc7, 0x64, 0x3e, 0x4f, 0xc4,
+	0xf0, 0x2c, 0xfe, 0x1c, 0xdf, 0xfd, 0x82, 0xe5, 0x79, 0x45, 0x44, 0xd6, 0xd6, 0xef, 0xe9, 0xd9,
+	0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x55, 0xd5, 0xfc, 0x48, 0xeb, 0x03, 0x00, 0x00,
 }

 func (m *MsgTransfer) Marshal() (dAtA []byte, err error) {
--- a/x/ibc/spec/README.md
+++ b/x/ibc/spec/README.md
@ -36,17 +36,17 @@ transaction routing through `Handlers`.
 The following list is a mapping from each Interchain Standard to their implementation
 in the SDK's `x/ibc` module:

-* [ICS 002 - Client Semantics](https://github.com/cosmos/ics/tree/master/spec/ics-002-client-semantics): Implemented in [`x/ibc/02-client`](https://github.com/cosmos/x/ibc/02-client)
-* [ICS 003 - Connection Semantics](https://github.com/cosmos/ics/blob/master/spec/ics-003-connection-semantics): Implemented in [`x/ibc/03-connection`](https://github.com/cosmos/x/ibc/03-connection)
-* [ICS 004 - Channel and Packet Semantics](https://github.com/cosmos/ics/blob/master/spec/ics-004-channel-and-packet-semantics): Implemented in [`x/ibc/04-channel`](https://github.com/cosmos/x/ibc/04-channel)
-* [ICS 005 - Port Allocation](https://github.com/cosmos/ics/blob/master/spec/ics-005-port-allocation): Implemented in [`x/ibc/05-port`](https://github.com/cosmos/x/ibc/05-port)
-* [ICS 006 - Solo Machine Client](https://github.com/cosmos/ics/blob/master/spec/ics-006-solo-machine-client): Implemented in [`x/ibc/light-clients/06-solomachine`](https://github.com/cosmos/x/ibc/solomachine)
-* [ICS 007 - Tendermint Client](https://github.com/cosmos/ics/blob/master/spec/ics-007-tendermint-client): Implemented in [`x/ibc/light-clients/07-tendermint`](https://github.com/cosmos/x/ibc/light-clients/07-tendermint)
-* [ICS 009 - Loopback Client](https://github.com/cosmos/ics/blob/master/spec/ics-009-loopback-client):  Implemented in [`x/ibc/light-clients/09-localhost`](https://github.com/cosmos/x/ibc/light-clients/09-localhost)
+* [ICS 002 - Client Semantics](https://github.com/cosmos/ics/tree/master/spec/ics-002-client-semantics): Implemented in [`x/ibc/02-client`](https://github.com/cosmos/tree/master/ibc/02-client)
+* [ICS 003 - Connection Semantics](https://github.com/cosmos/ics/blob/master/spec/ics-003-connection-semantics): Implemented in [`x/ibc/03-connection`](https://github.com/cosmos/tree/master/ibc/03-connection)
+* [ICS 004 - Channel and Packet Semantics](https://github.com/cosmos/ics/blob/master/spec/ics-004-channel-and-packet-semantics): Implemented in [`x/ibc/04-channel`](https://github.com/cosmos/tree/master/ibc/04-channel)
+* [ICS 005 - Port Allocation](https://github.com/cosmos/ics/blob/master/spec/ics-005-port-allocation): Implemented in [`x/ibc/05-port`](https://github.com/cosmos/tree/master/ibc/05-port)
+* [ICS 006 - Solo Machine Client](https://github.com/cosmos/ics/blob/master/spec/ics-006-solo-machine-client): Implemented in [`x/ibc/light-clients/06-solomachine`](https://github.com/cosmos/tree/master/ibc/solomachine)
+* [ICS 007 - Tendermint Client](https://github.com/cosmos/ics/blob/master/spec/ics-007-tendermint-client): Implemented in [`x/ibc/light-clients/07-tendermint`](https://github.com/cosmos/tree/master/ibc/light-clients/07-tendermint)
+* [ICS 009 - Loopback Client](https://github.com/cosmos/ics/blob/master/spec/ics-009-loopback-client):  Implemented in [`x/ibc/light-clients/09-localhost`](https://github.com/cosmos/tree/master/ibc/light-clients/09-localhost)
 * [ICS 018- Relayer Algorithms](https://github.com/cosmos/ics/tree/master/spec/ics-018-relayer-algorithms): Implemented in it's own [relayer repository](https://github.com/cosmos/relayer)
-* [ICS 020 - Fungible Token Transfer](https://github.com/cosmos/ics/tree/master/spec/ics-020-fungible-token-transfer): Implemented in [`x/ibc-transfer`](https://github.com/cosmos/x/ibc-transfer)
-* [ICS 023 - Vector Commitments](https://github.com/cosmos/ics/tree/master/spec/ics-023-vector-commitments): Implemented in [`x/ibc/23-commitment`](https://github.com/cosmos/x/ibc/23-commitment)
-* [ICS 024 - Host Requirements](https://github.com/cosmos/ics/tree/master/spec/ics-024-host-requirements): Implemented in [`x/ibc/24-host`](https://github.com/cosmos/x/ibc/24-host)
+* [ICS 020 - Fungible Token Transfer](https://github.com/cosmos/ics/tree/master/spec/ics-020-fungible-token-transfer): Implemented in [`x/ibc/applications/transfer`](https://github.com/cosmos/tree/master/ibc/applications/transfer)
+* [ICS 023 - Vector Commitments](https://github.com/cosmos/ics/tree/master/spec/ics-023-vector-commitments): Implemented in [`x/ibc/23-commitment`](https://github.com/cosmos/tree/master/ibc/23-commitment)
+* [ICS 024 - Host Requirements](https://github.com/cosmos/ics/tree/master/spec/ics-024-host-requirements): Implemented in [`x/ibc/24-host`](https://github.com/cosmos/tree/master/ibc/24-host)
 * [ICS 025 - Handler Interface](https://github.com/cosmos/ics/tree/master/spec/ics-025-handler-interface): Handler interfaces are implemented at the top level in `x/ibc/handler.go`,
 which call each ICS submodule's handlers (i.e `x/ibc/{XX-ICS}/handler.go`).
 * [ICS 026 - Routing Module](https://github.com/cosmos/ics/blob/master/spec/ics-026-routing-module): Replaced by [ADR 15 - IBC Packet Receiver](../../../docs/architecture/adr-015-ibc-packet-receiver.md).
@ -81,30 +81,31 @@ specification. The following tree describes the architecture of the directories
 the `ibc` (TAO) and `ibc-transfer` ([ICS20](https://github.com/cosmos/ics/tree/master/spec/ics-020-fungible-token-transfer)) modules:

 ```shell
-x/
-├── ibc/
-│  ├── 02-client/
-│  ├── 03-connection/
-│  ├── 04-channel/
-│  ├── 05-port/
-│  ├── light-clients/
-│  │   ├── 06-solomachine/
-│  │   ├── 07-tendermint/
-│  │   └── 09-localhost/
-│  ├── 23-commitment/
-│  ├── 24-host/
-│  ├── client
-│  │   ├── cli
-│  │   │   └── cli.go
-│  │   └── rest
-│  │       └── rest.go
-│  ├── keeper
-│  │   ├── keeper.go
-│  │   └── querier.go
-│  ├── types
-│  │   ├── errors.go
-│  │   └── keys.go
-│  ├── handler.go
-│  └── module.go
-└── ibc-transfer/
+x/ibc
+├── applications/
+│   └──ibc-transfer/
+├── 02-client/
+├── 02-client/
+├── 03-connection/
+├── 04-channel/
+├── 05-port/
+├── light-clients/
+│   ├── 06-solomachine/
+│   ├── 07-tendermint/
+│   └── 09-localhost/
+├── 23-commitment/
+├── 24-host/
+├── client
+│   ├── cli
+│   │   └── cli.go
+│   └── rest
+│       └── rest.go
+├── keeper
+│   ├── keeper.go
+│   └── querier.go
+├── types
+│   ├── errors.go
+│   └── keys.go
+├── handler.go
+└── module.go
 ```
--- a/x/ibc/testing/chain.go
+++ b/x/ibc/testing/chain.go
@ -25,12 +25,12 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
-	ibctransfertypes "github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
 	connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types"
 	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
+	ibctransfertypes "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
 	solomachinetypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types"
 	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"