ibc: light clients restructure (#7408)

* ibc: light clients restructure * tendermint client cleanup * solomachine cleanup * rename * add cli * update spec README * proto files update * fix * update proto files * fix test build * fix test build
2020-10-01 11:38:53 +02:00 · 2020-10-01 11:38:53 +02:00 · 52a0b6d899
commit 52a0b6d899
parent 01fd22d244
94 changed files with 271 additions and 265 deletions
--- a/docs/ibc/overview.md
+++ b/docs/ibc/overview.md
@ -33,9 +33,9 @@ other blockchains, along with the proof spec necessary to properly verify proofs
 client's consensus state. A client may be associated with any number of connections to multiple
 chains. The supported IBC clients are:

-* [Solo Machine light client](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/light-clients/solomachine): devices such as phones, browsers, or laptops.
-* [Tendermint light client](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/07-tendermint): The default for SDK-based chains,
-* [Localhost (loopback) client](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/09-localhost): Useful for
+* [Solo Machine light client](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/light-clients/06-solomachine): devices such as phones, browsers, or laptops.
+* [Tendermint light client](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/light-clients/07-tendermint): The default for SDK-based chains,
+* [Localhost (loopback) client](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/light-clients/09-localhost): Useful for
 testing, simulation and relaying packets to modules on the same application.

 ### [Connections](https://github.com/cosmos/cosmos-sdk/tree/master/x/ibc/03-connection)
--- a/proto/ibc/lightclients/localhost/v1/localhost.proto
+++ b/proto/ibc/lightclients/localhost/v1/localhost.proto
@ -1,10 +1,10 @@
 syntax = "proto3";
-package ibc.localhost;
+package ibc.lightclients.localhost.v1;

 import "gogoproto/gogo.proto";
 import "ibc/client/client.proto";

-option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/09-localhost/types";
+option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types";

 // ClientState defines a loopback (localhost) client. It requires (read-only)
 // access to keys outside the client prefix.
--- a/proto/ibc/lightclients/solomachine/v1/solomachine.proto
+++ b/proto/ibc/lightclients/solomachine/v1/solomachine.proto
@ -1,7 +1,7 @@
 syntax = "proto3";
 package ibc.lightclients.solomachine.v1;

-option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine/types";
+option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types";

 import "ibc/connection/connection.proto";
 import "ibc/channel/channel.proto";
@ -27,7 +27,7 @@ message ClientState {
 message ConsensusState {
  option (gogoproto.goproto_getters) = false;
  // public key of the solo machine
-   google.protobuf.Any public_key = 1 [(gogoproto.moretags) = "yaml:\"public_key\""];
+  google.protobuf.Any public_key = 1 [(gogoproto.moretags) = "yaml:\"public_key\""];
  // diversifier allows the same public key to be re-used across different solo machine clients
  // (potentially on different chains) without being considered misbehaviour.
  string diversifier = 2;
@ -38,11 +38,11 @@ message ConsensusState {
 message Header {
  option (gogoproto.goproto_getters) = false;
  // sequence to update solo machine public key at
-  uint64                               sequence        = 1;
-  uint64                               timestamp       = 2;
-  bytes                                signature       = 3;
+  uint64              sequence        = 1;
+  uint64              timestamp       = 2;
+  bytes               signature       = 3;
  google.protobuf.Any new_public_key  = 4 [(gogoproto.moretags) = "yaml:\"new_public_key\""];
-  string                               new_diversifier = 5 [(gogoproto.moretags) = "yaml:\"new_diversifier\""];
+  string              new_diversifier = 5 [(gogoproto.moretags) = "yaml:\"new_diversifier\""];
 }

 // Misbehaviour defines misbehaviour for a solo machine which consists
--- a/proto/ibc/lightclients/tendermint/v1/tendermint.proto
+++ b/proto/ibc/lightclients/tendermint/v1/tendermint.proto
@ -1,7 +1,7 @@
 syntax = "proto3";
-package ibc.tendermint;
+package ibc.lightclients.tendermint.v1;

-option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types";
+option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types";

 import "tendermint/types/validator.proto";
 import "tendermint/types/types.proto";
--- a/x/ibc/02-client/client/utils/utils.go
+++ b/x/ibc/02-client/client/utils/utils.go
@ -10,11 +10,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
 	ibcclient "github.com/cosmos/cosmos-sdk/x/ibc/client"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
+	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 )

 // QueryClientState returns a client state. If prove is true, it performs an ABCI store query
--- a/x/ibc/02-client/genesis.go
+++ b/x/ibc/02-client/genesis.go
@ -6,8 +6,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/keeper"
 	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/09-localhost/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
+	localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types"
 )

 // InitGenesis initializes the ibc client submodule's state from a provided genesis
--- a/x/ibc/02-client/handler_test.go
+++ b/x/ibc/02-client/handler_test.go
@ -9,10 +9,10 @@ import (
 	client "github.com/cosmos/cosmos-sdk/x/ibc/02-client"
 	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
-	solomachinetypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine/types"
+	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"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
--- a/x/ibc/02-client/keeper/client_test.go
+++ b/x/ibc/02-client/keeper/client_test.go
@ -9,14 +9,13 @@ import (
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
-	localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/09-localhost/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
-	solomachinetypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine/types"
+	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"
+	localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 	ibctestingmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock"
-
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )

--- a/x/ibc/02-client/keeper/grpc_query_test.go
+++ b/x/ibc/02-client/keeper/grpc_query_test.go
@ -9,9 +9,9 @@ import (

 	"github.com/cosmos/cosmos-sdk/types/query"
 	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
+	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/02-client/keeper/keeper.go
+++ b/x/ibc/02-client/keeper/keeper.go
@ -13,10 +13,10 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
+	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )

--- a/x/ibc/02-client/keeper/keeper_test.go
+++ b/x/ibc/02-client/keeper/keeper_test.go
@ -17,10 +17,10 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/keeper"
 	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
-	localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/09-localhost/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
+	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
+	localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 	ibctestingmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
--- a/x/ibc/02-client/keeper/proposal_test.go
+++ b/x/ibc/02-client/keeper/proposal_test.go
@ -3,8 +3,8 @@ package keeper_test
 import (
 	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
+	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/02-client/simulation/decoder_test.go
+++ b/x/ibc/02-client/simulation/decoder_test.go
@ -11,8 +11,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/kv"
 	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/simulation"
 	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
+	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/02-client/types/codec_test.go
+++ b/x/ibc/02-client/types/codec_test.go
@ -3,10 +3,10 @@ package types_test
 import (
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
-	localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/09-localhost/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
+	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
+	localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/02-client/types/genesis_test.go
+++ b/x/ibc/02-client/types/genesis_test.go
@ -11,10 +11,10 @@ import (
 	client "github.com/cosmos/cosmos-sdk/x/ibc/02-client"
 	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
 	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
-	localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/09-localhost/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
+	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
+	localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 	ibctestingmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock"
 )
--- a/x/ibc/02-client/types/msgs_test.go
+++ b/x/ibc/02-client/types/msgs_test.go
@ -8,11 +8,11 @@ import (
 	"github.com/stretchr/testify/suite"

 	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
-	localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/09-localhost/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
-	solomachinetypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine/types"
+	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"
+	localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/02-client/types/proposal_test.go
+++ b/x/ibc/02-client/types/proposal_test.go
@ -3,7 +3,7 @@ package types_test
 import (
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
+	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/03-connection/keeper/handshake_test.go
+++ b/x/ibc/03-connection/keeper/handshake_test.go
@ -5,9 +5,9 @@ import (

 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
+	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/03-connection/keeper/verify_test.go
+++ b/x/ibc/03-connection/keeper/verify_test.go
@ -7,9 +7,9 @@ import (
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types"
 	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
+	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/03-connection/types/msgs_test.go
+++ b/x/ibc/03-connection/types/msgs_test.go
@ -17,8 +17,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
+	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/client/cli/cli.go
+++ b/x/ibc/client/cli/cli.go
@ -7,9 +7,9 @@ import (
 	ibcclient "github.com/cosmos/cosmos-sdk/x/ibc/02-client"
 	connection "github.com/cosmos/cosmos-sdk/x/ibc/03-connection"
 	channel "github.com/cosmos/cosmos-sdk/x/ibc/04-channel"
-	tendermint "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
-	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine"
+	solomachine "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine"
+	tendermint "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint"
 )

 // GetTxCmd returns the transaction commands for this module
--- a/x/ibc/genesis_test.go
+++ b/x/ibc/genesis_test.go
@ -11,11 +11,11 @@ import (
 	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"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
-	localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/09-localhost/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
+	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
+	localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 	"github.com/cosmos/cosmos-sdk/x/ibc/types"
 )
--- a/x/ibc/ibc_test.go
+++ b/x/ibc/ibc_test.go
@ -13,7 +13,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
 	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
+	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 	ibctestingmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock"
 )

--- a/x/ibc/light-clients/06-solomachine/client/cli/cli.go
+++ b/x/ibc/light-clients/06-solomachine/client/cli/cli.go
@ -4,7 +4,7 @@ import (
 	"github.com/spf13/cobra"

 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types"
 )

 // NewTxCmd returns a root CLI command handler for all solo machine transaction commands.
--- a/x/ibc/light-clients/06-solomachine/client/cli/tx.go
+++ b/x/ibc/light-clients/06-solomachine/client/cli/tx.go
@ -15,7 +15,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/version"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types"
 )

 const (
--- a/x/ibc/light-clients/06-solomachine/doc.go
+++ b/x/ibc/light-clients/06-solomachine/doc.go
--- a/x/ibc/light-clients/06-solomachine/module.go
+++ b/x/ibc/light-clients/06-solomachine/module.go
@ -3,8 +3,8 @@ package solomachine
 import (
 	"github.com/spf13/cobra"

-	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine/client/cli"
-	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/client/cli"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types"
 )

 // Name returns the solo machine client name.
--- a/x/ibc/light-clients/06-solomachine/spec/01_concepts.md
+++ b/x/ibc/light-clients/06-solomachine/spec/01_concepts.md
--- a/x/ibc/light-clients/06-solomachine/spec/README.md
+++ b/x/ibc/light-clients/06-solomachine/spec/README.md
--- a/x/ibc/light-clients/06-solomachine/types/client_state.go
+++ b/x/ibc/light-clients/06-solomachine/types/client_state.go
--- a/x/ibc/light-clients/06-solomachine/types/client_state_test.go
+++ b/x/ibc/light-clients/06-solomachine/types/client_state_test.go
@ -7,7 +7,7 @@ import (
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
-	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/light-clients/06-solomachine/types/codec.go
+++ b/x/ibc/light-clients/06-solomachine/types/codec.go
@ -30,10 +30,10 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
 }

 var (
-	// SubModuleCdc references the global x/ibc/light-clients/solomachine module codec. Note, the codec
+	// SubModuleCdc references the global x/ibc/light-clients/06-solomachine module codec. Note, the codec
 	// should ONLY be used in certain instances of tests and for JSON encoding.
 	//
-	// The actual codec used for serialization should be provided to x/ibc/light-clients/solomachine and
+	// The actual codec used for serialization should be provided to x/ibc/light-clients/06-solomachine and
 	// defined at the application level.
 	SubModuleCdc = codec.NewProtoCodec(codectypes.NewInterfaceRegistry())
 )
--- a/x/ibc/light-clients/06-solomachine/types/consensus_state.go
+++ b/x/ibc/light-clients/06-solomachine/types/consensus_state.go
--- a/x/ibc/light-clients/06-solomachine/types/consensus_state_test.go
+++ b/x/ibc/light-clients/06-solomachine/types/consensus_state_test.go
@ -1,7 +1,7 @@
 package types_test

 import (
-	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/light-clients/06-solomachine/types/errors.go
+++ b/x/ibc/light-clients/06-solomachine/types/errors.go
--- a/x/ibc/light-clients/06-solomachine/types/header.go
+++ b/x/ibc/light-clients/06-solomachine/types/header.go
--- a/x/ibc/light-clients/06-solomachine/types/header_test.go
+++ b/x/ibc/light-clients/06-solomachine/types/header_test.go
@ -1,7 +1,7 @@
 package types_test

 import (
-	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/light-clients/06-solomachine/types/misbehaviour.go
+++ b/x/ibc/light-clients/06-solomachine/types/misbehaviour.go
--- a/x/ibc/light-clients/06-solomachine/types/misbehaviour_handle.go
+++ b/x/ibc/light-clients/06-solomachine/types/misbehaviour_handle.go
--- a/x/ibc/light-clients/06-solomachine/types/misbehaviour_handle_test.go
+++ b/x/ibc/light-clients/06-solomachine/types/misbehaviour_handle_test.go
@ -1,9 +1,9 @@
 package types_test

 import (
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
-	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine/types"
+	"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"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/light-clients/06-solomachine/types/misbehaviour_test.go
+++ b/x/ibc/light-clients/06-solomachine/types/misbehaviour_test.go
@ -1,7 +1,7 @@
 package types_test

 import (
-	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/light-clients/06-solomachine/types/proof.go
+++ b/x/ibc/light-clients/06-solomachine/types/proof.go
--- a/x/ibc/light-clients/06-solomachine/types/proposal_handle.go
+++ b/x/ibc/light-clients/06-solomachine/types/proposal_handle.go
--- a/x/ibc/light-clients/06-solomachine/types/proposal_handle_test.go
+++ b/x/ibc/light-clients/06-solomachine/types/proposal_handle_test.go
@ -1,9 +1,9 @@
 package types_test

 import (
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
-	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine/types"
+	"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"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/light-clients/06-solomachine/types/solomachine.go
+++ b/x/ibc/light-clients/06-solomachine/types/solomachine.go
--- a/x/ibc/light-clients/06-solomachine/types/solomachine.pb.go
+++ b/x/ibc/light-clients/06-solomachine/types/solomachine.pb.go
@ -754,69 +754,70 @@ func init() {
 }

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

 func (m *ClientState) Marshal() (dAtA []byte, err error) {
--- a/x/ibc/light-clients/06-solomachine/types/solomachine_test.go
+++ b/x/ibc/light-clients/06-solomachine/types/solomachine_test.go
@ -15,7 +15,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
-	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/light-clients/06-solomachine/types/update.go
+++ b/x/ibc/light-clients/06-solomachine/types/update.go
--- a/x/ibc/light-clients/06-solomachine/types/update_test.go
+++ b/x/ibc/light-clients/06-solomachine/types/update_test.go
@ -3,9 +3,9 @@ package types_test
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/tx"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
-	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine/types"
+	"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"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/light-clients/07-tendermint/client/cli/cli.go
+++ b/x/ibc/light-clients/07-tendermint/client/cli/cli.go
@ -3,10 +3,10 @@ package cli
 import (
 	"github.com/spf13/cobra"

-	"github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 )

-// NewTxCmd returns a root CLI command handler for all x/ibc/07-tendermint transaction commands.
+// NewTxCmd returns a root CLI command handler for all x/ibc/light-clients/07-tendermint transaction commands.
 func NewTxCmd() *cobra.Command {
 	txCmd := &cobra.Command{
 		Use:                        types.SubModuleName,
--- a/x/ibc/light-clients/07-tendermint/client/cli/tx.go
+++ b/x/ibc/light-clients/07-tendermint/client/cli/tx.go
@ -18,8 +18,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/version"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	"github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 )

 const (
--- a/x/ibc/light-clients/07-tendermint/doc.go
+++ b/x/ibc/light-clients/07-tendermint/doc.go
--- a/x/ibc/light-clients/07-tendermint/module.go
+++ b/x/ibc/light-clients/07-tendermint/module.go
@ -3,8 +3,8 @@ package tendermint
 import (
 	"github.com/spf13/cobra"

-	"github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/client/cli"
-	"github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/client/cli"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 )

 // Name returns the IBC client name
--- a/x/ibc/light-clients/07-tendermint/types/client_state.go
+++ b/x/ibc/light-clients/07-tendermint/types/client_state.go
--- a/x/ibc/light-clients/07-tendermint/types/client_state_test.go
+++ b/x/ibc/light-clients/07-tendermint/types/client_state_test.go
@ -5,10 +5,10 @@ import (

 	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/07-tendermint/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/light-clients/07-tendermint/types/codec.go
+++ b/x/ibc/light-clients/07-tendermint/types/codec.go
@ -32,10 +32,10 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
 }

 var (
-	// SubModuleCdc references the global x/ibc/07-tendermint module codec. Note, the codec should
+	// SubModuleCdc references the global x/ibc/light-clients/07-tendermint module codec. Note, the codec should
 	// ONLY be used in certain instances of tests and for JSON encoding.
 	//
-	// The actual codec used for serialization should be provided to x/ibc/07-tendermint and
+	// The actual codec used for serialization should be provided to x/ibc/light-clients/07-tendermint and
 	// defined at the application level.
 	SubModuleCdc = codec.NewProtoCodec(codectypes.NewInterfaceRegistry())
 )
--- a/x/ibc/light-clients/07-tendermint/types/consensus_state.go
+++ b/x/ibc/light-clients/07-tendermint/types/consensus_state.go
--- a/x/ibc/light-clients/07-tendermint/types/consensus_state_test.go
+++ b/x/ibc/light-clients/07-tendermint/types/consensus_state_test.go
@ -3,8 +3,8 @@ package types_test
 import (
 	"time"

-	"github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 )

 func (suite *TendermintTestSuite) TestConsensusStateValidateBasic() {
--- a/x/ibc/light-clients/07-tendermint/types/errors.go
+++ b/x/ibc/light-clients/07-tendermint/types/errors.go
--- a/x/ibc/light-clients/07-tendermint/types/fraction.go
+++ b/x/ibc/light-clients/07-tendermint/types/fraction.go
--- a/x/ibc/light-clients/07-tendermint/types/header.go
+++ b/x/ibc/light-clients/07-tendermint/types/header.go
--- a/x/ibc/light-clients/07-tendermint/types/header_test.go
+++ b/x/ibc/light-clients/07-tendermint/types/header_test.go
@ -6,7 +6,7 @@ import (
 	tmprotocrypto "github.com/tendermint/tendermint/proto/tendermint/crypto"

 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	"github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 )

 func (suite *TendermintTestSuite) TestGetHeight() {
--- a/x/ibc/light-clients/07-tendermint/types/misbehaviour.go
+++ b/x/ibc/light-clients/07-tendermint/types/misbehaviour.go
--- a/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle.go
+++ b/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle.go
--- a/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle_test.go
+++ b/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle_test.go
@ -10,9 +10,9 @@ import (
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/simapp"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	"github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 	ibctestingmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock"
 )

--- a/x/ibc/light-clients/07-tendermint/types/misbehaviour_test.go
+++ b/x/ibc/light-clients/07-tendermint/types/misbehaviour_test.go
@ -9,7 +9,7 @@ import (

 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	"github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 	ibctestingmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock"
 )

--- a/x/ibc/light-clients/07-tendermint/types/proposal_handle.go
+++ b/x/ibc/light-clients/07-tendermint/types/proposal_handle.go
--- a/x/ibc/light-clients/07-tendermint/types/proposal_handle_test.go
+++ b/x/ibc/light-clients/07-tendermint/types/proposal_handle_test.go
@ -2,7 +2,7 @@ package types_test

 import (
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	"github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 )

--- a/x/ibc/light-clients/07-tendermint/types/store.go
+++ b/x/ibc/light-clients/07-tendermint/types/store.go
--- a/x/ibc/light-clients/07-tendermint/types/store_test.go
+++ b/x/ibc/light-clients/07-tendermint/types/store_test.go
@ -3,9 +3,9 @@ package types_test
 import (
 	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/07-tendermint/types"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 )

 func (suite *TendermintTestSuite) TestGetConsensusState() {
--- a/x/ibc/light-clients/07-tendermint/types/tendermint.pb.go
+++ b/x/ibc/light-clients/07-tendermint/types/tendermint.pb.go
@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: ibc/tendermint/tendermint.proto
+// source: ibc/lightclients/tendermint/v1/tendermint.proto

 package types

@ -65,7 +65,7 @@ func (m *ClientState) Reset()         { *m = ClientState{} }
 func (m *ClientState) String() string { return proto.CompactTextString(m) }
 func (*ClientState) ProtoMessage()    {}
 func (*ClientState) Descriptor() ([]byte, []int) {
-	return fileDescriptor_76a953d5a747dd66, []int{0}
+	return fileDescriptor_c6d6cf2b288949be, []int{0}
 }
 func (m *ClientState) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@ -108,7 +108,7 @@ func (m *ConsensusState) Reset()         { *m = ConsensusState{} }
 func (m *ConsensusState) String() string { return proto.CompactTextString(m) }
 func (*ConsensusState) ProtoMessage()    {}
 func (*ConsensusState) Descriptor() ([]byte, []int) {
-	return fileDescriptor_76a953d5a747dd66, []int{1}
+	return fileDescriptor_c6d6cf2b288949be, []int{1}
 }
 func (m *ConsensusState) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@ -149,7 +149,7 @@ type Misbehaviour struct {
 func (m *Misbehaviour) Reset()      { *m = Misbehaviour{} }
 func (*Misbehaviour) ProtoMessage() {}
 func (*Misbehaviour) Descriptor() ([]byte, []int) {
-	return fileDescriptor_76a953d5a747dd66, []int{2}
+	return fileDescriptor_c6d6cf2b288949be, []int{2}
 }
 func (m *Misbehaviour) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@ -201,7 +201,7 @@ func (m *Header) Reset()         { *m = Header{} }
 func (m *Header) String() string { return proto.CompactTextString(m) }
 func (*Header) ProtoMessage()    {}
 func (*Header) Descriptor() ([]byte, []int) {
-	return fileDescriptor_76a953d5a747dd66, []int{3}
+	return fileDescriptor_c6d6cf2b288949be, []int{3}
 }
 func (m *Header) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@ -261,7 +261,7 @@ func (m *Fraction) Reset()         { *m = Fraction{} }
 func (m *Fraction) String() string { return proto.CompactTextString(m) }
 func (*Fraction) ProtoMessage()    {}
 func (*Fraction) Descriptor() ([]byte, []int) {
-	return fileDescriptor_76a953d5a747dd66, []int{4}
+	return fileDescriptor_c6d6cf2b288949be, []int{4}
 }
 func (m *Fraction) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@ -305,84 +305,88 @@ func (m *Fraction) GetDenominator() int64 {
 }

 func init() {
-	proto.RegisterType((*ClientState)(nil), "ibc.tendermint.ClientState")
-	proto.RegisterType((*ConsensusState)(nil), "ibc.tendermint.ConsensusState")
-	proto.RegisterType((*Misbehaviour)(nil), "ibc.tendermint.Misbehaviour")
-	proto.RegisterType((*Header)(nil), "ibc.tendermint.Header")
-	proto.RegisterType((*Fraction)(nil), "ibc.tendermint.Fraction")
+	proto.RegisterType((*ClientState)(nil), "ibc.lightclients.tendermint.v1.ClientState")
+	proto.RegisterType((*ConsensusState)(nil), "ibc.lightclients.tendermint.v1.ConsensusState")
+	proto.RegisterType((*Misbehaviour)(nil), "ibc.lightclients.tendermint.v1.Misbehaviour")
+	proto.RegisterType((*Header)(nil), "ibc.lightclients.tendermint.v1.Header")
+	proto.RegisterType((*Fraction)(nil), "ibc.lightclients.tendermint.v1.Fraction")
 }

-func init() { proto.RegisterFile("ibc/tendermint/tendermint.proto", fileDescriptor_76a953d5a747dd66) }
+func init() {
+	proto.RegisterFile("ibc/lightclients/tendermint/v1/tendermint.proto", fileDescriptor_c6d6cf2b288949be)
+}

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

 func (m *ClientState) Marshal() (dAtA []byte, err error) {
--- a/x/ibc/light-clients/07-tendermint/types/tendermint_test.go
+++ b/x/ibc/light-clients/07-tendermint/types/tendermint_test.go
@ -14,8 +14,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
+	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
 	ibctestingmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
--- a/x/ibc/light-clients/07-tendermint/types/test_utils.go
+++ b/x/ibc/light-clients/07-tendermint/types/test_utils.go
--- a/x/ibc/light-clients/07-tendermint/types/update.go
+++ b/x/ibc/light-clients/07-tendermint/types/update.go
--- a/x/ibc/light-clients/07-tendermint/types/update_test.go
+++ b/x/ibc/light-clients/07-tendermint/types/update_test.go
@ -7,8 +7,8 @@ import (

 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	types "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
+	types "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 	ibctestingmock "github.com/cosmos/cosmos-sdk/x/ibc/testing/mock"
 )

--- a/x/ibc/light-clients/07-tendermint/types/upgrade.go
+++ b/x/ibc/light-clients/07-tendermint/types/upgrade.go
--- a/x/ibc/light-clients/07-tendermint/types/upgrade_test.go
+++ b/x/ibc/light-clients/07-tendermint/types/upgrade_test.go
@ -1,12 +1,11 @@
 package types_test

 import (
-	"github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
-	solomachinetypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine/types"
+	solomachinetypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 	ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
-
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )

--- a/x/ibc/light-clients/09-localhost/doc.go
+++ b/x/ibc/light-clients/09-localhost/doc.go
--- a/x/ibc/light-clients/09-localhost/module.go
+++ b/x/ibc/light-clients/09-localhost/module.go
@ -1,7 +1,7 @@
 package localhost

 import (
-	"github.com/cosmos/cosmos-sdk/x/ibc/09-localhost/types"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types"
 )

 // Name returns the IBC client name
--- a/x/ibc/light-clients/09-localhost/types/client_state.go
+++ b/x/ibc/light-clients/09-localhost/types/client_state.go
--- a/x/ibc/light-clients/09-localhost/types/client_state_test.go
+++ b/x/ibc/light-clients/09-localhost/types/client_state_test.go
@ -5,9 +5,9 @@ import (
 	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"
-	"github.com/cosmos/cosmos-sdk/x/ibc/09-localhost/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
+	"github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types"
 )

 const (
--- a/x/ibc/light-clients/09-localhost/types/codec.go
+++ b/x/ibc/light-clients/09-localhost/types/codec.go
@ -16,8 +16,8 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
 }

 var (
-	// SubModuleCdc references the global x/ibc/09-localhost module codec.
-	// The actual codec used for serialization should be provided to x/ibc/09-localhost and
+	// SubModuleCdc references the global x/ibc/light-clients/09-localhost module codec.
+	// The actual codec used for serialization should be provided to x/ibc/light-clients/09-localhost and
 	// defined at the application level.
 	SubModuleCdc = codec.NewProtoCodec(codectypes.NewInterfaceRegistry())
 )
--- a/x/ibc/light-clients/09-localhost/types/errors.go
+++ b/x/ibc/light-clients/09-localhost/types/errors.go
--- a/x/ibc/light-clients/09-localhost/types/keys.go
+++ b/x/ibc/light-clients/09-localhost/types/keys.go
--- a/x/ibc/light-clients/09-localhost/types/localhost.pb.go
+++ b/x/ibc/light-clients/09-localhost/types/localhost.pb.go
@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: ibc/localhost/localhost.proto
+// source: ibc/lightclients/localhost/v1/localhost.proto

 package types

@ -39,7 +39,7 @@ func (m *ClientState) Reset()         { *m = ClientState{} }
 func (m *ClientState) String() string { return proto.CompactTextString(m) }
 func (*ClientState) ProtoMessage()    {}
 func (*ClientState) Descriptor() ([]byte, []int) {
-	return fileDescriptor_6a04d924e6f8a88e, []int{0}
+	return fileDescriptor_acd9f5b22d41bf6d, []int{0}
 }
 func (m *ClientState) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@ -69,30 +69,33 @@ func (m *ClientState) XXX_DiscardUnknown() {
 var xxx_messageInfo_ClientState proto.InternalMessageInfo

 func init() {
-	proto.RegisterType((*ClientState)(nil), "ibc.localhost.ClientState")
+	proto.RegisterType((*ClientState)(nil), "ibc.lightclients.localhost.v1.ClientState")
 }

-func init() { proto.RegisterFile("ibc/localhost/localhost.proto", fileDescriptor_6a04d924e6f8a88e) }
+func init() {
+	proto.RegisterFile("ibc/lightclients/localhost/v1/localhost.proto", fileDescriptor_acd9f5b22d41bf6d)
+}

-var fileDescriptor_6a04d924e6f8a88e = []byte{
-	// 261 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcd, 0x4c, 0x4a, 0xd6,
-	0xcf, 0xc9, 0x4f, 0x4e, 0xcc, 0xc9, 0xc8, 0x2f, 0x2e, 0x41, 0xb0, 0xf4, 0x0a, 0x8a, 0xf2, 0x4b,
-	0xf2, 0x85, 0x78, 0x33, 0x93, 0x92, 0xf5, 0xe0, 0x82, 0x52, 0x22, 0xe9, 0xf9, 0xe9, 0xf9, 0x60,
-	0x19, 0x7d, 0x10, 0x0b, 0xa2, 0x48, 0x4a, 0x1c, 0x64, 0x46, 0x72, 0x4e, 0x66, 0x6a, 0x5e, 0x09,
-	0x94, 0x82, 0x48, 0x28, 0xb5, 0x32, 0x72, 0x71, 0x3b, 0x83, 0x05, 0x82, 0x4b, 0x12, 0x4b, 0x52,
-	0x85, 0xf8, 0xb8, 0x98, 0x32, 0x53, 0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0x98, 0x32, 0x53,
-	0x84, 0xf4, 0xb8, 0x38, 0x92, 0x33, 0x12, 0x33, 0xf3, 0xe2, 0x33, 0x53, 0x24, 0x98, 0x40, 0xa2,
-	0x4e, 0xc2, 0x9f, 0xee, 0xc9, 0xf3, 0x57, 0x26, 0xe6, 0xe6, 0x58, 0x29, 0xc1, 0x64, 0x94, 0x82,
-	0xd8, 0xc1, 0x4c, 0xcf, 0x14, 0x21, 0x03, 0x2e, 0xb6, 0x8c, 0xd4, 0xcc, 0xf4, 0x8c, 0x12, 0x09,
-	0x66, 0x05, 0x46, 0x0d, 0x6e, 0x23, 0x21, 0x3d, 0x90, 0xf3, 0xa0, 0x56, 0x7a, 0x80, 0x65, 0x9c,
-	0x58, 0x4e, 0xdc, 0x93, 0x67, 0x08, 0x82, 0xaa, 0xb3, 0x62, 0xe9, 0x58, 0x20, 0xcf, 0xe0, 0xe4,
-	0x7f, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c,
-	0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0xa6, 0xe9, 0x99, 0x25, 0x19,
-	0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0xc9, 0xf9, 0xc5, 0xb9, 0xf9, 0xc5, 0x50, 0x4a, 0xb7,
-	0x38, 0x25, 0x5b, 0xbf, 0x42, 0x1f, 0xe4, 0x33, 0x03, 0x4b, 0x5d, 0x44, 0x00, 0x95, 0x54, 0x16,
-	0xa4, 0x16, 0x27, 0xb1, 0x81, 0xfd, 0x67, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x3d, 0xbf, 0x65,
-	0xd9, 0x3e, 0x01, 0x00, 0x00,
+var fileDescriptor_acd9f5b22d41bf6d = []byte{
+	// 280 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xcd, 0x4c, 0x4a, 0xd6,
+	0xcf, 0xc9, 0x4c, 0xcf, 0x28, 0x49, 0xce, 0xc9, 0x4c, 0xcd, 0x2b, 0x29, 0xd6, 0xcf, 0xc9, 0x4f,
+	0x4e, 0xcc, 0xc9, 0xc8, 0x2f, 0x2e, 0xd1, 0x2f, 0x33, 0x44, 0x70, 0xf4, 0x0a, 0x8a, 0xf2, 0x4b,
+	0xf2, 0x85, 0x64, 0x33, 0x93, 0x92, 0xf5, 0x90, 0x95, 0xeb, 0x21, 0x54, 0x94, 0x19, 0x4a, 0x89,
+	0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x55, 0xea, 0x83, 0x58, 0x10, 0x4d, 0x52, 0xe2, 0x20, 0x3b, 0x20,
+	0xea, 0xa1, 0x14, 0x44, 0x42, 0xa9, 0x95, 0x91, 0x8b, 0xdb, 0x19, 0x2c, 0x10, 0x5c, 0x92, 0x58,
+	0x92, 0x2a, 0xc4, 0xc7, 0xc5, 0x94, 0x99, 0x22, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x19, 0xc4, 0x94,
+	0x99, 0x22, 0xa4, 0xc7, 0xc5, 0x91, 0x9c, 0x91, 0x98, 0x99, 0x17, 0x9f, 0x99, 0x22, 0xc1, 0x04,
+	0x12, 0x75, 0x12, 0xfe, 0x74, 0x4f, 0x9e, 0xbf, 0x32, 0x31, 0x37, 0xc7, 0x4a, 0x09, 0x26, 0xa3,
+	0x14, 0xc4, 0x0e, 0x66, 0x7a, 0xa6, 0x08, 0x19, 0x70, 0xb1, 0x65, 0xa4, 0x82, 0x1c, 0x27, 0xc1,
+	0xac, 0xc0, 0xa8, 0xc1, 0x6d, 0x24, 0xa4, 0x07, 0x72, 0x2e, 0xd4, 0x4a, 0x0f, 0xb0, 0x8c, 0x13,
+	0xcb, 0x89, 0x7b, 0xf2, 0x0c, 0x41, 0x50, 0x75, 0x56, 0x2c, 0x1d, 0x0b, 0xe4, 0x19, 0x9c, 0x62,
+	0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5,
+	0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x39, 0x3d, 0xb3, 0x24, 0xa3,
+	0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x3f, 0x39, 0xbf, 0x38, 0x37, 0xbf, 0x18, 0x4a, 0xe9, 0x16,
+	0xa7, 0x64, 0xeb, 0x57, 0xe8, 0xc3, 0x43, 0x4f, 0x17, 0x16, 0x7c, 0x06, 0x96, 0xba, 0x88, 0x10,
+	0x2c, 0xa9, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0xfb, 0xd6, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff,
+	0xab, 0x67, 0x73, 0xa8, 0x6c, 0x01, 0x00, 0x00,
 }

 func (m *ClientState) Marshal() (dAtA []byte, err error) {
--- a/x/ibc/light-clients/09-localhost/types/localhost_test.go
+++ b/x/ibc/light-clients/09-localhost/types/localhost_test.go
--- a/x/ibc/simulation/decoder_test.go
+++ b/x/ibc/simulation/decoder_test.go
@ -11,8 +11,8 @@ import (
 	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"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
+	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/simulation"
 )

--- a/x/ibc/spec/README.md
+++ b/x/ibc/spec/README.md
@ -40,9 +40,9 @@ in the SDK's `x/ibc` module:
 * [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/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/07-tendermint`](https://github.com/cosmos/x/ibc/07-tendermint)
-* [ICS 009 - Loopback Client](https://github.com/cosmos/ics/blob/master/spec/ics-009-loopback-client):  Implemented in [`x/ibc/09-localhost`](https://github.com/cosmos/x/ibc/09-localhost)
+* [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 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)
@ -88,9 +88,9 @@ x/
 │  ├── 04-channel/
 │  ├── 05-port/
 │  ├── light-clients/
-│  │   └── solomachine/
-│  ├── 07-tendermint/
-│  ├── 09-localhost/
+│  │   ├── 06-solomachine/
+│  │   ├── 07-tendermint/
+│  │   └── 09-localhost/
 │  ├── 23-commitment/
 │  ├── 24-host/
 │  ├── client
--- a/x/ibc/testing/chain.go
+++ b/x/ibc/testing/chain.go
@ -29,11 +29,11 @@ import (
 	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"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
 	host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
-	solomachinetypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine/types"
+	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"
 	"github.com/cosmos/cosmos-sdk/x/ibc/testing/mock"
 	"github.com/cosmos/cosmos-sdk/x/ibc/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
--- a/x/ibc/testing/solomachine.go
+++ b/x/ibc/testing/solomachine.go
@ -14,7 +14,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth/tx"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc/exported"
-	solomachinetypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine/types"
+	solomachinetypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/06-solomachine/types"
 )

 // Solomachine is a testing helper used to simulate a counterparty
--- a/x/ibc/types/codec.go
+++ b/x/ibc/types/codec.go
@ -5,10 +5,10 @@ import (
 	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"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
-	localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/09-localhost/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
-	solomachinetypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/solomachine/types"
+	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"
+	localhosttypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/09-localhost/types"
 )

 // RegisterInterfaces registers x/ibc interfaces into protobuf Any.
--- a/x/upgrade/abci_test.go
+++ b/x/upgrade/abci_test.go
@ -22,7 +22,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
+	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 	"github.com/cosmos/cosmos-sdk/x/upgrade"
 	"github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
 	"github.com/cosmos/cosmos-sdk/x/upgrade/types"
--- a/x/upgrade/keeper/keeper_test.go
+++ b/x/upgrade/keeper/keeper_test.go
@ -12,8 +12,8 @@ import (
 	store "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
+	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
 	"github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
 	"github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
--- a/x/upgrade/types/plan_test.go
+++ b/x/upgrade/types/plan_test.go
@ -11,7 +11,7 @@ import (
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"

 	clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
-	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
+	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"

 	sdk "github.com/cosmos/cosmos-sdk/types"
 )