diff --git a/.github/README.md b/.github/README.md
index 9ef1d076..1ad177ef 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -5,5 +5,3 @@
 [![codecov](https://img.shields.io/codecov/c/gh/noble-assets/florin?token=E3Q02S9U5R&labelColor=black)](https://codecov.io/gh/noble-assets/florin)
 
 This repository includes the `x/florin` Cosmos SDK module implementation.
-
-For more information, refer to the module's [spec](../x/florin/spec) files.
diff --git a/Makefile b/Makefile
index b2fd4ee7..eb0ad76a 100644
--- a/Makefile
+++ b/Makefile
@@ -70,5 +70,5 @@ proto-breaking:
 
 test-unit:
 	@echo "🤖 Running unit tests..."
-	@go test -cover -coverprofile=coverage.out -race -v ./x/florin/keeper/...
+	@go test -cover -coverprofile=coverage.out -race -v ./keeper/...
 	@echo "✅ Completed unit tests!"
diff --git a/x/florin/client/cli/query.go b/client/cli/query.go
similarity index 99%
rename from x/florin/client/cli/query.go
rename to client/cli/query.go
index ad8344b0..3f082e69 100644
--- a/x/florin/client/cli/query.go
+++ b/client/cli/query.go
@@ -21,7 +21,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/gogoproto/proto"
-	"github.com/monerium/module-noble/v2/x/florin/types"
+	"github.com/monerium/module-noble/v2/types"
 	"github.com/spf13/cobra"
 )
 
diff --git a/x/florin/client/cli/query_blacklist.go b/client/cli/query_blacklist.go
similarity index 97%
rename from x/florin/client/cli/query_blacklist.go
rename to client/cli/query_blacklist.go
index d5f2cb12..7f7cb7b4 100644
--- a/x/florin/client/cli/query_blacklist.go
+++ b/client/cli/query_blacklist.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
-	"github.com/monerium/module-noble/v2/x/florin/types/blacklist"
+	"github.com/monerium/module-noble/v2/types/blacklist"
 	"github.com/spf13/cobra"
 )
 
diff --git a/x/florin/client/cli/tx.go b/client/cli/tx.go
similarity index 99%
rename from x/florin/client/cli/tx.go
rename to client/cli/tx.go
index 55fed25e..4c22755e 100644
--- a/x/florin/client/cli/tx.go
+++ b/client/cli/tx.go
@@ -23,7 +23,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
-	"github.com/monerium/module-noble/v2/x/florin/types"
+	"github.com/monerium/module-noble/v2/types"
 	"github.com/spf13/cobra"
 )
 
diff --git a/x/florin/client/cli/tx_blacklist.go b/client/cli/tx_blacklist.go
similarity index 98%
rename from x/florin/client/cli/tx_blacklist.go
rename to client/cli/tx_blacklist.go
index f4aa4796..fef84838 100644
--- a/x/florin/client/cli/tx_blacklist.go
+++ b/client/cli/tx_blacklist.go
@@ -18,7 +18,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
-	"github.com/monerium/module-noble/v2/x/florin/types/blacklist"
+	"github.com/monerium/module-noble/v2/types/blacklist"
 	"github.com/spf13/cobra"
 )
 
diff --git a/x/florin/genesis.go b/genesis.go
similarity index 93%
rename from x/florin/genesis.go
rename to genesis.go
index 5f932456..dfa33227 100644
--- a/x/florin/genesis.go
+++ b/genesis.go
@@ -17,9 +17,9 @@ package florin
 import (
 	"cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/monerium/module-noble/v2/x/florin/keeper"
-	"github.com/monerium/module-noble/v2/x/florin/types"
-	"github.com/monerium/module-noble/v2/x/florin/types/blacklist"
+	"github.com/monerium/module-noble/v2/keeper"
+	"github.com/monerium/module-noble/v2/types"
+	"github.com/monerium/module-noble/v2/types/blacklist"
 )
 
 func InitGenesis(ctx sdk.Context, k *keeper.Keeper, genesis types.GenesisState) {
diff --git a/x/florin/keeper/keeper.go b/keeper/keeper.go
similarity index 94%
rename from x/florin/keeper/keeper.go
rename to keeper/keeper.go
index 4a932346..4b7c65f3 100644
--- a/x/florin/keeper/keeper.go
+++ b/keeper/keeper.go
@@ -20,8 +20,8 @@ import (
 
 	"cosmossdk.io/core/store"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/monerium/module-noble/v2/x/florin/types"
-	"github.com/monerium/module-noble/v2/x/florin/types/blacklist"
+	"github.com/monerium/module-noble/v2/types"
+	"github.com/monerium/module-noble/v2/types/blacklist"
 )
 
 type Keeper struct {
diff --git a/x/florin/keeper/keeper_test.go b/keeper/keeper_test.go
similarity index 100%
rename from x/florin/keeper/keeper_test.go
rename to keeper/keeper_test.go
diff --git a/x/florin/keeper/msg_server.go b/keeper/msg_server.go
similarity index 99%
rename from x/florin/keeper/msg_server.go
rename to keeper/msg_server.go
index defb78db..bdff7c82 100644
--- a/x/florin/keeper/msg_server.go
+++ b/keeper/msg_server.go
@@ -21,7 +21,7 @@ import (
 	"adr36.dev"
 	"cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/monerium/module-noble/v2/x/florin/types"
+	"github.com/monerium/module-noble/v2/types"
 )
 
 var _ types.MsgServer = &msgServer{}
diff --git a/x/florin/keeper/msg_server_blacklist.go b/keeper/msg_server_blacklist.go
similarity index 98%
rename from x/florin/keeper/msg_server_blacklist.go
rename to keeper/msg_server_blacklist.go
index 67c09e67..674988fb 100644
--- a/x/florin/keeper/msg_server_blacklist.go
+++ b/keeper/msg_server_blacklist.go
@@ -19,7 +19,7 @@ import (
 
 	"cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/monerium/module-noble/v2/x/florin/types/blacklist"
+	"github.com/monerium/module-noble/v2/types/blacklist"
 )
 
 var _ blacklist.MsgServer = &blacklistMsgServer{}
diff --git a/x/florin/keeper/msg_server_blacklist_test.go b/keeper/msg_server_blacklist_test.go
similarity index 98%
rename from x/florin/keeper/msg_server_blacklist_test.go
rename to keeper/msg_server_blacklist_test.go
index 9f70fdfc..20985a1f 100644
--- a/x/florin/keeper/msg_server_blacklist_test.go
+++ b/keeper/msg_server_blacklist_test.go
@@ -18,10 +18,10 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/monerium/module-noble/v2/keeper"
+	"github.com/monerium/module-noble/v2/types/blacklist"
 	"github.com/monerium/module-noble/v2/utils"
 	"github.com/monerium/module-noble/v2/utils/mocks"
-	"github.com/monerium/module-noble/v2/x/florin/keeper"
-	"github.com/monerium/module-noble/v2/x/florin/types/blacklist"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/x/florin/keeper/msg_server_test.go b/keeper/msg_server_test.go
similarity index 99%
rename from x/florin/keeper/msg_server_test.go
rename to keeper/msg_server_test.go
index 9a71f333..acc60e69 100644
--- a/x/florin/keeper/msg_server_test.go
+++ b/keeper/msg_server_test.go
@@ -23,10 +23,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	"github.com/monerium/module-noble/v2/keeper"
+	"github.com/monerium/module-noble/v2/types"
 	"github.com/monerium/module-noble/v2/utils"
 	"github.com/monerium/module-noble/v2/utils/mocks"
-	"github.com/monerium/module-noble/v2/x/florin/keeper"
-	"github.com/monerium/module-noble/v2/x/florin/types"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/x/florin/keeper/query_server.go b/keeper/query_server.go
similarity index 99%
rename from x/florin/keeper/query_server.go
rename to keeper/query_server.go
index 0d4bc8a1..20836dc1 100644
--- a/x/florin/keeper/query_server.go
+++ b/keeper/query_server.go
@@ -20,7 +20,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/errors"
-	"github.com/monerium/module-noble/v2/x/florin/types"
+	"github.com/monerium/module-noble/v2/types"
 )
 
 var _ types.QueryServer = &queryServer{}
diff --git a/x/florin/keeper/query_server_blacklist.go b/keeper/query_server_blacklist.go
similarity index 96%
rename from x/florin/keeper/query_server_blacklist.go
rename to keeper/query_server_blacklist.go
index 838989f4..afd17185 100644
--- a/x/florin/keeper/query_server_blacklist.go
+++ b/keeper/query_server_blacklist.go
@@ -19,7 +19,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/errors"
-	"github.com/monerium/module-noble/v2/x/florin/types/blacklist"
+	"github.com/monerium/module-noble/v2/types/blacklist"
 )
 
 var _ blacklist.QueryServer = &blacklistQueryServer{}
diff --git a/x/florin/keeper/query_server_blacklist_test.go b/keeper/query_server_blacklist_test.go
similarity index 97%
rename from x/florin/keeper/query_server_blacklist_test.go
rename to keeper/query_server_blacklist_test.go
index 6eb04ced..4098c718 100644
--- a/x/florin/keeper/query_server_blacklist_test.go
+++ b/keeper/query_server_blacklist_test.go
@@ -19,10 +19,10 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/errors"
+	"github.com/monerium/module-noble/v2/keeper"
+	"github.com/monerium/module-noble/v2/types/blacklist"
 	"github.com/monerium/module-noble/v2/utils"
 	"github.com/monerium/module-noble/v2/utils/mocks"
-	"github.com/monerium/module-noble/v2/x/florin/keeper"
-	"github.com/monerium/module-noble/v2/x/florin/types/blacklist"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/x/florin/keeper/query_server_test.go b/keeper/query_server_test.go
similarity index 99%
rename from x/florin/keeper/query_server_test.go
rename to keeper/query_server_test.go
index 1118ee7a..40f7c8e5 100644
--- a/x/florin/keeper/query_server_test.go
+++ b/keeper/query_server_test.go
@@ -19,10 +19,10 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/errors"
+	"github.com/monerium/module-noble/v2/keeper"
+	"github.com/monerium/module-noble/v2/types"
 	"github.com/monerium/module-noble/v2/utils"
 	"github.com/monerium/module-noble/v2/utils/mocks"
-	"github.com/monerium/module-noble/v2/x/florin/keeper"
-	"github.com/monerium/module-noble/v2/x/florin/types"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/x/florin/keeper/state.go b/keeper/state.go
similarity index 99%
rename from x/florin/keeper/state.go
rename to keeper/state.go
index bb4b0c20..0ade96f2 100644
--- a/x/florin/keeper/state.go
+++ b/keeper/state.go
@@ -19,7 +19,7 @@ import (
 	"cosmossdk.io/store/prefix"
 	"github.com/cosmos/cosmos-sdk/runtime"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/monerium/module-noble/v2/x/florin/types"
+	"github.com/monerium/module-noble/v2/types"
 )
 
 //
diff --git a/x/florin/keeper/state_blacklist.go b/keeper/state_blacklist.go
similarity index 98%
rename from x/florin/keeper/state_blacklist.go
rename to keeper/state_blacklist.go
index 56de7225..7ef4d948 100644
--- a/x/florin/keeper/state_blacklist.go
+++ b/keeper/state_blacklist.go
@@ -18,7 +18,7 @@ import (
 	"cosmossdk.io/store/prefix"
 	"github.com/cosmos/cosmos-sdk/runtime"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/monerium/module-noble/v2/x/florin/types/blacklist"
+	"github.com/monerium/module-noble/v2/types/blacklist"
 )
 
 //
diff --git a/x/florin/keeper/state_test.go b/keeper/state_test.go
similarity index 96%
rename from x/florin/keeper/state_test.go
rename to keeper/state_test.go
index 96c2c452..710b9e68 100644
--- a/x/florin/keeper/state_test.go
+++ b/keeper/state_test.go
@@ -17,9 +17,9 @@ package keeper_test
 import (
 	"testing"
 
+	"github.com/monerium/module-noble/v2/types"
 	"github.com/monerium/module-noble/v2/utils"
 	"github.com/monerium/module-noble/v2/utils/mocks"
-	"github.com/monerium/module-noble/v2/x/florin/types"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/x/florin/module.go b/module.go
similarity index 95%
rename from x/florin/module.go
rename to module.go
index 6652b1b9..9371a606 100644
--- a/x/florin/module.go
+++ b/module.go
@@ -31,10 +31,10 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	modulev1 "github.com/monerium/module-noble/v2/api/module/v1"
-	"github.com/monerium/module-noble/v2/x/florin/client/cli"
-	"github.com/monerium/module-noble/v2/x/florin/keeper"
-	"github.com/monerium/module-noble/v2/x/florin/types"
-	"github.com/monerium/module-noble/v2/x/florin/types/blacklist"
+	"github.com/monerium/module-noble/v2/client/cli"
+	"github.com/monerium/module-noble/v2/keeper"
+	"github.com/monerium/module-noble/v2/types"
+	"github.com/monerium/module-noble/v2/types/blacklist"
 	"github.com/spf13/cobra"
 )
 
diff --git a/proto/florin/blacklist/v1/events.proto b/proto/florin/blacklist/v1/events.proto
index 8f68c82a..63a8bfbe 100644
--- a/proto/florin/blacklist/v1/events.proto
+++ b/proto/florin/blacklist/v1/events.proto
@@ -6,7 +6,7 @@ import "amino/amino.proto";
 import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/monerium/module-noble/v2/x/florin/types/blacklist";
+option go_package = "github.com/monerium/module-noble/v2/types/blacklist";
 
 // Emitted when a validator makes a decision.
 message Decision {
diff --git a/proto/florin/blacklist/v1/genesis.proto b/proto/florin/blacklist/v1/genesis.proto
index f76df2a7..e11a221e 100644
--- a/proto/florin/blacklist/v1/genesis.proto
+++ b/proto/florin/blacklist/v1/genesis.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package florin.blacklist.v1;
 
-option go_package = "github.com/monerium/module-noble/v2/x/florin/types/blacklist";
+option go_package = "github.com/monerium/module-noble/v2/types/blacklist";
 
 message GenesisState {
   string owner = 1;
diff --git a/proto/florin/blacklist/v1/query.proto b/proto/florin/blacklist/v1/query.proto
index 48ed6922..32c1749b 100644
--- a/proto/florin/blacklist/v1/query.proto
+++ b/proto/florin/blacklist/v1/query.proto
@@ -5,7 +5,7 @@ package florin.blacklist.v1;
 import "cosmos/query/v1/query.proto";
 import "google/api/annotations.proto";
 
-option go_package = "github.com/monerium/module-noble/v2/x/florin/types/blacklist";
+option go_package = "github.com/monerium/module-noble/v2/types/blacklist";
 
 service Query {
   rpc Owner(QueryOwner) returns (QueryOwnerResponse) {
diff --git a/proto/florin/blacklist/v1/tx.proto b/proto/florin/blacklist/v1/tx.proto
index 7b06078a..a85bffa0 100644
--- a/proto/florin/blacklist/v1/tx.proto
+++ b/proto/florin/blacklist/v1/tx.proto
@@ -7,7 +7,7 @@ import "cosmos/msg/v1/msg.proto";
 import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/monerium/module-noble/v2/x/florin/types/blacklist";
+option go_package = "github.com/monerium/module-noble/v2/types/blacklist";
 
 service Msg {
   option (cosmos.msg.v1.service) = true;
diff --git a/proto/florin/v1/events.proto b/proto/florin/v1/events.proto
index 367a82b7..e422632b 100644
--- a/proto/florin/v1/events.proto
+++ b/proto/florin/v1/events.proto
@@ -6,7 +6,7 @@ import "amino/amino.proto";
 import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/monerium/module-noble/v2/x/florin/types";
+option go_package = "github.com/monerium/module-noble/v2/types";
 
 // Emitted when a denom is allowed.
 message DenomAllowed {
diff --git a/proto/florin/v1/genesis.proto b/proto/florin/v1/genesis.proto
index d06645e0..923d14dd 100644
--- a/proto/florin/v1/genesis.proto
+++ b/proto/florin/v1/genesis.proto
@@ -7,7 +7,7 @@ import "cosmos_proto/cosmos.proto";
 import "florin/blacklist/v1/genesis.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/monerium/module-noble/v2/x/florin/types";
+option go_package = "github.com/monerium/module-noble/v2/types";
 
 message GenesisState {
   // blacklist_state is the genesis state of the blacklist submodule.
diff --git a/proto/florin/v1/query.proto b/proto/florin/v1/query.proto
index 9b552124..e9b0ed05 100644
--- a/proto/florin/v1/query.proto
+++ b/proto/florin/v1/query.proto
@@ -9,7 +9,7 @@ import "florin/v1/genesis.proto";
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 
-option go_package = "github.com/monerium/module-noble/v2/x/florin/types";
+option go_package = "github.com/monerium/module-noble/v2/types";
 
 service Query {
   rpc Authority(QueryAuthority) returns (QueryAuthorityResponse) {
diff --git a/proto/florin/v1/tx.proto b/proto/florin/v1/tx.proto
index 2205ff7b..4cfa9a7a 100644
--- a/proto/florin/v1/tx.proto
+++ b/proto/florin/v1/tx.proto
@@ -7,7 +7,7 @@ import "cosmos/msg/v1/msg.proto";
 import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/monerium/module-noble/v2/x/florin/types";
+option go_package = "github.com/monerium/module-noble/v2/types";
 
 service Msg {
   option (cosmos.msg.v1.service) = true;
diff --git a/simapp/app.go b/simapp/app.go
index 114bf527..fd44d336 100644
--- a/simapp/app.go
+++ b/simapp/app.go
@@ -24,7 +24,7 @@ import (
 	_ "github.com/cosmos/cosmos-sdk/x/bank"
 	_ "github.com/cosmos/cosmos-sdk/x/consensus"
 	_ "github.com/cosmos/cosmos-sdk/x/staking"
-	_ "github.com/monerium/module-noble/v2/x/florin"
+	_ "github.com/monerium/module-noble/v2"
 
 	// Cosmos Modules
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
@@ -34,7 +34,7 @@ import (
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	// Custom Modules
-	florinkeeper "github.com/monerium/module-noble/v2/x/florin/keeper"
+	florinkeeper "github.com/monerium/module-noble/v2/keeper"
 )
 
 var DefaultNodeHome string
diff --git a/x/florin/types/blacklist/codec.go b/types/blacklist/codec.go
similarity index 100%
rename from x/florin/types/blacklist/codec.go
rename to types/blacklist/codec.go
diff --git a/x/florin/types/blacklist/errors.go b/types/blacklist/errors.go
similarity index 100%
rename from x/florin/types/blacklist/errors.go
rename to types/blacklist/errors.go
diff --git a/x/florin/types/blacklist/events.pb.go b/types/blacklist/events.pb.go
similarity index 93%
rename from x/florin/types/blacklist/events.pb.go
rename to types/blacklist/events.pb.go
index 1aff86fe..60f915f0 100644
--- a/x/florin/types/blacklist/events.pb.go
+++ b/types/blacklist/events.pb.go
@@ -399,36 +399,35 @@ func init() {
 func init() { proto.RegisterFile("florin/blacklist/v1/events.proto", fileDescriptor_0d94ec933c59aa91) }
 
 var fileDescriptor_0d94ec933c59aa91 = []byte{
-	// 452 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0x4f, 0x6f, 0xd3, 0x4c,
-	0x10, 0xc6, 0xe3, 0xb4, 0xcd, 0x9b, 0xac, 0xf4, 0x56, 0xea, 0x36, 0x20, 0x53, 0x90, 0x13, 0x19,
-	0x21, 0x55, 0x48, 0xf1, 0x52, 0xb8, 0x72, 0x49, 0xc4, 0x81, 0x9e, 0x90, 0xc2, 0x9f, 0x43, 0x0f,
-	0x54, 0x6b, 0xef, 0x26, 0x59, 0xd5, 0x9e, 0x89, 0x76, 0xd7, 0x0e, 0xfd, 0x12, 0x88, 0x8f, 0xc1,
-	0x91, 0x03, 0x1f, 0xa2, 0xc7, 0x8a, 0x13, 0xe2, 0x50, 0xa1, 0xe4, 0xc0, 0xd7, 0x40, 0xf6, 0x6e,
-	0x29, 0x12, 0x12, 0x27, 0x2e, 0xd6, 0x3c, 0xcf, 0xfe, 0x9e, 0x99, 0x91, 0x35, 0x64, 0x38, 0xcb,
-	0x51, 0x2b, 0x60, 0x69, 0xce, 0xb3, 0xb3, 0x5c, 0x19, 0xcb, 0xaa, 0x23, 0x26, 0x2b, 0x09, 0xd6,
-	0x24, 0x4b, 0x8d, 0x16, 0xe9, 0xbe, 0x23, 0x92, 0x5f, 0x44, 0x52, 0x1d, 0x1d, 0xec, 0xf1, 0x42,
-	0x01, 0xb2, 0xe6, 0xeb, 0xb8, 0x83, 0x3b, 0x19, 0x9a, 0x02, 0xcd, 0x69, 0xa3, 0x98, 0x13, 0xfe,
-	0xa9, 0x3f, 0xc7, 0x39, 0x3a, 0xbf, 0xae, 0x9c, 0x1b, 0xbf, 0x0f, 0x48, 0xf7, 0x99, 0xcc, 0x94,
-	0x51, 0x08, 0x94, 0x92, 0xed, 0x99, 0xc6, 0x22, 0x0c, 0x86, 0xc1, 0x61, 0x6f, 0xda, 0xd4, 0x74,
-	0x97, 0xb4, 0x2d, 0x86, 0xed, 0xc6, 0x69, 0x5b, 0xa4, 0xcf, 0x49, 0x87, 0x17, 0x58, 0x82, 0x0d,
-	0xb7, 0x6a, 0x6f, 0xf2, 0xe8, 0xe2, 0x6a, 0xd0, 0xfa, 0x76, 0x35, 0xb8, 0xe5, 0x86, 0x19, 0x71,
-	0x96, 0x28, 0x64, 0x05, 0xb7, 0x8b, 0xe4, 0x18, 0xec, 0x97, 0xcf, 0x23, 0xe2, 0xb7, 0x38, 0x06,
-	0xfb, 0xf1, 0xc7, 0xa7, 0x87, 0xc1, 0xd4, 0xe7, 0x69, 0x9f, 0xec, 0x54, 0x3c, 0x57, 0x22, 0xdc,
-	0x1e, 0x06, 0x87, 0xdd, 0xa9, 0x13, 0xf1, 0x7d, 0xb2, 0x35, 0xe1, 0x40, 0xef, 0x91, 0x1e, 0x17,
-	0x95, 0xd4, 0x86, 0xeb, 0x73, 0xbf, 0xcf, 0x8d, 0x11, 0x0f, 0xc8, 0xce, 0x6b, 0x48, 0x39, 0xd0,
-	0xdb, 0xa4, 0x33, 0xd3, 0x4a, 0x82, 0xf0, 0x8c, 0x57, 0xf1, 0x88, 0xec, 0x8d, 0x45, 0xa1, 0x60,
-	0x9c, 0x65, 0xf5, 0xac, 0xb1, 0x10, 0x52, 0xd0, 0x90, 0xfc, 0xc7, 0x9d, 0xf6, 0xf4, 0xb5, 0x8c,
-	0x19, 0xd9, 0xff, 0x1d, 0x9f, 0xca, 0x02, 0xab, 0xbf, 0x06, 0xde, 0x92, 0xf0, 0xc5, 0x0a, 0xa4,
-	0x36, 0x0b, 0xb5, 0x7c, 0xa5, 0x39, 0x98, 0x99, 0xd4, 0x2f, 0x2d, 0xd7, 0x56, 0x0a, 0xfa, 0x80,
-	0xec, 0x2e, 0xb5, 0xac, 0x14, 0x96, 0xe6, 0x14, 0x6b, 0xc8, 0x87, 0xff, 0xbf, 0x76, 0x9b, 0x24,
-	0xbd, 0x4b, 0x7a, 0x20, 0x57, 0x9e, 0x70, 0xff, 0xb7, 0x0b, 0x72, 0xd5, 0x3c, 0xc6, 0x27, 0xa4,
-	0xff, 0x47, 0x7f, 0xfd, 0x6f, 0x7a, 0x4f, 0xde, 0x5c, 0xac, 0xa3, 0xe0, 0x72, 0x1d, 0x05, 0xdf,
-	0xd7, 0x51, 0xf0, 0x61, 0x13, 0xb5, 0x2e, 0x37, 0x51, 0xeb, 0xeb, 0x26, 0x6a, 0x9d, 0x3c, 0x9d,
-	0x2b, 0xbb, 0x28, 0xd3, 0x24, 0xc3, 0x82, 0x15, 0x08, 0x52, 0xab, 0xb2, 0x2e, 0x44, 0x99, 0xcb,
-	0x11, 0x60, 0x9a, 0x4b, 0x56, 0x3d, 0x66, 0xef, 0x98, 0xbf, 0x56, 0x7b, 0xbe, 0x94, 0xe6, 0xe6,
-	0x66, 0xd3, 0x4e, 0x73, 0x51, 0x4f, 0x7e, 0x06, 0x00, 0x00, 0xff, 0xff, 0x78, 0x63, 0x76, 0xe9,
-	0xce, 0x02, 0x00, 0x00,
+	// 445 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0xcf, 0x6a, 0x13, 0x51,
+	0x14, 0xc6, 0x33, 0x69, 0x1b, 0x93, 0x03, 0x16, 0x7a, 0x1b, 0x65, 0xac, 0x32, 0x09, 0x23, 0x42,
+	0x11, 0x32, 0xd7, 0xda, 0x27, 0x48, 0x70, 0x61, 0x17, 0x22, 0x44, 0xdd, 0x74, 0x61, 0xb9, 0x33,
+	0xf7, 0x26, 0xb9, 0x74, 0xe6, 0x9c, 0x70, 0xef, 0x9d, 0x09, 0x7d, 0x09, 0xf1, 0x31, 0x5c, 0xba,
+	0xf0, 0x21, 0xba, 0x2c, 0xae, 0xc4, 0x45, 0x91, 0x64, 0xe1, 0x6b, 0xc8, 0xfc, 0xa9, 0x15, 0x04,
+	0x57, 0x6e, 0x86, 0xf3, 0x7d, 0xf7, 0xf7, 0x9d, 0x73, 0x18, 0x0e, 0x0c, 0x67, 0x29, 0x19, 0x8d,
+	0x3c, 0x4e, 0x45, 0x72, 0x9e, 0x6a, 0xeb, 0x78, 0x71, 0xc4, 0x55, 0xa1, 0xd0, 0xd9, 0x68, 0x69,
+	0xc8, 0x11, 0xdb, 0xaf, 0x89, 0xe8, 0x37, 0x11, 0x15, 0x47, 0x07, 0x7b, 0x22, 0xd3, 0x48, 0xbc,
+	0xfa, 0xd6, 0xdc, 0xc1, 0x83, 0x84, 0x6c, 0x46, 0xf6, 0xac, 0x52, 0xbc, 0x16, 0xcd, 0x53, 0x7f,
+	0x4e, 0x73, 0xaa, 0xfd, 0xb2, 0xaa, 0xdd, 0xf0, 0x83, 0x07, 0xdd, 0x17, 0x2a, 0xd1, 0x56, 0x13,
+	0x32, 0x06, 0xdb, 0x33, 0x43, 0x99, 0xef, 0x0d, 0xbd, 0xc3, 0xde, 0xb4, 0xaa, 0xd9, 0x2e, 0xb4,
+	0x1d, 0xf9, 0xed, 0xca, 0x69, 0x3b, 0x62, 0x2f, 0xa1, 0x23, 0x32, 0xca, 0xd1, 0xf9, 0x5b, 0xa5,
+	0x37, 0x79, 0x76, 0x79, 0x3d, 0x68, 0x7d, 0xbf, 0x1e, 0xdc, 0xab, 0x87, 0x59, 0x79, 0x1e, 0x69,
+	0xe2, 0x99, 0x70, 0x8b, 0xe8, 0x04, 0xdd, 0xd7, 0x2f, 0x23, 0x68, 0xb6, 0x38, 0x41, 0xf7, 0xe9,
+	0xe7, 0xe7, 0xa7, 0xde, 0xb4, 0xc9, 0xb3, 0x3e, 0xec, 0x14, 0x22, 0xd5, 0xd2, 0xdf, 0x1e, 0x7a,
+	0x87, 0xdd, 0x69, 0x2d, 0xc2, 0xc7, 0xb0, 0x35, 0x11, 0xc8, 0x1e, 0x41, 0x4f, 0xc8, 0x42, 0x19,
+	0x2b, 0xcc, 0x45, 0xb3, 0xcf, 0xad, 0x11, 0x0e, 0x60, 0xe7, 0x1d, 0xc6, 0x02, 0xd9, 0x7d, 0xe8,
+	0xcc, 0x8c, 0x56, 0x28, 0x1b, 0xa6, 0x51, 0xe1, 0x08, 0xf6, 0xc6, 0x32, 0xd3, 0x38, 0x4e, 0x92,
+	0x72, 0xd6, 0x58, 0x4a, 0x25, 0x99, 0x0f, 0x77, 0x44, 0xad, 0x1b, 0xfa, 0x46, 0x86, 0x1c, 0xf6,
+	0xff, 0xc4, 0xa7, 0x2a, 0xa3, 0xe2, 0x9f, 0x81, 0xf7, 0xe0, 0xbf, 0x5e, 0xa1, 0x32, 0x76, 0xa1,
+	0x97, 0x6f, 0x8d, 0x40, 0x3b, 0x53, 0xe6, 0x8d, 0x13, 0xc6, 0x29, 0xc9, 0x9e, 0xc0, 0xee, 0xd2,
+	0xa8, 0x42, 0x53, 0x6e, 0xcf, 0xa8, 0x84, 0x9a, 0xf0, 0xdd, 0x1b, 0xb7, 0x4a, 0xb2, 0x87, 0xd0,
+	0x43, 0xb5, 0x6a, 0x88, 0xfa, 0xff, 0x76, 0x51, 0xad, 0xaa, 0xc7, 0xf0, 0x14, 0xfa, 0x7f, 0xf5,
+	0x37, 0xff, 0xa7, 0xf7, 0xe4, 0xd5, 0xe5, 0x3a, 0xf0, 0xae, 0xd6, 0x81, 0xf7, 0x63, 0x1d, 0x78,
+	0x1f, 0x37, 0x41, 0xeb, 0x6a, 0x13, 0xb4, 0xbe, 0x6d, 0x82, 0xd6, 0xe9, 0xf1, 0x5c, 0xbb, 0x45,
+	0x1e, 0x47, 0x09, 0x65, 0x3c, 0x23, 0x54, 0x46, 0xe7, 0x65, 0x21, 0xf3, 0x54, 0x8d, 0x90, 0xe2,
+	0x54, 0xf1, 0xe2, 0x39, 0x77, 0x17, 0x4b, 0x65, 0x6f, 0x4f, 0x35, 0xee, 0x54, 0x87, 0x74, 0xfc,
+	0x2b, 0x00, 0x00, 0xff, 0xff, 0xd4, 0x2a, 0x03, 0xab, 0xc5, 0x02, 0x00, 0x00,
 }
 
 func (m *Decision) Marshal() (dAtA []byte, err error) {
diff --git a/x/florin/types/blacklist/genesis.go b/types/blacklist/genesis.go
similarity index 100%
rename from x/florin/types/blacklist/genesis.go
rename to types/blacklist/genesis.go
diff --git a/x/florin/types/blacklist/genesis.pb.go b/types/blacklist/genesis.pb.go
similarity index 96%
rename from x/florin/types/blacklist/genesis.pb.go
rename to types/blacklist/genesis.pb.go
index e602fe97..b87f0992 100644
--- a/x/florin/types/blacklist/genesis.pb.go
+++ b/types/blacklist/genesis.pb.go
@@ -97,7 +97,7 @@ func init() {
 func init() { proto.RegisterFile("florin/blacklist/v1/genesis.proto", fileDescriptor_f721fa633e11416a) }
 
 var fileDescriptor_f721fa633e11416a = []byte{
-	// 241 bytes of a gzipped FileDescriptorProto
+	// 237 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4c, 0xcb, 0xc9, 0x2f,
 	0xca, 0xcc, 0xd3, 0x4f, 0xca, 0x49, 0x4c, 0xce, 0xce, 0xc9, 0x2c, 0x2e, 0xd1, 0x2f, 0x33, 0xd4,
 	0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x86,
@@ -107,13 +107,12 @@ var fileDescriptor_f721fa633e11416a = []byte{
 	0xd2, 0xe3, 0x21, 0xb2, 0x4c, 0x60, 0x59, 0x1e, 0xa8, 0xa0, 0x3f, 0x58, 0x91, 0x18, 0x17, 0x5b,
 	0x62, 0x4a, 0x6e, 0x66, 0x5e, 0xb1, 0x04, 0xb3, 0x02, 0xb3, 0x06, 0x67, 0x10, 0x94, 0x27, 0xa4,
 	0xc0, 0xc5, 0x9d, 0x98, 0x52, 0x96, 0x5a, 0x54, 0x9c, 0x58, 0x94, 0x99, 0x5a, 0x2c, 0xc1, 0x02,
-	0x96, 0x44, 0x16, 0x72, 0x0a, 0x3b, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f,
+	0x96, 0x44, 0x16, 0x72, 0xf2, 0x3d, 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,
-	0x9b, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0xdc, 0xfc, 0xbc, 0xd4,
+	0xe3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0xdc, 0xfc, 0xbc, 0xd4,
 	0xa2, 0xcc, 0x52, 0x10, 0x23, 0xa5, 0x34, 0x27, 0x55, 0x37, 0x2f, 0x3f, 0x29, 0x27, 0x55, 0xbf,
-	0xcc, 0x48, 0xbf, 0x42, 0x1f, 0xea, 0xfb, 0x92, 0xca, 0x82, 0xd4, 0x62, 0x44, 0x18, 0x24, 0xb1,
-	0x81, 0x7d, 0x6e, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x50, 0x5e, 0x13, 0x46, 0x1e, 0x01, 0x00,
-	0x00,
+	0xcc, 0x48, 0xbf, 0xa4, 0xb2, 0x20, 0xb5, 0x18, 0xe1, 0xf5, 0x24, 0x36, 0xb0, 0x87, 0x8d, 0x01,
+	0x01, 0x00, 0x00, 0xff, 0xff, 0xff, 0x83, 0x7e, 0x68, 0x15, 0x01, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
diff --git a/x/florin/types/blacklist/keys.go b/types/blacklist/keys.go
similarity index 100%
rename from x/florin/types/blacklist/keys.go
rename to types/blacklist/keys.go
diff --git a/x/florin/types/blacklist/query.pb.go b/types/blacklist/query.pb.go
similarity index 92%
rename from x/florin/types/blacklist/query.pb.go
rename to types/blacklist/query.pb.go
index 9966868c..3a97de86 100644
--- a/x/florin/types/blacklist/query.pb.go
+++ b/types/blacklist/query.pb.go
@@ -289,33 +289,33 @@ func init() {
 func init() { proto.RegisterFile("florin/blacklist/v1/query.proto", fileDescriptor_e01a1b9b84da2938) }
 
 var fileDescriptor_e01a1b9b84da2938 = []byte{
-	// 416 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0xee, 0xd2, 0x40,
-	0x10, 0xc6, 0xd9, 0x3f, 0x81, 0x84, 0x01, 0x12, 0xb3, 0x18, 0x43, 0x0a, 0x96, 0xa6, 0xc6, 0xd0,
-	0x98, 0xb4, 0x1b, 0xf0, 0xca, 0x45, 0x5f, 0x80, 0xc8, 0xc1, 0x83, 0x17, 0xd3, 0xc2, 0x5a, 0x37,
-	0xb6, 0xbb, 0xb5, 0xdb, 0x56, 0xf1, 0xe0, 0xc1, 0x93, 0x47, 0xa3, 0x17, 0x1f, 0xc3, 0xc7, 0xf0,
-	0x48, 0xe2, 0xc5, 0xa3, 0x01, 0x13, 0x5f, 0xc3, 0xd0, 0x2d, 0x2d, 0x21, 0x20, 0xde, 0x3a, 0xdf,
-	0xfc, 0x66, 0xbe, 0xc9, 0xd7, 0x85, 0xd1, 0x8b, 0x40, 0xc4, 0x8c, 0x13, 0x2f, 0x70, 0x97, 0xaf,
-	0x02, 0x26, 0x13, 0x92, 0x4d, 0xc8, 0xeb, 0x94, 0xc6, 0x6b, 0x27, 0x8a, 0x45, 0x22, 0x70, 0x4f,
-	0x01, 0x4e, 0x09, 0x38, 0xd9, 0x44, 0x1b, 0x2c, 0x85, 0x0c, 0x85, 0x54, 0xe0, 0xc9, 0x84, 0x36,
-	0xf4, 0x85, 0xf0, 0x03, 0x4a, 0xdc, 0x88, 0x11, 0x97, 0x73, 0x91, 0xb8, 0x09, 0x13, 0x5c, 0xaa,
-	0xae, 0xd9, 0x01, 0x78, 0xb2, 0x87, 0xe7, 0x6f, 0x38, 0x8d, 0xcd, 0x39, 0xe0, 0xaa, 0x5a, 0x50,
-	0x19, 0x09, 0x2e, 0x29, 0xbe, 0x0d, 0x0d, 0xb1, 0x17, 0xfa, 0xc8, 0x40, 0x56, 0x6b, 0xa1, 0x0a,
-	0x7c, 0x0f, 0xba, 0x11, 0xe5, 0x2b, 0xc6, 0xfd, 0xe7, 0xaa, 0x7b, 0x93, 0x77, 0x3b, 0x85, 0xa8,
-	0x16, 0x76, 0xa1, 0x9d, 0x2f, 0x7c, 0xb4, 0x0a, 0x19, 0x97, 0xa6, 0x0d, 0xbd, 0xa3, 0xb2, 0x34,
-	0xb8, 0x03, 0x4d, 0x37, 0x57, 0xfa, 0xc8, 0xa8, 0x5b, 0xad, 0x45, 0x51, 0x99, 0x18, 0x6e, 0x15,
-	0x78, 0x46, 0x63, 0xe9, 0xc6, 0x8c, 0x4a, 0x73, 0x06, 0xfd, 0x53, 0xad, 0xdc, 0x63, 0x40, 0xdb,
-	0xad, 0xe4, 0x62, 0xd9, 0xb1, 0x34, 0xfd, 0x5a, 0x87, 0x46, 0x3e, 0x8e, 0xdf, 0x41, 0x23, 0x3f,
-	0x11, 0x8f, 0x9c, 0x33, 0x91, 0x3a, 0x55, 0x0c, 0xda, 0xf8, 0x0a, 0x70, 0xb0, 0x37, 0xc7, 0x1f,
-	0xff, 0x7c, 0x7b, 0x80, 0x3e, 0xfc, 0xf8, 0xfd, 0xe5, 0x66, 0x88, 0x35, 0x72, 0xee, 0x57, 0xaa,
-	0xe8, 0xde, 0x43, 0x53, 0x25, 0x80, 0x8d, 0xcb, 0xbb, 0x15, 0xa1, 0x59, 0xd7, 0x88, 0xd2, 0xde,
-	0xaa, 0xec, 0xef, 0xe2, 0xc1, 0x59, 0x7b, 0x95, 0x2b, 0xfe, 0x8c, 0xa0, 0x7d, 0x94, 0x1f, 0xbe,
-	0xff, 0x2f, 0x8f, 0x12, 0xd3, 0xec, 0xff, 0xc2, 0xca, 0x7b, 0xec, 0xea, 0x1e, 0x13, 0x1b, 0x17,
-	0xee, 0x29, 0xc7, 0x1e, 0x3f, 0xfd, 0xbe, 0xd5, 0xd1, 0x66, 0xab, 0xa3, 0x5f, 0x5b, 0x1d, 0x7d,
-	0xda, 0xe9, 0xb5, 0xcd, 0x4e, 0xaf, 0xfd, 0xdc, 0xe9, 0xb5, 0x67, 0x33, 0x9f, 0x25, 0x2f, 0x53,
-	0xcf, 0x59, 0x8a, 0x90, 0x84, 0x82, 0xd3, 0x98, 0xa5, 0xfb, 0x8f, 0x55, 0x1a, 0x50, 0x9b, 0x0b,
-	0x2f, 0xa0, 0x24, 0x9b, 0x92, 0xb7, 0x07, 0x83, 0x64, 0x1d, 0x51, 0x59, 0xd9, 0x78, 0xcd, 0xfc,
-	0xa1, 0x3f, 0xfc, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xbb, 0xde, 0x77, 0xac, 0x5b, 0x03, 0x00, 0x00,
+	// 412 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x31, 0xef, 0xd2, 0x40,
+	0x18, 0xc6, 0x39, 0x08, 0x24, 0xbc, 0x40, 0x62, 0x0e, 0x63, 0x48, 0xc1, 0xd2, 0xd4, 0x18, 0x1a,
+	0x93, 0xf6, 0x02, 0xac, 0x2e, 0xba, 0x1b, 0x22, 0xa3, 0x8b, 0x69, 0xe1, 0xac, 0x17, 0xdb, 0xbb,
+	0xda, 0x6b, 0x6b, 0x70, 0x70, 0x70, 0x72, 0x34, 0xba, 0xf8, 0x31, 0xfc, 0x18, 0x8e, 0x24, 0x2e,
+	0x8e, 0x06, 0x4c, 0xfc, 0x1a, 0x86, 0x5e, 0x6d, 0x09, 0x81, 0x3f, 0xff, 0x8d, 0xf7, 0xb9, 0xdf,
+	0xfb, 0x3c, 0x6f, 0x1e, 0x0a, 0xe3, 0x57, 0x81, 0x88, 0x19, 0x27, 0x5e, 0xe0, 0xae, 0xde, 0x04,
+	0x4c, 0x26, 0x24, 0x9b, 0x92, 0xb7, 0x29, 0x8d, 0x37, 0x4e, 0x14, 0x8b, 0x44, 0xe0, 0xbe, 0x02,
+	0x9c, 0x12, 0x70, 0xb2, 0xa9, 0x36, 0x5c, 0x09, 0x19, 0x0a, 0xa9, 0xc0, 0x93, 0x0d, 0x6d, 0xe4,
+	0x0b, 0xe1, 0x07, 0x94, 0xb8, 0x11, 0x23, 0x2e, 0xe7, 0x22, 0x71, 0x13, 0x26, 0xb8, 0x54, 0xaf,
+	0x66, 0x17, 0xe0, 0xf9, 0x01, 0x5e, 0xbc, 0xe3, 0x34, 0x36, 0x17, 0x80, 0xab, 0x69, 0x49, 0x65,
+	0x24, 0xb8, 0xa4, 0xf8, 0x2e, 0x34, 0xc5, 0x41, 0x18, 0x20, 0x03, 0x59, 0xed, 0xa5, 0x1a, 0xf0,
+	0x03, 0xe8, 0x45, 0x94, 0xaf, 0x19, 0xf7, 0x5f, 0xaa, 0xd7, 0x7a, 0xfe, 0xda, 0x2d, 0x44, 0x65,
+	0xd8, 0x83, 0x4e, 0x6e, 0xf8, 0x64, 0x1d, 0x32, 0x2e, 0x4d, 0x1b, 0xfa, 0x47, 0x63, 0x19, 0x70,
+	0x0f, 0x5a, 0x6e, 0xae, 0x0c, 0x90, 0xd1, 0xb0, 0xda, 0xcb, 0x62, 0x32, 0x31, 0xdc, 0x29, 0xf0,
+	0x8c, 0xc6, 0xd2, 0x8d, 0x19, 0x95, 0xe6, 0x63, 0x18, 0x9c, 0x6a, 0xa5, 0x8f, 0x01, 0x1d, 0xb7,
+	0x92, 0x0b, 0xb3, 0x63, 0x69, 0xf6, 0xad, 0x01, 0xcd, 0x7c, 0x1d, 0xbf, 0x87, 0x66, 0x7e, 0x22,
+	0x1e, 0x3b, 0x67, 0x2a, 0x75, 0xaa, 0x1a, 0xb4, 0xc9, 0x15, 0xe0, 0x7f, 0xbc, 0x39, 0xf9, 0xf4,
+	0xf7, 0xfb, 0x23, 0xf4, 0xf1, 0xe7, 0x9f, 0xaf, 0xf5, 0x11, 0xd6, 0xc8, 0xb9, 0xbf, 0x52, 0x55,
+	0xf7, 0x01, 0x5a, 0xaa, 0x01, 0x6c, 0x5c, 0xf6, 0x56, 0x84, 0x66, 0x5d, 0x23, 0xca, 0x78, 0xab,
+	0x8a, 0xbf, 0x8f, 0x87, 0x67, 0xe3, 0x55, 0xaf, 0xf8, 0x0b, 0x82, 0xce, 0x51, 0x7f, 0xf8, 0xe1,
+	0x4d, 0x19, 0x25, 0xa6, 0xd9, 0xb7, 0xc2, 0xca, 0x7b, 0xec, 0xea, 0x1e, 0x13, 0x1b, 0x17, 0xee,
+	0x29, 0xd7, 0x9e, 0x3e, 0xfb, 0xb1, 0xd3, 0xd1, 0x76, 0xa7, 0xa3, 0xdf, 0x3b, 0x1d, 0x7d, 0xde,
+	0xeb, 0xb5, 0xed, 0x5e, 0xaf, 0xfd, 0xda, 0xeb, 0xb5, 0x17, 0x73, 0x9f, 0x25, 0xaf, 0x53, 0xcf,
+	0x59, 0x89, 0x90, 0x84, 0x82, 0xd3, 0x98, 0xa5, 0x87, 0x1f, 0xeb, 0x34, 0xa0, 0x36, 0x17, 0x5e,
+	0x40, 0x49, 0x36, 0x23, 0xc9, 0x26, 0xa2, 0xb2, 0x72, 0xf7, 0x5a, 0xf9, 0xf7, 0x3d, 0xff, 0x17,
+	0x00, 0x00, 0xff, 0xff, 0x9e, 0x90, 0x85, 0xb1, 0x52, 0x03, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/florin/types/blacklist/query.pb.gw.go b/types/blacklist/query.pb.gw.go
similarity index 100%
rename from x/florin/types/blacklist/query.pb.gw.go
rename to types/blacklist/query.pb.gw.go
diff --git a/x/florin/types/blacklist/tx.pb.go b/types/blacklist/tx.pb.go
similarity index 93%
rename from x/florin/types/blacklist/tx.pb.go
rename to types/blacklist/tx.pb.go
index 750a4f46..b79632ba 100644
--- a/x/florin/types/blacklist/tx.pb.go
+++ b/types/blacklist/tx.pb.go
@@ -504,47 +504,47 @@ func init() {
 func init() { proto.RegisterFile("florin/blacklist/v1/tx.proto", fileDescriptor_213e66f15459b69a) }
 
 var fileDescriptor_213e66f15459b69a = []byte{
-	// 639 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x95, 0x3d, 0x6f, 0xd3, 0x40,
-	0x18, 0xc7, 0x63, 0x4a, 0x43, 0x73, 0x03, 0xb4, 0x26, 0x40, 0x30, 0xa9, 0x53, 0xb9, 0x42, 0x40,
-	0x44, 0xed, 0x26, 0x88, 0x17, 0x19, 0x96, 0x64, 0x61, 0xb2, 0x90, 0xc2, 0xcb, 0xc0, 0x52, 0x39,
-	0xf6, 0xe5, 0x6a, 0x35, 0xbe, 0x0b, 0x77, 0x4e, 0xd2, 0x6e, 0x15, 0x13, 0x62, 0xe2, 0x13, 0xa0,
-	0x7c, 0x84, 0x48, 0x30, 0xc1, 0x17, 0x60, 0xac, 0x98, 0x18, 0x51, 0x32, 0x84, 0x8f, 0x81, 0xe2,
-	0xb7, 0xa8, 0xb9, 0x38, 0x09, 0x65, 0xe8, 0x12, 0xd9, 0xf7, 0xfc, 0x9f, 0xe7, 0xf9, 0xff, 0x94,
-	0xe7, 0x1e, 0x83, 0x7c, 0xa3, 0x49, 0xa8, 0x83, 0xb5, 0x7a, 0xd3, 0xb4, 0x0e, 0x9a, 0x0e, 0xf3,
-	0xb4, 0x4e, 0x49, 0xf3, 0x0e, 0xd5, 0x16, 0x25, 0x1e, 0x11, 0xaf, 0x06, 0x51, 0x35, 0x8e, 0xaa,
-	0x9d, 0x92, 0xb4, 0x61, 0xba, 0x0e, 0x26, 0x9a, 0xff, 0x1b, 0xe8, 0xa4, 0x1b, 0x16, 0x61, 0x2e,
-	0x61, 0x9a, 0xcb, 0xd0, 0x38, 0xdf, 0x65, 0x28, 0x0c, 0xdc, 0x0c, 0x02, 0x7b, 0xfe, 0x9b, 0x16,
-	0xbc, 0x84, 0xa1, 0x2c, 0x22, 0x88, 0x04, 0xe7, 0xe3, 0xa7, 0xe0, 0x54, 0x39, 0x16, 0x80, 0x68,
-	0x30, 0x54, 0xb1, 0x2c, 0xd8, 0xf2, 0x5e, 0x74, 0x31, 0xa4, 0x6c, 0xdf, 0x69, 0x89, 0xbb, 0x20,
-	0xcd, 0x1c, 0x84, 0x21, 0xcd, 0x09, 0x5b, 0xc2, 0xdd, 0x4c, 0x35, 0xf7, 0xf3, 0xeb, 0x4e, 0x36,
-	0x2c, 0x57, 0xb1, 0x6d, 0x0a, 0x19, 0x7b, 0xe9, 0x51, 0x07, 0xa3, 0x5a, 0xa8, 0xd3, 0x9f, 0x7c,
-	0xe8, 0x15, 0x52, 0x7f, 0x7a, 0x85, 0xd4, 0xfb, 0x51, 0xbf, 0x18, 0x1e, 0x7e, 0x1c, 0xf5, 0x8b,
-	0x5b, 0x1c, 0xf0, 0x54, 0x2f, 0x25, 0x0f, 0x24, 0xde, 0x41, 0x0d, 0xb2, 0x16, 0xc1, 0x0c, 0x2a,
-	0x5f, 0x42, 0x83, 0xb6, 0x5d, 0xb1, 0x5d, 0x07, 0x57, 0x2c, 0x8b, 0xb4, 0xb1, 0xf7, 0xef, 0x06,
-	0xc5, 0x32, 0xb8, 0x64, 0x06, 0xc9, 0xb9, 0x0b, 0x0b, 0x52, 0x22, 0xa1, 0xfe, 0x38, 0x01, 0xaa,
-	0xc0, 0x43, 0xd9, 0x76, 0x65, 0x62, 0x2f, 0x62, 0x3a, 0x6d, 0x3a, 0x66, 0xea, 0x09, 0x20, 0x6d,
-	0x30, 0x54, 0x35, 0xf1, 0x19, 0x38, 0x1e, 0x81, 0x8c, 0x69, 0x77, 0x20, 0x65, 0x26, 0x3d, 0x5a,
-	0x48, 0x32, 0x91, 0xea, 0xf7, 0x13, 0x58, 0xb2, 0x1c, 0x4b, 0xd5, 0xc4, 0xca, 0x3a, 0xb8, 0x1c,
-	0x38, 0x8c, 0x4d, 0x7f, 0x13, 0xc0, 0x35, 0x83, 0xa1, 0x1a, 0x74, 0x49, 0x07, 0x9e, 0xc3, 0x7f,
-	0xf1, 0x34, 0xc1, 0xff, 0x36, 0xe7, 0x9f, 0xb7, 0xa8, 0x14, 0xc0, 0xe6, 0x4c, 0xef, 0x31, 0xdd,
-	0x77, 0x01, 0x64, 0x0d, 0x86, 0x5e, 0x51, 0x13, 0xb3, 0x06, 0xa4, 0xff, 0x71, 0x13, 0xc4, 0x87,
-	0x20, 0x83, 0x61, 0x77, 0x8f, 0x8c, 0x4b, 0x2c, 0xc4, 0x5b, 0xc3, 0xb0, 0xeb, 0x37, 0xd3, 0xf5,
-	0x04, 0x3e, 0x85, 0xe3, 0xe3, 0x4c, 0x2a, 0x32, 0xc8, 0xcf, 0x32, 0x1f, 0xd3, 0x7d, 0x16, 0xc0,
-	0x9a, 0xc1, 0xd0, 0x6b, 0x5c, 0x3f, 0xd3, 0xc8, 0xed, 0x82, 0x74, 0x83, 0x3a, 0x10, 0xdb, 0x0b,
-	0x71, 0x42, 0x9d, 0xae, 0x26, 0xc0, 0x5c, 0xe7, 0x60, 0x7c, 0x4f, 0x8a, 0x08, 0xd6, 0x23, 0x7f,
-	0x91, 0xe9, 0xf2, 0xe8, 0x22, 0x58, 0x31, 0x18, 0x12, 0x0f, 0xc0, 0x95, 0xe9, 0xf5, 0x74, 0x47,
-	0x9d, 0xb1, 0x28, 0x55, 0x7e, 0x8b, 0x48, 0xda, 0x92, 0xc2, 0xa8, 0xa9, 0xdf, 0x6c, 0x6a, 0xd5,
-	0x24, 0x37, 0x3b, 0x2d, 0x9c, 0xd3, 0x6c, 0xf6, 0x1e, 0x10, 0x9f, 0x83, 0x95, 0xf1, 0x0e, 0xb8,
-	0x95, 0x94, 0x57, 0x35, 0xb1, 0xb4, 0x3d, 0x27, 0x18, 0x17, 0xf2, 0x80, 0x38, 0xe3, 0x5e, 0x16,
-	0x93, 0x52, 0x79, 0xad, 0x54, 0x5e, 0x5e, 0x1b, 0x77, 0x7d, 0x07, 0x36, 0xf8, 0xfb, 0x72, 0x2f,
-	0xa9, 0x10, 0x27, 0x95, 0x4a, 0x4b, 0x4b, 0xe3, 0x96, 0x06, 0x58, 0x0d, 0x86, 0x78, 0x33, 0x29,
-	0xd7, 0x0f, 0x4b, 0xb7, 0xe7, 0x86, 0xa3, 0x72, 0xd2, 0xea, 0xf1, 0xa8, 0x5f, 0x14, 0xaa, 0x6f,
-	0x7e, 0x0c, 0x64, 0xe1, 0x64, 0x20, 0x0b, 0xbf, 0x07, 0xb2, 0xf0, 0x69, 0x28, 0xa7, 0x4e, 0x86,
-	0x72, 0xea, 0xd7, 0x50, 0x4e, 0xbd, 0x7d, 0x86, 0x1c, 0x6f, 0xbf, 0x5d, 0x57, 0x2d, 0xe2, 0x6a,
-	0x2e, 0xc1, 0x90, 0x3a, 0xed, 0xf1, 0x83, 0xdd, 0x6e, 0xc2, 0x1d, 0x4c, 0xea, 0x4d, 0xa8, 0x75,
-	0xca, 0xda, 0xa1, 0x16, 0x4e, 0xb5, 0x77, 0xd4, 0x82, 0x6c, 0x32, 0xdb, 0xf5, 0xb4, 0xff, 0x8d,
-	0x7d, 0xf0, 0x37, 0x00, 0x00, 0xff, 0xff, 0xb2, 0x8a, 0x98, 0xda, 0xf5, 0x07, 0x00, 0x00,
+	// 635 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x95, 0x3f, 0x6f, 0xd3, 0x4e,
+	0x18, 0xc7, 0x73, 0xbf, 0xfe, 0x1a, 0xda, 0x1b, 0xa0, 0x35, 0x01, 0x8a, 0x49, 0x9d, 0xca, 0x15,
+	0x02, 0x22, 0x6a, 0x37, 0xa9, 0xf8, 0x23, 0x33, 0x25, 0x0b, 0x93, 0x85, 0x14, 0x60, 0x61, 0xa9,
+	0x1c, 0xfb, 0x72, 0xb5, 0x1a, 0xdf, 0x85, 0x3b, 0x27, 0xa1, 0x5b, 0xc5, 0x84, 0x98, 0x78, 0x05,
+	0x28, 0x2f, 0x21, 0x12, 0x4c, 0xf0, 0x06, 0x18, 0x2b, 0x26, 0x46, 0x94, 0x0c, 0xe1, 0x65, 0xa0,
+	0xf8, 0x5f, 0xd4, 0x5c, 0x9c, 0x84, 0x32, 0xb0, 0x44, 0x77, 0xf7, 0x7c, 0x9f, 0xe7, 0xf9, 0x7e,
+	0x94, 0xbb, 0xc7, 0x30, 0xdf, 0x68, 0x52, 0xe6, 0x12, 0xbd, 0xde, 0xb4, 0xec, 0xe3, 0xa6, 0xcb,
+	0x7d, 0xbd, 0x53, 0xd2, 0xfd, 0x37, 0x5a, 0x8b, 0x51, 0x9f, 0x4a, 0x57, 0xc3, 0xa8, 0x96, 0x44,
+	0xb5, 0x4e, 0x49, 0xde, 0xb4, 0x3c, 0x97, 0x50, 0x3d, 0xf8, 0x0d, 0x75, 0xf2, 0x0d, 0x9b, 0x72,
+	0x8f, 0x72, 0xdd, 0xe3, 0x78, 0x9c, 0xef, 0x71, 0x1c, 0x05, 0x6e, 0x86, 0x81, 0xc3, 0x60, 0xa7,
+	0x87, 0x9b, 0x28, 0x94, 0xc3, 0x14, 0xd3, 0xf0, 0x7c, 0xbc, 0x0a, 0x4f, 0xd5, 0x53, 0x00, 0x25,
+	0x93, 0xe3, 0x8a, 0x6d, 0xa3, 0x96, 0xff, 0xac, 0x4b, 0x10, 0xe3, 0x47, 0x6e, 0x4b, 0xda, 0x87,
+	0x59, 0xee, 0x62, 0x82, 0xd8, 0x16, 0xd8, 0x01, 0x77, 0xd7, 0xab, 0x5b, 0xdf, 0x3f, 0xef, 0xe5,
+	0xa2, 0x72, 0x15, 0xc7, 0x61, 0x88, 0xf3, 0xe7, 0x3e, 0x73, 0x09, 0xae, 0x45, 0x3a, 0xe3, 0xf1,
+	0xbb, 0x5e, 0x21, 0xf3, 0xab, 0x57, 0xc8, 0xbc, 0x1d, 0xf5, 0x8b, 0xd1, 0xe1, 0xfb, 0x51, 0xbf,
+	0xb8, 0x23, 0x00, 0x4f, 0xf5, 0x52, 0xf3, 0x50, 0x16, 0x1d, 0xd4, 0x10, 0x6f, 0x51, 0xc2, 0x91,
+	0xfa, 0x29, 0x32, 0xe8, 0x38, 0x15, 0xc7, 0x73, 0x49, 0xc5, 0xb6, 0x69, 0x9b, 0xf8, 0x7f, 0x6e,
+	0x50, 0x2a, 0xc3, 0x4b, 0x56, 0x98, 0xbc, 0xf5, 0xdf, 0x82, 0x94, 0x58, 0x68, 0x3c, 0x4a, 0x81,
+	0x2a, 0x88, 0x50, 0x8e, 0x53, 0x99, 0xd8, 0x8b, 0x99, 0xce, 0x9b, 0x4e, 0x98, 0x7a, 0x00, 0x66,
+	0x4d, 0x8e, 0xab, 0x16, 0xb9, 0x00, 0xc7, 0x43, 0xb8, 0x6e, 0x39, 0x1d, 0xc4, 0xb8, 0xc5, 0x4e,
+	0x16, 0x92, 0x4c, 0xa4, 0xc6, 0xfd, 0x14, 0x96, 0x9c, 0xc0, 0x52, 0xb5, 0x88, 0xba, 0x01, 0x2f,
+	0x87, 0x0e, 0x13, 0xd3, 0x5f, 0x00, 0xbc, 0x66, 0x72, 0x5c, 0x43, 0x1e, 0xed, 0xa0, 0x7f, 0xf0,
+	0x5f, 0x3c, 0x49, 0xf1, 0xbf, 0x2b, 0xf8, 0x17, 0x2d, 0xaa, 0x05, 0xb8, 0x3d, 0xd3, 0x7b, 0x42,
+	0xf7, 0x15, 0xc0, 0x9c, 0xc9, 0xf1, 0x0b, 0x66, 0x11, 0xde, 0x40, 0xec, 0x2f, 0x5e, 0x82, 0xf4,
+	0x00, 0xae, 0x13, 0xd4, 0x3d, 0xa4, 0xe3, 0x12, 0x0b, 0xf1, 0xd6, 0x08, 0xea, 0x06, 0xcd, 0x0c,
+	0x23, 0x85, 0x4f, 0x15, 0xf8, 0x04, 0x93, 0xaa, 0x02, 0xf3, 0xb3, 0xcc, 0x27, 0x74, 0x1f, 0x01,
+	0x5c, 0x33, 0x39, 0x7e, 0x49, 0xea, 0x17, 0xba, 0x72, 0xfb, 0x30, 0xdb, 0x60, 0x2e, 0x22, 0xce,
+	0x42, 0x9c, 0x48, 0x67, 0x68, 0x29, 0x30, 0xd7, 0x05, 0x98, 0xc0, 0x93, 0x2a, 0xc1, 0x8d, 0xd8,
+	0x5f, 0x6c, 0xba, 0x3c, 0xfa, 0x1f, 0xae, 0x98, 0x1c, 0x4b, 0xc7, 0xf0, 0xca, 0xf4, 0x78, 0xba,
+	0xa3, 0xcd, 0x18, 0x94, 0x9a, 0x38, 0x45, 0x64, 0x7d, 0x49, 0x61, 0xdc, 0x34, 0x68, 0x36, 0x35,
+	0x6a, 0xd2, 0x9b, 0x9d, 0x17, 0xce, 0x69, 0x36, 0x7b, 0x0e, 0x48, 0x4f, 0xe1, 0xca, 0x78, 0x06,
+	0xdc, 0x4a, 0xcb, 0xab, 0x5a, 0x44, 0xde, 0x9d, 0x13, 0x4c, 0x0a, 0xf9, 0x50, 0x9a, 0xf1, 0x2e,
+	0x8b, 0x69, 0xa9, 0xa2, 0x56, 0x2e, 0x2f, 0xaf, 0x4d, 0xba, 0xbe, 0x86, 0x9b, 0xe2, 0x7b, 0xb9,
+	0x97, 0x56, 0x48, 0x90, 0xca, 0xa5, 0xa5, 0xa5, 0x49, 0x4b, 0x13, 0xae, 0x86, 0x97, 0x78, 0x3b,
+	0x2d, 0x37, 0x08, 0xcb, 0xb7, 0xe7, 0x86, 0xe3, 0x72, 0xf2, 0xea, 0xe9, 0xa8, 0x5f, 0x04, 0x55,
+	0xf3, 0xdb, 0x40, 0x01, 0x67, 0x03, 0x05, 0xfc, 0x1c, 0x28, 0xe0, 0xc3, 0x50, 0xc9, 0x9c, 0x0d,
+	0x95, 0xcc, 0x8f, 0xa1, 0x92, 0x79, 0x75, 0x80, 0x5d, 0xff, 0xa8, 0x5d, 0xd7, 0x6c, 0xea, 0xe9,
+	0x1e, 0x25, 0x88, 0xb9, 0xed, 0xf1, 0xc2, 0x69, 0x37, 0xd1, 0x1e, 0xa1, 0xf5, 0x26, 0xd2, 0x3b,
+	0x65, 0xdd, 0x3f, 0x69, 0x21, 0x3e, 0xb9, 0xd2, 0xf5, 0x6c, 0xf0, 0x69, 0x3d, 0xf8, 0x1d, 0x00,
+	0x00, 0xff, 0xff, 0xf6, 0x37, 0x91, 0xab, 0xec, 0x07, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/florin/types/codec.go b/types/codec.go
similarity index 97%
rename from x/florin/types/codec.go
rename to types/codec.go
index b6707dbc..b9fb9653 100644
--- a/x/florin/types/codec.go
+++ b/types/codec.go
@@ -19,7 +19,7 @@ import (
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/msgservice"
-	"github.com/monerium/module-noble/v2/x/florin/types/blacklist"
+	"github.com/monerium/module-noble/v2/types/blacklist"
 )
 
 func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
diff --git a/x/florin/types/errors.go b/types/errors.go
similarity index 100%
rename from x/florin/types/errors.go
rename to types/errors.go
diff --git a/x/florin/types/events.pb.go b/types/events.pb.go
similarity index 96%
rename from x/florin/types/events.pb.go
rename to types/events.pb.go
index bd9f0e64..039c1348 100644
--- a/x/florin/types/events.pb.go
+++ b/types/events.pb.go
@@ -616,37 +616,37 @@ func init() {
 func init() { proto.RegisterFile("florin/v1/events.proto", fileDescriptor_a1ad0cea20c415b2) }
 
 var fileDescriptor_a1ad0cea20c415b2 = []byte{
-	// 470 bytes of a gzipped FileDescriptorProto
+	// 466 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0x41, 0x6b, 0xd4, 0x40,
-	0x14, 0xde, 0xac, 0xb5, 0xba, 0x0f, 0x5b, 0x6c, 0x5c, 0x65, 0xad, 0x90, 0x4a, 0x40, 0x10, 0xa1,
-	0x89, 0xad, 0x37, 0x6f, 0x5b, 0xab, 0x58, 0xb0, 0x08, 0xa9, 0x27, 0x2f, 0x25, 0x9b, 0xbc, 0xdd,
-	0x1d, 0xcc, 0xcc, 0x0b, 0x33, 0x93, 0x6c, 0xfb, 0x13, 0x3c, 0xe9, 0xcf, 0xf0, 0xe8, 0xc1, 0x1f,
+	0x14, 0xde, 0xac, 0xb5, 0xba, 0x0f, 0x5b, 0x6c, 0x5c, 0x65, 0xad, 0x90, 0x4a, 0x40, 0x50, 0xa1,
+	0x89, 0xd5, 0x9b, 0xb7, 0x6d, 0xab, 0xd8, 0x43, 0x11, 0x52, 0x4f, 0x5e, 0x4a, 0x36, 0x79, 0xbb,
+	0x3b, 0x98, 0x99, 0x17, 0x66, 0x26, 0x59, 0xfb, 0x13, 0x3c, 0xe9, 0xcf, 0xf0, 0xe8, 0xc1, 0x1f,
 	0xd1, 0x63, 0xf1, 0x24, 0x1e, 0x8a, 0xec, 0x1e, 0xfc, 0x1b, 0x92, 0x99, 0x14, 0x57, 0x24, 0x20,
-	0xbb, 0x78, 0x09, 0xef, 0xfb, 0x5e, 0xde, 0xf7, 0xbd, 0x19, 0x3e, 0x06, 0xee, 0x0c, 0x33, 0x92,
-	0x4c, 0x84, 0xe5, 0x4e, 0x88, 0x25, 0x0a, 0xad, 0x82, 0x5c, 0x92, 0x26, 0xb7, 0x63, 0xf9, 0xa0,
-	0xdc, 0xd9, 0xdc, 0x88, 0x39, 0x13, 0x14, 0x9a, 0xaf, 0xed, 0x6e, 0xde, 0x4d, 0x48, 0x71, 0x52,
-	0xc7, 0x06, 0x85, 0x16, 0xd4, 0xad, 0xee, 0x88, 0x46, 0x64, 0xf9, 0xaa, 0xb2, 0xac, 0xff, 0x14,
-	0x6e, 0xec, 0xa3, 0x20, 0xde, 0xcf, 0x32, 0x9a, 0x60, 0xea, 0x76, 0xe1, 0x6a, 0x5a, 0xe1, 0x9e,
-	0x73, 0xdf, 0x79, 0xd8, 0x89, 0x2c, 0xa8, 0x58, 0x9a, 0x08, 0x94, 0xbd, 0xb6, 0x65, 0x0d, 0xf0,
-	0xdf, 0x3b, 0xb0, 0x76, 0xc8, 0x84, 0x36, 0xb3, 0xb1, 0x48, 0xb0, 0x61, 0xba, 0x07, 0xd7, 0xe2,
-	0x24, 0xa1, 0x42, 0xe8, 0x7a, 0xfe, 0x12, 0xba, 0x2f, 0x61, 0x35, 0xe6, 0xa6, 0x71, 0xa5, 0x6a,
-	0xec, 0x3d, 0x3e, 0xbb, 0xd8, 0x6a, 0x7d, 0xbf, 0xd8, 0xba, 0x6d, 0x37, 0x57, 0xe9, 0xbb, 0x80,
-	0x51, 0xc8, 0x63, 0x3d, 0x0e, 0x0e, 0x84, 0xfe, 0xfa, 0x65, 0x1b, 0xea, 0x23, 0x1d, 0x08, 0xfd,
-	0xe9, 0xe7, 0xe7, 0x47, 0x4e, 0x54, 0xcf, 0xfb, 0x12, 0x6e, 0x1e, 0xc6, 0x27, 0xff, 0xb2, 0xcd,
-	0x6f, 0xcf, 0xf6, 0x92, 0x9e, 0xfb, 0xe0, 0x1e, 0x9d, 0x2a, 0x8d, 0xbc, 0x6f, 0x8f, 0xd3, 0x4f,
-	0xd3, 0xc6, 0x1b, 0x6c, 0xbc, 0x03, 0xff, 0x05, 0x74, 0xff, 0x50, 0x89, 0x90, 0x53, 0xb9, 0x80,
-	0xce, 0x33, 0xd8, 0xe8, 0xa7, 0x9c, 0x89, 0xa5, 0x96, 0x79, 0x0e, 0xb7, 0xe6, 0x45, 0x16, 0xdd,
-	0x45, 0x43, 0xef, 0x75, 0x15, 0x11, 0x35, 0x66, 0xf9, 0x1b, 0x19, 0x0b, 0x35, 0x44, 0x79, 0xa4,
-	0x63, 0xa9, 0x1b, 0xb5, 0x1e, 0xc0, 0x7a, 0x2e, 0xb1, 0x64, 0x54, 0xa8, 0xe3, 0xf9, 0xa8, 0xad,
-	0x5d, 0xb2, 0x46, 0xcf, 0xbd, 0x07, 0x1d, 0x81, 0x93, 0xfa, 0x0f, 0x93, 0x99, 0xe8, 0xba, 0xc0,
-	0x89, 0x69, 0xfa, 0x39, 0x74, 0xff, 0x72, 0x95, 0xff, 0xd5, 0xf1, 0x83, 0x03, 0x9d, 0x08, 0x13,
+	0xbb, 0xf4, 0x12, 0xde, 0xf7, 0xbd, 0xbc, 0xef, 0x7b, 0x33, 0x7c, 0x0c, 0xdc, 0x19, 0x66, 0x24,
+	0x99, 0x08, 0xcb, 0x9d, 0x10, 0x4b, 0x14, 0x5a, 0x05, 0xb9, 0x24, 0x4d, 0x6e, 0xc7, 0xf2, 0x41,
+	0xb9, 0xb3, 0xb9, 0x11, 0x73, 0x26, 0x28, 0x34, 0x5f, 0xdb, 0xdd, 0xbc, 0x9b, 0x90, 0xe2, 0xa4,
+	0x8e, 0x0d, 0x0a, 0x2d, 0xa8, 0x5b, 0xdd, 0x11, 0x8d, 0xc8, 0xf2, 0x55, 0x65, 0x59, 0xff, 0x39,
+	0xdc, 0xd8, 0x47, 0x41, 0xbc, 0x9f, 0x65, 0x34, 0xc1, 0xd4, 0xed, 0xc2, 0xd5, 0xb4, 0xc2, 0x3d,
+	0xe7, 0xbe, 0xf3, 0xb0, 0x13, 0x59, 0x50, 0xb1, 0x34, 0x11, 0x28, 0x7b, 0x6d, 0xcb, 0x1a, 0xe0,
+	0x7f, 0x70, 0x60, 0xed, 0x90, 0x09, 0x6d, 0x66, 0x63, 0x91, 0x60, 0xc3, 0x74, 0x0f, 0xae, 0xc5,
+	0x49, 0x42, 0x85, 0xd0, 0xf5, 0xfc, 0x05, 0x74, 0x5f, 0xc1, 0x6a, 0xcc, 0x4d, 0xe3, 0x4a, 0xd5,
+	0xd8, 0x7d, 0x72, 0x7a, 0xbe, 0xd5, 0xfa, 0x71, 0xbe, 0x75, 0xdb, 0x6e, 0xae, 0xd2, 0x77, 0x01,
+	0xa3, 0x90, 0xc7, 0x7a, 0x1c, 0x1c, 0x08, 0xfd, 0xed, 0xeb, 0x36, 0xd4, 0x47, 0x3a, 0x10, 0xfa,
+	0xf3, 0xaf, 0x2f, 0x8f, 0x9d, 0xa8, 0x9e, 0xf7, 0x25, 0xdc, 0x3c, 0x8c, 0xdf, 0xff, 0xcf, 0x36,
+	0x7f, 0x3c, 0xdb, 0x4b, 0x7a, 0xee, 0x83, 0x7b, 0x74, 0xa2, 0x34, 0xf2, 0xbe, 0x3d, 0x4e, 0x3f,
+	0x4d, 0x1b, 0x6f, 0xb0, 0xf1, 0x0e, 0xfc, 0x97, 0xd0, 0xfd, 0x4b, 0x25, 0x42, 0x4e, 0xe5, 0x02,
+	0x3a, 0x7b, 0xb0, 0xd1, 0x4f, 0x39, 0x13, 0x4b, 0x2d, 0xf3, 0x02, 0x6e, 0xcd, 0x8b, 0x2c, 0xba,
+	0x8b, 0x86, 0xde, 0xeb, 0x2a, 0x22, 0x6a, 0xcc, 0xf2, 0x37, 0x32, 0x16, 0x6a, 0x88, 0xf2, 0x48,
+	0xc7, 0x52, 0x37, 0x6a, 0x3d, 0x80, 0xf5, 0x5c, 0x62, 0xc9, 0xa8, 0x50, 0xc7, 0xf3, 0x51, 0x5b,
+	0xbb, 0x60, 0x8d, 0x9e, 0x7b, 0x0f, 0x3a, 0x02, 0x27, 0xf5, 0x1f, 0x26, 0x33, 0xd1, 0x75, 0x81,
+	0x13, 0xd3, 0xf4, 0x73, 0xe8, 0xfe, 0xe3, 0x2a, 0x2f, 0xd5, 0xf1, 0xa3, 0x03, 0x9d, 0x08, 0x13,
 	0x2a, 0xb1, 0xd9, 0xc7, 0x85, 0x95, 0xa1, 0x24, 0x5e, 0xab, 0x9b, 0xda, 0x5d, 0x87, 0xb6, 0xa6,
-	0x5a, 0xad, 0xad, 0x69, 0x2e, 0x93, 0x2b, 0xcb, 0x65, 0x72, 0xef, 0xd5, 0xd9, 0xd4, 0x73, 0xce,
-	0xa7, 0x9e, 0xf3, 0x63, 0xea, 0x39, 0x1f, 0x67, 0x5e, 0xeb, 0x7c, 0xe6, 0xb5, 0xbe, 0xcd, 0xbc,
-	0xd6, 0xdb, 0xdd, 0x11, 0xd3, 0xe3, 0x62, 0x10, 0x24, 0xc4, 0x43, 0x4e, 0x02, 0x25, 0x2b, 0xaa,
-	0x22, 0x2d, 0x32, 0xdc, 0x16, 0x34, 0xc8, 0x30, 0x2c, 0x77, 0xc3, 0x93, 0xb0, 0x7e, 0x76, 0xf4,
-	0x69, 0x8e, 0x6a, 0xb0, 0x6a, 0x1e, 0x89, 0x27, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x4f, 0xe3,
-	0xe4, 0x3d, 0x8d, 0x04, 0x00, 0x00,
+	0x5a, 0xad, 0xad, 0x69, 0x2e, 0x93, 0x2b, 0xcb, 0x65, 0x72, 0x77, 0xef, 0x74, 0xea, 0x39, 0x67,
+	0x53, 0xcf, 0xf9, 0x39, 0xf5, 0x9c, 0x4f, 0x33, 0xaf, 0x75, 0x36, 0xf3, 0x5a, 0xdf, 0x67, 0x5e,
+	0xeb, 0xed, 0xa3, 0x11, 0xd3, 0xe3, 0x62, 0x10, 0x24, 0xc4, 0x43, 0x4e, 0x02, 0x25, 0x2b, 0xaa,
+	0x22, 0x2d, 0x32, 0xdc, 0x16, 0x34, 0xc8, 0x30, 0x2c, 0x9f, 0x86, 0xfa, 0x24, 0x47, 0x35, 0x58,
+	0x35, 0x6f, 0xc3, 0xb3, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x52, 0xda, 0x3c, 0x92, 0x84, 0x04,
+	0x00, 0x00,
 }
 
 func (m *DenomAllowed) Marshal() (dAtA []byte, err error) {
diff --git a/x/florin/types/expected_keepers.go b/types/expected_keepers.go
similarity index 100%
rename from x/florin/types/expected_keepers.go
rename to types/expected_keepers.go
diff --git a/x/florin/types/genesis.go b/types/genesis.go
similarity index 98%
rename from x/florin/types/genesis.go
rename to types/genesis.go
index 3d799743..2d67d3da 100644
--- a/x/florin/types/genesis.go
+++ b/types/genesis.go
@@ -20,7 +20,7 @@ import (
 
 	"cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/monerium/module-noble/v2/x/florin/types/blacklist"
+	"github.com/monerium/module-noble/v2/types/blacklist"
 )
 
 func DefaultGenesisState() *GenesisState {
diff --git a/x/florin/types/genesis.pb.go b/types/genesis.pb.go
similarity index 91%
rename from x/florin/types/genesis.pb.go
rename to types/genesis.pb.go
index 5bd12a20..fdf9166c 100644
--- a/x/florin/types/genesis.pb.go
+++ b/types/genesis.pb.go
@@ -10,7 +10,7 @@ import (
 	_ "github.com/cosmos/cosmos-sdk/types/tx/amino"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
-	blacklist "github.com/monerium/module-noble/v2/x/florin/types/blacklist"
+	blacklist "github.com/monerium/module-noble/v2/types/blacklist"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -263,44 +263,44 @@ func init() {
 func init() { proto.RegisterFile("florin/v1/genesis.proto", fileDescriptor_db6733df958f1e20) }
 
 var fileDescriptor_db6733df958f1e20 = []byte{
-	// 591 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x31, 0x6f, 0xd3, 0x40,
-	0x14, 0xc7, 0xe3, 0xa6, 0x4d, 0xf0, 0x85, 0xa6, 0xf4, 0x08, 0x60, 0x32, 0xb8, 0x69, 0x10, 0x52,
-	0x54, 0xa9, 0x76, 0x13, 0x16, 0x0a, 0x0b, 0x94, 0x22, 0x54, 0x89, 0x42, 0x31, 0x1b, 0x03, 0xd6,
-	0xc5, 0x3e, 0x12, 0x2b, 0xf6, 0x5d, 0xe4, 0x3b, 0xa7, 0xc9, 0x27, 0x60, 0x60, 0xe1, 0x63, 0x30,
-	0x32, 0xf0, 0x21, 0x3a, 0x56, 0x4c, 0x88, 0xa1, 0x42, 0xc9, 0xc0, 0xd7, 0x40, 0xbe, 0xbb, 0x18,
-	0xb7, 0xa5, 0x42, 0x59, 0xa2, 0x7b, 0xff, 0xf7, 0xfe, 0xbf, 0x9c, 0xde, 0xbd, 0x67, 0x70, 0xe7,
-	0x43, 0x48, 0xe3, 0x80, 0xd8, 0xa3, 0xb6, 0xdd, 0xc3, 0x04, 0xb3, 0x80, 0x59, 0xc3, 0x98, 0x72,
-	0x0a, 0x75, 0x99, 0xb0, 0x46, 0xed, 0xfa, 0x3a, 0x8a, 0x02, 0x42, 0x6d, 0xf1, 0x2b, 0xb3, 0xf5,
-	0xbb, 0x1e, 0x65, 0x11, 0x65, 0xae, 0x88, 0x6c, 0x19, 0xa8, 0xd4, 0xa6, 0x22, 0x76, 0x43, 0xe4,
-	0x0d, 0xc2, 0x80, 0xf1, 0x4b, 0xec, 0x7a, 0xad, 0x47, 0x7b, 0x54, 0x5a, 0xd3, 0x93, 0x54, 0x9b,
-	0x1f, 0x4b, 0xe0, 0xfa, 0x0b, 0x59, 0xf7, 0x96, 0x23, 0x8e, 0xe1, 0x11, 0x58, 0xcb, 0x20, 0x2e,
-	0x4b, 0x25, 0x43, 0x6b, 0x68, 0xad, 0x4a, 0x67, 0xd3, 0x52, 0x97, 0xcb, 0xd2, 0xd6, 0xa8, 0x6d,
-	0xe5, 0xbd, 0x7b, 0xcb, 0x27, 0x67, 0x1b, 0x05, 0xa7, 0x9a, 0x15, 0x48, 0x62, 0x03, 0xe8, 0x28,
-	0xe1, 0x7d, 0x1a, 0x07, 0x7c, 0x62, 0x2c, 0x35, 0xb4, 0x96, 0xbe, 0xb7, 0x64, 0x68, 0xce, 0x5f,
-	0x11, 0xde, 0x07, 0x55, 0x14, 0x86, 0xf4, 0x18, 0xfb, 0xae, 0x8f, 0x09, 0x8d, 0x98, 0x51, 0x6c,
-	0x14, 0x5b, 0xba, 0xb3, 0xaa, 0xd4, 0x7d, 0x21, 0xc2, 0xc7, 0xa0, 0x44, 0x8f, 0x09, 0x8e, 0x99,
-	0xb1, 0xdc, 0x28, 0xb6, 0x2a, 0x9d, 0x7b, 0x56, 0xd6, 0xae, 0x73, 0xf7, 0xb0, 0x5e, 0x8b, 0xaa,
-	0xe7, 0x84, 0xc7, 0x13, 0x47, 0x59, 0xe0, 0x1b, 0x50, 0x1d, 0x62, 0xe2, 0x07, 0xa4, 0xe7, 0x2a,
-	0xc8, 0x8a, 0x80, 0x6c, 0x5d, 0x05, 0x39, 0x92, 0xd5, 0x79, 0xd6, 0xea, 0x30, 0xaf, 0xc1, 0x0e,
-	0x28, 0xb3, 0x09, 0xe3, 0x38, 0x62, 0x46, 0x49, 0xb0, 0x60, 0x8e, 0xf5, 0xd4, 0xf3, 0x68, 0x42,
-	0xb8, 0xea, 0xc9, 0xbc, 0x10, 0xee, 0x80, 0x12, 0xf2, 0xa3, 0x80, 0x30, 0xa3, 0xfc, 0x1f, 0x8b,
-	0xaa, 0x83, 0xcf, 0xc0, 0x5a, 0x14, 0x10, 0xee, 0x8a, 0x5e, 0x20, 0xe2, 0x61, 0x66, 0x5c, 0x13,
-	0xd6, 0x5a, 0xde, 0x3a, 0x4f, 0xce, 0xdf, 0x20, 0xb5, 0x64, 0x22, 0x83, 0xef, 0xc1, 0xcd, 0x08,
-	0x8d, 0xdd, 0x8b, 0x20, 0x5d, 0x80, 0xac, 0xab, 0x5a, 0x70, 0x88, 0xc6, 0x87, 0xe7, 0x38, 0xb2,
-	0x0d, 0xeb, 0xd1, 0x45, 0xbd, 0xbe, 0x0b, 0x2a, 0xb9, 0x46, 0xc1, 0x1b, 0xa0, 0x38, 0xc0, 0x13,
-	0x31, 0x38, 0xba, 0x93, 0x1e, 0x61, 0x0d, 0xac, 0x8c, 0x50, 0x98, 0x60, 0x39, 0x00, 0x8e, 0x0c,
-	0x1e, 0x2d, 0x3d, 0xd4, 0xea, 0x4f, 0x00, 0xbc, 0xdc, 0xea, 0x85, 0x08, 0xfb, 0xe0, 0xf6, 0xbf,
-	0x6f, 0xba, 0x08, 0xa5, 0xb9, 0x0b, 0xca, 0xea, 0x01, 0xd2, 0x22, 0x31, 0x87, 0xca, 0x28, 0x03,
-	0x68, 0x80, 0x32, 0xf2, 0xfd, 0x18, 0x33, 0xa6, 0xcc, 0xf3, 0xb0, 0xf9, 0x49, 0x03, 0x7a, 0xf6,
-	0xd7, 0x8b, 0xba, 0xe1, 0x2b, 0xa0, 0x67, 0x4f, 0x62, 0x14, 0xc5, 0x7e, 0xec, 0xa4, 0x8f, 0xf8,
-	0xf3, 0x6c, 0xe3, 0x96, 0x5c, 0x72, 0xe6, 0x0f, 0xac, 0x80, 0xda, 0x11, 0xe2, 0x7d, 0xeb, 0x80,
-	0xf0, 0xef, 0xdf, 0xb6, 0x81, 0xda, 0xfe, 0x03, 0xc2, 0xbf, 0xfc, 0xfe, 0xba, 0x95, 0x6e, 0x53,
-	0x36, 0x01, 0x2f, 0x4f, 0xa6, 0xa6, 0x76, 0x3a, 0x35, 0xb5, 0x5f, 0x53, 0x53, 0xfb, 0x3c, 0x33,
-	0x0b, 0xa7, 0x33, 0xb3, 0xf0, 0x63, 0x66, 0x16, 0xde, 0x75, 0x7a, 0x01, 0xef, 0x27, 0x5d, 0xcb,
-	0xa3, 0x91, 0x1d, 0x51, 0x82, 0xe3, 0x20, 0x49, 0x0f, 0x7e, 0x12, 0xe2, 0x6d, 0x42, 0xbb, 0x21,
-	0xb6, 0x47, 0x1d, 0x7b, 0x6c, 0xab, 0x6f, 0x09, 0x9f, 0x0c, 0x31, 0xeb, 0x96, 0xc4, 0x77, 0xe2,
-	0xc1, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x89, 0x3f, 0x75, 0x9d, 0xb4, 0x04, 0x00, 0x00,
+	// 588 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xc1, 0x6e, 0xd3, 0x4c,
+	0x10, 0xc7, 0xe3, 0xa4, 0x4d, 0x3e, 0x6f, 0xbe, 0xa6, 0x74, 0x09, 0x60, 0x72, 0x70, 0xd3, 0x20,
+	0xa4, 0x50, 0xa9, 0x76, 0x13, 0x2e, 0x14, 0x2e, 0xd0, 0x16, 0xa1, 0x1e, 0x0a, 0xc5, 0xdc, 0x38,
+	0x60, 0x6d, 0xec, 0x25, 0xb1, 0x62, 0xef, 0x46, 0xde, 0x75, 0xda, 0x3c, 0x01, 0x07, 0x2e, 0x3c,
+	0x06, 0x47, 0x0e, 0x3c, 0x44, 0x8f, 0x15, 0x27, 0xc4, 0xa1, 0x42, 0xc9, 0x81, 0xd7, 0x40, 0xde,
+	0xdd, 0x18, 0xb7, 0xa5, 0x42, 0xb9, 0x44, 0x3b, 0xff, 0x99, 0xff, 0x2f, 0xab, 0xd9, 0x19, 0x83,
+	0x3b, 0xef, 0x43, 0x1a, 0x07, 0xc4, 0x1e, 0x77, 0xec, 0x3e, 0x26, 0x98, 0x05, 0xcc, 0x1a, 0xc5,
+	0x94, 0x53, 0xa8, 0xcb, 0x84, 0x35, 0xee, 0x34, 0xd6, 0x50, 0x14, 0x10, 0x6a, 0x8b, 0x5f, 0x99,
+	0x6d, 0xdc, 0xf5, 0x28, 0x8b, 0x28, 0x73, 0x45, 0x64, 0xcb, 0x40, 0xa5, 0x36, 0x14, 0xb1, 0x17,
+	0x22, 0x6f, 0x18, 0x06, 0x8c, 0x5f, 0x61, 0x37, 0xea, 0x7d, 0xda, 0xa7, 0xd2, 0x9a, 0x9e, 0xa4,
+	0xda, 0xfa, 0x50, 0x06, 0xff, 0xbf, 0x90, 0x75, 0x6f, 0x38, 0xe2, 0x18, 0x1e, 0x81, 0xd5, 0x0c,
+	0xe2, 0xb2, 0x54, 0x32, 0xb4, 0xa6, 0xd6, 0xae, 0x76, 0x37, 0x2c, 0x75, 0xb9, 0x2c, 0x6d, 0x8d,
+	0x3b, 0x56, 0xde, 0xbb, 0xbb, 0x74, 0x7a, 0xbe, 0x5e, 0x70, 0x6a, 0x59, 0x81, 0x24, 0x36, 0x81,
+	0x8e, 0x12, 0x3e, 0xa0, 0x71, 0xc0, 0x27, 0x46, 0xb1, 0xa9, 0xb5, 0xf5, 0xdd, 0xa2, 0xa1, 0x39,
+	0x7f, 0x44, 0x78, 0x1f, 0xd4, 0x50, 0x18, 0xd2, 0x63, 0xec, 0xbb, 0x3e, 0x26, 0x34, 0x62, 0x46,
+	0xa9, 0x59, 0x6a, 0xeb, 0xce, 0x8a, 0x52, 0xf7, 0x85, 0x08, 0x9f, 0x80, 0x32, 0x3d, 0x26, 0x38,
+	0x66, 0xc6, 0x52, 0xb3, 0xd4, 0xae, 0x76, 0xef, 0x59, 0x59, 0xbb, 0x2e, 0xdc, 0xc3, 0x7a, 0x25,
+	0xaa, 0x9e, 0x13, 0x1e, 0x4f, 0x1c, 0x65, 0x81, 0xaf, 0x41, 0x6d, 0x84, 0x89, 0x1f, 0x90, 0xbe,
+	0xab, 0x20, 0xcb, 0x02, 0xb2, 0x79, 0x1d, 0xe4, 0x48, 0x56, 0xe7, 0x59, 0x2b, 0xa3, 0xbc, 0x06,
+	0xbb, 0xa0, 0xc2, 0x26, 0x8c, 0xe3, 0x88, 0x19, 0x65, 0xc1, 0x82, 0x39, 0xd6, 0x33, 0xcf, 0xa3,
+	0x09, 0xe1, 0xaa, 0x27, 0xf3, 0x42, 0xb8, 0x0d, 0xca, 0xc8, 0x8f, 0x02, 0xc2, 0x8c, 0xca, 0x3f,
+	0x2c, 0xaa, 0x0e, 0xee, 0x81, 0xd5, 0x28, 0x20, 0xdc, 0x15, 0xbd, 0x40, 0xc4, 0xc3, 0xcc, 0xf8,
+	0x4f, 0x58, 0xeb, 0x79, 0xeb, 0x3c, 0x39, 0x7f, 0x83, 0xd4, 0x92, 0x89, 0x0c, 0xbe, 0x03, 0x37,
+	0x23, 0x74, 0xe2, 0x5e, 0x06, 0xe9, 0x02, 0x64, 0x5d, 0xd7, 0x82, 0x43, 0x74, 0x72, 0x78, 0x81,
+	0x23, 0xdb, 0xb0, 0x16, 0x5d, 0xd6, 0x1b, 0x3b, 0xa0, 0x9a, 0x6b, 0x14, 0xbc, 0x01, 0x4a, 0x43,
+	0x3c, 0x11, 0x83, 0xa3, 0x3b, 0xe9, 0x11, 0xd6, 0xc1, 0xf2, 0x18, 0x85, 0x09, 0x96, 0x03, 0xe0,
+	0xc8, 0xe0, 0x71, 0xf1, 0x91, 0xd6, 0x78, 0x0a, 0xe0, 0xd5, 0x56, 0x2f, 0x44, 0xd8, 0x07, 0xb7,
+	0xff, 0x7e, 0xd3, 0x45, 0x28, 0xad, 0x1d, 0x50, 0x51, 0x0f, 0x90, 0x16, 0x89, 0x39, 0x54, 0x46,
+	0x19, 0x40, 0x03, 0x54, 0x90, 0xef, 0xc7, 0x98, 0x31, 0x65, 0x9e, 0x87, 0xad, 0x8f, 0x1a, 0xd0,
+	0xb3, 0xbf, 0x5e, 0xd4, 0x0d, 0x5f, 0x02, 0x3d, 0x7b, 0x12, 0xa3, 0x24, 0xf6, 0x63, 0x3b, 0x7d,
+	0xc4, 0x1f, 0xe7, 0xeb, 0xb7, 0xe4, 0x92, 0x33, 0x7f, 0x68, 0x05, 0xd4, 0x8e, 0x10, 0x1f, 0x58,
+	0x07, 0x84, 0x7f, 0xfb, 0xba, 0x05, 0xd4, 0xf6, 0x1f, 0x10, 0xfe, 0xf9, 0xd7, 0x97, 0xcd, 0x74,
+	0x9b, 0xb2, 0x09, 0xd8, 0x3b, 0x9d, 0x9a, 0xda, 0xd9, 0xd4, 0xd4, 0x7e, 0x4e, 0x4d, 0xed, 0xd3,
+	0xcc, 0x2c, 0x9c, 0xcd, 0xcc, 0xc2, 0xf7, 0x99, 0x59, 0x78, 0xfb, 0xa0, 0x1f, 0xf0, 0x41, 0xd2,
+	0xb3, 0x3c, 0x1a, 0xd9, 0x11, 0x25, 0x38, 0x0e, 0x92, 0xf4, 0xe0, 0x27, 0x21, 0xde, 0x22, 0xb4,
+	0x17, 0x62, 0x7b, 0xdc, 0xb5, 0xf9, 0x64, 0x84, 0x59, 0xaf, 0x2c, 0x3e, 0x0f, 0x0f, 0x7f, 0x07,
+	0x00, 0x00, 0xff, 0xff, 0x71, 0x25, 0x3c, 0xbc, 0xab, 0x04, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
diff --git a/x/florin/types/keys.go b/types/keys.go
similarity index 100%
rename from x/florin/types/keys.go
rename to types/keys.go
diff --git a/x/florin/types/query.pb.go b/types/query.pb.go
similarity index 95%
rename from x/florin/types/query.pb.go
rename to types/query.pb.go
index b9aea989..8b56f15c 100644
--- a/x/florin/types/query.pb.go
+++ b/types/query.pb.go
@@ -1085,75 +1085,75 @@ func init() {
 func init() { proto.RegisterFile("florin/v1/query.proto", fileDescriptor_f896e6ddcd63be16) }
 
 var fileDescriptor_f896e6ddcd63be16 = []byte{
-	// 1086 bytes of a gzipped FileDescriptorProto
+	// 1084 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x4f, 0x6f, 0x1b, 0x45,
 	0x14, 0xcf, 0xba, 0xc4, 0x95, 0x5f, 0x6a, 0x93, 0x4c, 0x1c, 0xd7, 0xd9, 0xc4, 0x9b, 0x64, 0xc0,
-	0x6d, 0x48, 0x14, 0x6f, 0x63, 0x50, 0x29, 0x48, 0x48, 0x8d, 0x09, 0x42, 0x45, 0x94, 0x82, 0x91,
-	0x10, 0xe2, 0x80, 0xbb, 0xb1, 0x17, 0x67, 0x55, 0xef, 0x8c, 0xf1, 0xae, 0xd3, 0x58, 0x55, 0x84,
-	0xe0, 0x04, 0x17, 0x40, 0xf0, 0x25, 0x38, 0xf6, 0xd0, 0x0f, 0x51, 0x89, 0x4b, 0x05, 0x97, 0x8a,
-	0x43, 0x85, 0x12, 0x24, 0xbe, 0x46, 0xe5, 0x99, 0xd9, 0xd9, 0xff, 0x76, 0xaa, 0x5e, 0x22, 0xbf,
-	0x3f, 0xf3, 0xfb, 0xbd, 0x79, 0xef, 0xcd, 0xfe, 0x14, 0x58, 0xfa, 0xa6, 0x47, 0x07, 0x16, 0xd1,
-	0x8f, 0x76, 0xf5, 0x6f, 0x87, 0xe6, 0x60, 0x54, 0xeb, 0x0f, 0xa8, 0x4b, 0x51, 0x8e, 0xbb, 0x6b,
-	0x47, 0xbb, 0xea, 0x82, 0x61, 0x5b, 0x84, 0xea, 0xec, 0x2f, 0x8f, 0xaa, 0x2b, 0x6d, 0xea, 0xd8,
-	0xd4, 0xe1, 0x27, 0x22, 0x47, 0xd5, 0x65, 0x1e, 0x6c, 0x31, 0x4b, 0xe7, 0x86, 0x08, 0x5d, 0xf6,
-	0xc9, 0xba, 0x26, 0x31, 0x1d, 0xcb, 0x0b, 0x14, 0xbb, 0xb4, 0x4b, 0xf9, 0x81, 0xf1, 0x2f, 0xe1,
-	0x5d, 0xed, 0x52, 0xda, 0xed, 0x99, 0xba, 0xd1, 0xb7, 0x74, 0x83, 0x10, 0xea, 0x1a, 0xae, 0x45,
-	0x89, 0x38, 0x83, 0xe7, 0xa1, 0xf0, 0xd9, 0x98, 0x76, 0x6f, 0xe8, 0x1e, 0xd2, 0x81, 0xe5, 0x8e,
-	0xf0, 0x75, 0x28, 0x85, 0x3d, 0x4d, 0xd3, 0xe9, 0x53, 0xe2, 0x98, 0x68, 0x15, 0x72, 0x86, 0xe7,
-	0x2c, 0x2b, 0xeb, 0xca, 0x66, 0xae, 0xe9, 0x3b, 0x70, 0x11, 0x10, 0x3f, 0xd7, 0xeb, 0xd1, 0xfb,
-	0x66, 0x67, 0xdf, 0x24, 0xd4, 0x76, 0xf0, 0xfb, 0xa0, 0xc6, 0xbd, 0x12, 0xb1, 0x0a, 0x05, 0x83,
-	0x07, 0x5a, 0x1d, 0x16, 0x29, 0x2b, 0xeb, 0x17, 0x36, 0x73, 0xcd, 0xbc, 0x11, 0x02, 0xc9, 0xc3,
-	0x1c, 0x03, 0xb9, 0x73, 0x9f, 0x98, 0x03, 0x07, 0x3f, 0xcc, 0xc0, 0x62, 0xc0, 0x96, 0x68, 0x0d,
-	0xc8, 0x52, 0xe6, 0x61, 0x28, 0x73, 0xf5, 0xad, 0x9a, 0xec, 0x7f, 0x2d, 0x21, 0xbf, 0xc6, 0xcd,
-	0x0f, 0x88, 0x3b, 0x18, 0x35, 0xc5, 0x49, 0xf4, 0x25, 0x14, 0xfa, 0x26, 0xe9, 0x58, 0xa4, 0xdb,
-	0x12, 0x58, 0x19, 0x86, 0xb5, 0x3b, 0x05, 0xeb, 0x53, 0x7e, 0x28, 0x08, 0x99, 0xef, 0x07, 0x7d,
-	0xea, 0x3b, 0x30, 0x17, 0x88, 0xa2, 0x79, 0xb8, 0x70, 0xcf, 0xf4, 0xda, 0x38, 0xfe, 0x89, 0x8a,
-	0x30, 0x7b, 0x64, 0xf4, 0x86, 0x66, 0x39, 0xc3, 0x7c, 0xdc, 0x78, 0x37, 0x73, 0x43, 0x51, 0x6f,
-	0x02, 0x8a, 0xe3, 0xbf, 0x08, 0x02, 0xc6, 0x00, 0x7e, 0xd5, 0xe3, 0x3c, 0xd6, 0x6e, 0x71, 0x96,
-	0x1b, 0xf8, 0x8e, 0x18, 0x20, 0xcb, 0x91, 0x4d, 0x2d, 0xc2, 0x2c, 0x6b, 0x84, 0x97, 0xcb, 0x0c,
-	0xf4, 0x1a, 0xe4, 0x43, 0x6d, 0x12, 0x8c, 0x97, 0x82, 0x57, 0xc6, 0x05, 0xb8, 0xc4, 0x00, 0x3f,
-	0x1f, 0x39, 0xae, 0x69, 0x3b, 0xf8, 0x23, 0x28, 0x06, 0x6d, 0x49, 0x51, 0x87, 0x8b, 0x0e, 0x77,
-	0x89, 0xc1, 0xa1, 0x40, 0xb3, 0xf7, 0xda, 0x6d, 0x3a, 0x24, 0x6e, 0xe3, 0x95, 0xc7, 0xcf, 0xd6,
-	0x66, 0x9a, 0x5e, 0x22, 0xde, 0x16, 0x2b, 0x20, 0xb0, 0x1a, 0x23, 0xb6, 0x2a, 0x29, 0x37, 0x7b,
-	0x1b, 0x56, 0x12, 0x92, 0x25, 0x7f, 0x39, 0xcc, 0x9f, 0xf3, 0x59, 0xbc, 0xc5, 0xdb, 0xeb, 0xd8,
-	0x16, 0x71, 0xf0, 0x87, 0x82, 0x94, 0x9b, 0xf2, 0xfc, 0x35, 0xc8, 0x1a, 0xcc, 0x33, 0xb5, 0x7c,
-	0x91, 0x87, 0xb7, 0xbc, 0xb7, 0xc2, 0xcc, 0xc9, 0xc5, 0xbf, 0xe5, 0xbd, 0xa0, 0x60, 0xae, 0xe4,
-	0x2e, 0x85, 0xb8, 0x73, 0x92, 0xa1, 0x2c, 0x5e, 0xf1, 0x6d, 0xe3, 0xf8, 0xb6, 0x45, 0x5c, 0xf6,
-	0xfc, 0x0c, 0xd2, 0x36, 0x1d, 0xfc, 0x54, 0x01, 0x2d, 0x39, 0x24, 0x41, 0xfb, 0xb0, 0x68, 0x1b,
-	0xc7, 0x2d, 0xdb, 0x22, 0x6e, 0xcb, 0x90, 0x61, 0x71, 0xbb, 0x9b, 0xd1, 0x97, 0x90, 0x8a, 0x53,
-	0x8b, 0x45, 0xf8, 0xc3, 0x58, 0xb0, 0xa3, 0x7e, 0x75, 0x1f, 0x4a, 0xc9, 0xc9, 0x2f, 0xb4, 0xe5,
-	0x3b, 0xb0, 0x94, 0x58, 0x51, 0x4a, 0x67, 0xbf, 0x83, 0x4a, 0x62, 0xba, 0xec, 0xc3, 0xd7, 0x80,
-	0xe2, 0x7d, 0xe0, 0x18, 0x8d, 0x6b, 0xe3, 0x81, 0xfe, 0xf3, 0x6c, 0x6d, 0x89, 0x7f, 0x9b, 0x9d,
-	0xce, 0xbd, 0x9a, 0x45, 0x75, 0xdb, 0x70, 0x0f, 0x6b, 0xb7, 0x88, 0xfb, 0xd7, 0xa3, 0x1d, 0x10,
-	0x1f, 0xed, 0x5b, 0xc4, 0xfd, 0xe3, 0xff, 0x87, 0x5b, 0x4a, 0x73, 0x3e, 0x7a, 0x6d, 0xb9, 0xc4,
-	0xe1, 0x7b, 0xa7, 0x54, 0xfb, 0x48, 0x11, 0x5b, 0x9c, 0x32, 0xb4, 0x2f, 0x00, 0x62, 0xb3, 0xba,
-	0x1e, 0x9b, 0x55, 0xf2, 0xa0, 0xa2, 0x13, 0x0a, 0x20, 0xa9, 0xef, 0xc1, 0xab, 0x2f, 0x33, 0x93,
-	0x7d, 0xb1, 0xea, 0xe7, 0x18, 0xc8, 0xf8, 0x21, 0x1a, 0xfc, 0xbd, 0x08, 0x1c, 0xcf, 0xc4, 0x3d,
-	0xf1, 0x08, 0x92, 0xe7, 0xf4, 0x09, 0xe4, 0x5e, 0x7e, 0x3c, 0x3e, 0x44, 0xfd, 0xcf, 0x39, 0x98,
-	0x65, 0x74, 0xa8, 0x07, 0x39, 0xa9, 0x83, 0x68, 0x39, 0xda, 0x4d, 0x19, 0x52, 0x37, 0x52, 0x43,
-	0x5e, 0x91, 0x78, 0xe3, 0xc7, 0x31, 0xcd, 0x0f, 0x7f, 0xff, 0xf7, 0x7b, 0xa6, 0x84, 0x8a, 0xba,
-	0x2f, 0xe2, 0x52, 0x42, 0xd1, 0x09, 0xe4, 0x43, 0x3a, 0x89, 0x2a, 0x31, 0xd8, 0x60, 0x58, 0xad,
-	0x4e, 0x0c, 0x4b, 0xe6, 0x2b, 0x3e, 0xf3, 0x0a, 0x5a, 0x0e, 0x32, 0x87, 0xb4, 0x17, 0xdd, 0x85,
-	0x2c, 0xd7, 0x17, 0x54, 0x4a, 0x56, 0x3b, 0x55, 0x9b, 0xac, 0x82, 0x58, 0xf3, 0x99, 0x16, 0xd1,
-	0x42, 0x80, 0x49, 0xa8, 0x6b, 0x07, 0x66, 0xb9, 0x02, 0x2d, 0x25, 0x02, 0xa9, 0x95, 0x44, 0xb7,
-	0x84, 0xaf, 0xfa, 0xf0, 0x2a, 0x2a, 0x47, 0xe1, 0xf5, 0x07, 0xec, 0x1e, 0x27, 0xa8, 0x03, 0x17,
-	0xc5, 0x97, 0x1e, 0x5d, 0x8e, 0x02, 0x8a, 0x80, 0xba, 0x96, 0x12, 0x90, 0x5c, 0x6b, 0x3e, 0x57,
-	0x11, 0xa1, 0x00, 0x97, 0xd0, 0x06, 0xf4, 0xbd, 0x02, 0x85, 0x88, 0xfa, 0x68, 0x29, 0xa0, 0x22,
-	0xae, 0x5e, 0x99, 0x1c, 0x97, 0xdc, 0x57, 0x7d, 0xee, 0x55, 0xa4, 0xc6, 0xb9, 0xe5, 0x4d, 0xef,
-	0x42, 0x96, 0xcb, 0x42, 0x7c, 0x62, 0xdc, 0x1f, 0x9f, 0x58, 0x58, 0xbb, 0xd2, 0x27, 0xc6, 0x75,
-	0x84, 0xad, 0x64, 0x48, 0xa4, 0x2a, 0xc9, 0x80, 0xde, 0x15, 0xab, 0x13, 0xc3, 0xe7, 0x58, 0x49,
-	0x96, 0x2e, 0x2f, 0xf8, 0xb3, 0x02, 0x0b, 0x31, 0x61, 0x40, 0x1b, 0x53, 0x25, 0x48, 0x7d, 0xe3,
-	0xdc, 0x2a, 0x85, 0xb7, 0xfd, 0x5a, 0xd6, 0x91, 0x16, 0xa8, 0x25, 0x41, 0x03, 0xd1, 0x6f, 0x0a,
+	0x6d, 0x9a, 0x28, 0xde, 0xc6, 0xa0, 0x52, 0x90, 0x90, 0x1a, 0x37, 0x08, 0x15, 0xa9, 0x14, 0x8c,
+	0x84, 0x10, 0x07, 0xdc, 0x8d, 0xbd, 0x38, 0xab, 0x7a, 0x67, 0x8c, 0x77, 0x9d, 0xd6, 0xaa, 0x22,
+	0x04, 0x27, 0xb8, 0x00, 0x82, 0x2f, 0xc1, 0xb1, 0x87, 0x7e, 0x88, 0x4a, 0x5c, 0x2a, 0xb8, 0x54,
+	0x1c, 0x2a, 0x94, 0x20, 0xf1, 0x35, 0x90, 0x67, 0x66, 0x67, 0xff, 0xdb, 0xa9, 0x72, 0x89, 0xfc,
+	0xfe, 0xcc, 0xef, 0xf7, 0xe6, 0xbd, 0x37, 0xfb, 0x53, 0x60, 0xe9, 0xeb, 0x1e, 0x1d, 0x58, 0x44,
+	0x3f, 0xda, 0xd5, 0xbf, 0x19, 0x9a, 0x83, 0x51, 0xad, 0x3f, 0xa0, 0x2e, 0x45, 0x39, 0xee, 0xae,
+	0x1d, 0xed, 0xaa, 0x0b, 0x86, 0x6d, 0x11, 0xaa, 0xb3, 0xbf, 0x3c, 0xaa, 0xae, 0xb4, 0xa9, 0x63,
+	0x53, 0x87, 0x9f, 0x88, 0x1c, 0x55, 0x97, 0x79, 0xb0, 0xc5, 0x2c, 0x9d, 0x1b, 0x22, 0x74, 0xd9,
+	0x27, 0xeb, 0x9a, 0xc4, 0x74, 0x2c, 0x2f, 0x50, 0xec, 0xd2, 0x2e, 0xe5, 0x07, 0xc6, 0xbf, 0x84,
+	0x77, 0xb5, 0x4b, 0x69, 0xb7, 0x67, 0xea, 0x46, 0xdf, 0xd2, 0x0d, 0x42, 0xa8, 0x6b, 0xb8, 0x16,
+	0x25, 0xe2, 0x0c, 0x9e, 0x87, 0xc2, 0xa7, 0x63, 0xda, 0xbd, 0xa1, 0x7b, 0x48, 0x07, 0x96, 0x3b,
+	0xc2, 0x37, 0xa0, 0x14, 0xf6, 0x34, 0x4d, 0xa7, 0x4f, 0x89, 0x63, 0xa2, 0x55, 0xc8, 0x19, 0x9e,
+	0xb3, 0xac, 0xac, 0x2b, 0x9b, 0xb9, 0xa6, 0xef, 0xc0, 0x45, 0x40, 0xfc, 0x5c, 0xaf, 0x47, 0x1f,
+	0x9a, 0x9d, 0x7d, 0x93, 0x50, 0xdb, 0xc1, 0xb7, 0x41, 0x8d, 0x7b, 0x25, 0x62, 0x15, 0x0a, 0x06,
+	0x0f, 0xb4, 0x3a, 0x2c, 0x52, 0x56, 0xd6, 0x2f, 0x6c, 0xe6, 0x9a, 0x79, 0x23, 0x04, 0x92, 0x87,
+	0x39, 0x06, 0x72, 0xef, 0x21, 0x31, 0x07, 0x0e, 0x7e, 0x92, 0x81, 0xc5, 0x80, 0x2d, 0xd1, 0x1a,
+	0x90, 0xa5, 0xcc, 0xc3, 0x50, 0xe6, 0xea, 0x5b, 0x35, 0xd9, 0xff, 0x5a, 0x42, 0x7e, 0x8d, 0x9b,
+	0x1f, 0x10, 0x77, 0x30, 0x6a, 0x8a, 0x93, 0xe8, 0x0b, 0x28, 0xf4, 0x4d, 0xd2, 0xb1, 0x48, 0xb7,
+	0x25, 0xb0, 0x32, 0x0c, 0x6b, 0x77, 0x0a, 0xd6, 0x27, 0xfc, 0x50, 0x10, 0x32, 0xdf, 0x0f, 0xfa,
+	0xd4, 0x77, 0x61, 0x2e, 0x10, 0x45, 0xf3, 0x70, 0xe1, 0x81, 0xe9, 0xb5, 0x71, 0xfc, 0x13, 0x15,
+	0x61, 0xf6, 0xc8, 0xe8, 0x0d, 0xcd, 0x72, 0x86, 0xf9, 0xb8, 0xf1, 0x5e, 0xe6, 0xa6, 0xa2, 0xde,
+	0x02, 0x14, 0xc7, 0x7f, 0x15, 0x04, 0x8c, 0x01, 0xfc, 0xaa, 0xc7, 0x79, 0xac, 0xdd, 0xe2, 0x2c,
+	0x37, 0xf0, 0x3d, 0x31, 0x40, 0x96, 0x23, 0x9b, 0x5a, 0x84, 0x59, 0xd6, 0x08, 0x2f, 0x97, 0x19,
+	0xe8, 0x0d, 0xc8, 0x87, 0xda, 0x24, 0x18, 0x2f, 0x05, 0xaf, 0x8c, 0x0b, 0x70, 0x89, 0x01, 0x7e,
+	0x36, 0x72, 0x5c, 0xd3, 0x76, 0xf0, 0x47, 0x50, 0x0c, 0xda, 0x92, 0xa2, 0x0e, 0x17, 0x1d, 0xee,
+	0x12, 0x83, 0x43, 0x81, 0x66, 0xef, 0xb5, 0xdb, 0x74, 0x48, 0xdc, 0xc6, 0x6b, 0xcf, 0x5e, 0xae,
+	0xcd, 0x34, 0xbd, 0x44, 0xbc, 0x2d, 0x56, 0x40, 0x60, 0x35, 0x46, 0x6c, 0x55, 0x52, 0x6e, 0xf6,
+	0x0e, 0xac, 0x24, 0x24, 0x4b, 0xfe, 0x72, 0x98, 0x3f, 0xe7, 0xb3, 0x78, 0x8b, 0xb7, 0xd7, 0xb1,
+	0x2d, 0xe2, 0xe0, 0x0f, 0x05, 0x29, 0x37, 0xe5, 0xf9, 0xeb, 0x90, 0x35, 0x98, 0x67, 0x6a, 0xf9,
+	0x22, 0x0f, 0x6f, 0x79, 0x6f, 0x85, 0x99, 0x93, 0x8b, 0x7f, 0xdb, 0x7b, 0x41, 0xc1, 0x5c, 0xc9,
+	0x5d, 0x0a, 0x71, 0xe7, 0x24, 0x43, 0x59, 0xbc, 0xe2, 0xbb, 0xc6, 0xa3, 0xbb, 0x16, 0x71, 0xd9,
+	0xf3, 0x33, 0x48, 0xdb, 0x74, 0xf0, 0x0b, 0x05, 0xb4, 0xe4, 0x90, 0x04, 0xed, 0xc3, 0xa2, 0x6d,
+	0x3c, 0x6a, 0xd9, 0x16, 0x71, 0x5b, 0x86, 0x0c, 0x8b, 0xdb, 0xdd, 0x8a, 0xbe, 0x84, 0x54, 0x9c,
+	0x5a, 0x2c, 0xc2, 0x1f, 0xc6, 0x82, 0x1d, 0xf5, 0xab, 0xfb, 0x50, 0x4a, 0x4e, 0x7e, 0xa5, 0x2d,
+	0xdf, 0x81, 0xa5, 0xc4, 0x8a, 0x52, 0x3a, 0xfb, 0x2d, 0x54, 0x12, 0xd3, 0x65, 0x1f, 0xbe, 0x02,
+	0x14, 0xef, 0x03, 0xc7, 0x68, 0x5c, 0x1f, 0x0f, 0xf4, 0xef, 0x97, 0x6b, 0x4b, 0xfc, 0xdb, 0xec,
+	0x74, 0x1e, 0xd4, 0x2c, 0xaa, 0xdb, 0x86, 0x7b, 0x58, 0xbb, 0x43, 0xdc, 0x3f, 0x9f, 0xee, 0x80,
+	0xf8, 0x68, 0xdf, 0x21, 0xee, 0xef, 0xff, 0x3d, 0xd9, 0x52, 0x9a, 0xf3, 0xd1, 0x6b, 0xcb, 0x25,
+	0x0e, 0xdf, 0x3b, 0xa5, 0xda, 0xa7, 0x8a, 0xd8, 0xe2, 0x94, 0xa1, 0x7d, 0x0e, 0x10, 0x9b, 0xd5,
+	0x8d, 0xd8, 0xac, 0x92, 0x07, 0x15, 0x9d, 0x50, 0x00, 0x49, 0x7d, 0x1f, 0x5e, 0x3f, 0xcf, 0x4c,
+	0xf6, 0xc5, 0xaa, 0x9f, 0x61, 0x20, 0xe3, 0x87, 0x68, 0xf0, 0xf7, 0x22, 0x70, 0x3c, 0x13, 0xf7,
+	0xc4, 0x23, 0x48, 0x9e, 0xd3, 0xc7, 0x90, 0x3b, 0xff, 0x78, 0x7c, 0x88, 0xfa, 0x1f, 0x73, 0x30,
+	0xcb, 0xe8, 0x50, 0x0f, 0x72, 0x52, 0x07, 0xd1, 0x72, 0xb4, 0x9b, 0x32, 0xa4, 0x6e, 0xa4, 0x86,
+	0xbc, 0x22, 0xf1, 0xc6, 0x0f, 0x63, 0x9a, 0xef, 0xff, 0xfa, 0xf7, 0xb7, 0x4c, 0x09, 0x15, 0x75,
+	0x5f, 0xc4, 0xa5, 0x84, 0xa2, 0x63, 0xc8, 0x87, 0x74, 0x12, 0x55, 0x62, 0xb0, 0xc1, 0xb0, 0x5a,
+	0x9d, 0x18, 0x96, 0xcc, 0x57, 0x7c, 0xe6, 0x15, 0xb4, 0x1c, 0x64, 0x0e, 0x69, 0x2f, 0xba, 0x0f,
+	0x59, 0xae, 0x2f, 0xa8, 0x94, 0xac, 0x76, 0xaa, 0x36, 0x59, 0x05, 0xb1, 0xe6, 0x33, 0x2d, 0xa2,
+	0x85, 0x00, 0x93, 0x50, 0xd7, 0x0e, 0xcc, 0x72, 0x05, 0x5a, 0x4a, 0x04, 0x52, 0x2b, 0x89, 0x6e,
+	0x09, 0x5f, 0xf5, 0xe1, 0x55, 0x54, 0x8e, 0xc2, 0xeb, 0x8f, 0xd9, 0x3d, 0x8e, 0x51, 0x07, 0x2e,
+	0x8a, 0x2f, 0x3d, 0xba, 0x1c, 0x05, 0x14, 0x01, 0x75, 0x2d, 0x25, 0x20, 0xb9, 0xd6, 0x7c, 0xae,
+	0x22, 0x42, 0x01, 0x2e, 0xa1, 0x0d, 0xe8, 0x3b, 0x05, 0x0a, 0x11, 0xf5, 0xd1, 0x52, 0x40, 0x45,
+	0x5c, 0xbd, 0x32, 0x39, 0x2e, 0xb9, 0xaf, 0xfa, 0xdc, 0xab, 0x48, 0x8d, 0x73, 0xcb, 0x9b, 0xde,
+	0x87, 0x2c, 0x97, 0x85, 0xf8, 0xc4, 0xb8, 0x3f, 0x3e, 0xb1, 0xb0, 0x76, 0xa5, 0x4f, 0x8c, 0xeb,
+	0x08, 0x5b, 0xc9, 0x90, 0x48, 0x55, 0x92, 0x01, 0xbd, 0x2b, 0x56, 0x27, 0x86, 0xcf, 0xb0, 0x92,
+	0x2c, 0x5d, 0x5e, 0xf0, 0x27, 0x05, 0x16, 0x62, 0xc2, 0x80, 0x36, 0xa6, 0x4a, 0x90, 0x7a, 0xed,
+	0xcc, 0x2a, 0x85, 0xb7, 0xfd, 0x5a, 0xd6, 0x91, 0x16, 0xa8, 0x25, 0x41, 0x03, 0xd1, 0xaf, 0x0a,
 	0xcc, 0xc7, 0xe4, 0x65, 0x7d, 0x1a, 0x99, 0xba, 0x39, 0x2d, 0x43, 0x56, 0x53, 0xf7, 0xab, 0xb9,
-	0x8a, 0xaa, 0x13, 0xab, 0x91, 0x5d, 0xfa, 0x49, 0x81, 0x42, 0xa4, 0x45, 0xda, 0xe4, 0x2f, 0x7f,
-	0x7c, 0x15, 0x53, 0x9a, 0xa3, 0xfb, 0xe5, 0xbc, 0x8e, 0x70, 0xb0, 0x9c, 0x70, 0x63, 0x64, 0x2d,
-	0xbf, 0x28, 0x90, 0x0f, 0x77, 0xa7, 0x32, 0x91, 0x2a, 0xbe, 0x31, 0xc9, 0x7d, 0xb9, 0xe1, 0x17,
-	0xb2, 0x83, 0xb6, 0x53, 0x0b, 0xf1, 0xea, 0xd0, 0x1f, 0x08, 0xe9, 0x38, 0x69, 0x7c, 0xfc, 0xf8,
-	0x54, 0x53, 0x9e, 0x9c, 0x6a, 0xca, 0xbf, 0xa7, 0x9a, 0xf2, 0xeb, 0x99, 0x36, 0xf3, 0xe4, 0x4c,
-	0x9b, 0x79, 0x7a, 0xa6, 0xcd, 0x7c, 0x55, 0xef, 0x5a, 0xee, 0xe1, 0xf0, 0xa0, 0xd6, 0xa6, 0xb6,
-	0x6e, 0x53, 0x62, 0x0e, 0xac, 0xe1, 0xf8, 0x47, 0x67, 0xd8, 0x33, 0x77, 0x08, 0x3d, 0xe8, 0x99,
-	0xfa, 0x51, 0x5d, 0x3f, 0xf6, 0xb8, 0xdc, 0x51, 0xdf, 0x74, 0x0e, 0xb2, 0xec, 0xff, 0xa6, 0x37,
-	0x9f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xb6, 0xc1, 0xe2, 0xdc, 0xf3, 0x0d, 0x00, 0x00,
+	0x8a, 0xaa, 0x13, 0xab, 0x91, 0x5d, 0xfa, 0x51, 0x81, 0x42, 0xa4, 0x45, 0xda, 0xe4, 0x2f, 0x7f,
+	0x7c, 0x15, 0x53, 0x9a, 0xa3, 0xfb, 0xe5, 0xbc, 0x89, 0x70, 0xb0, 0x9c, 0x70, 0x63, 0x64, 0x2d,
+	0x3f, 0x2b, 0x90, 0x0f, 0x77, 0xa7, 0x32, 0x91, 0x2a, 0xbe, 0x31, 0xc9, 0x7d, 0xb9, 0xe9, 0x17,
+	0xb2, 0x83, 0xb6, 0x53, 0x0b, 0xf1, 0xea, 0xd0, 0x1f, 0x0b, 0xe9, 0x38, 0x6e, 0xdc, 0x7e, 0x76,
+	0xa2, 0x29, 0xcf, 0x4f, 0x34, 0xe5, 0x9f, 0x13, 0x4d, 0xf9, 0xe5, 0x54, 0x9b, 0x79, 0x7e, 0xaa,
+	0xcd, 0xbc, 0x38, 0xd5, 0x66, 0xbe, 0xbc, 0xd6, 0xb5, 0xdc, 0xc3, 0xe1, 0x41, 0xad, 0x4d, 0x6d,
+	0xdd, 0xa6, 0xc4, 0x1c, 0x58, 0xc3, 0xf1, 0x8f, 0xce, 0xb0, 0x67, 0xee, 0x10, 0x7a, 0xd0, 0x33,
+	0xf5, 0xa3, 0xba, 0xee, 0x8e, 0xfa, 0xa6, 0x73, 0x90, 0x65, 0xff, 0x2e, 0xbd, 0xf5, 0x7f, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0xf7, 0x9b, 0x4e, 0xb4, 0xea, 0x0d, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/florin/types/query.pb.gw.go b/types/query.pb.gw.go
similarity index 100%
rename from x/florin/types/query.pb.gw.go
rename to types/query.pb.gw.go
diff --git a/x/florin/types/tx.pb.go b/types/tx.pb.go
similarity index 95%
rename from x/florin/types/tx.pb.go
rename to types/tx.pb.go
index 2c3bc202..a98c074e 100644
--- a/x/florin/types/tx.pb.go
+++ b/types/tx.pb.go
@@ -991,68 +991,68 @@ func init() {
 func init() { proto.RegisterFile("florin/v1/tx.proto", fileDescriptor_de2a06c2ec80785c) }
 
 var fileDescriptor_de2a06c2ec80785c = []byte{
-	// 975 bytes of a gzipped FileDescriptorProto
+	// 971 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x97, 0xcd, 0x6f, 0xe3, 0x44,
 	0x14, 0xc0, 0x33, 0xe9, 0x17, 0x7d, 0x7c, 0x2c, 0x75, 0xd3, 0x6d, 0xd6, 0xb4, 0x4e, 0x30, 0xa2,
-	0x74, 0x2b, 0x6a, 0xb7, 0x41, 0x70, 0xc8, 0x05, 0xa5, 0xe2, 0xb0, 0x2b, 0x11, 0x21, 0xa5, 0x48,
-	0x48, 0x2b, 0xa1, 0xc5, 0xb5, 0xa7, 0xae, 0x45, 0x3c, 0x13, 0x79, 0x9c, 0xa4, 0x7b, 0x43, 0x9c,
-	0x10, 0xda, 0x03, 0x7f, 0xc2, 0x1e, 0x39, 0x56, 0x68, 0xff, 0x00, 0xc4, 0x01, 0x7a, 0x5c, 0xed,
-	0x09, 0x71, 0xa8, 0x50, 0x7b, 0x28, 0xe2, 0xc8, 0x99, 0x03, 0xb2, 0x3d, 0x99, 0xc6, 0x5f, 0x71,
-	0x05, 0x61, 0xd5, 0x4b, 0x64, 0xbf, 0xaf, 0x79, 0xbf, 0x37, 0xe3, 0x37, 0x2f, 0x20, 0x1d, 0x76,
-	0xa9, 0xe7, 0x10, 0x7d, 0xb0, 0xab, 0xfb, 0xc7, 0x5a, 0xcf, 0xa3, 0x3e, 0x95, 0x16, 0x23, 0x99,
-	0x36, 0xd8, 0x95, 0x97, 0x0c, 0xd7, 0x21, 0x54, 0x0f, 0x7f, 0x23, 0xad, 0xbc, 0x6a, 0x52, 0xe6,
-	0x52, 0xa6, 0xbb, 0xcc, 0x0e, 0xbc, 0x5c, 0x66, 0x73, 0xc5, 0x9d, 0x48, 0xf1, 0x30, 0x7c, 0xd3,
-	0xa3, 0x17, 0xae, 0xaa, 0xd8, 0xd4, 0xa6, 0x91, 0x3c, 0x78, 0x8a, 0xa4, 0xea, 0x63, 0x04, 0x52,
-	0x9b, 0xd9, 0x2d, 0xd3, 0xc4, 0x3d, 0xff, 0x93, 0x21, 0xc1, 0x1e, 0x3b, 0x72, 0x7a, 0x52, 0x05,
-	0xe6, 0x2c, 0x4c, 0xa8, 0x5b, 0x45, 0x75, 0xb4, 0xb9, 0xd8, 0x89, 0x5e, 0xa4, 0x1d, 0x98, 0x67,
-	0x8e, 0x4d, 0xb0, 0x57, 0x2d, 0x07, 0xe2, 0xbd, 0xea, 0xf3, 0xa7, 0xdb, 0x15, 0xbe, 0x48, 0xcb,
-	0xb2, 0x3c, 0xcc, 0xd8, 0xbe, 0xef, 0x39, 0xc4, 0xee, 0x70, 0xbb, 0xa6, 0xf6, 0xcd, 0x93, 0x5a,
-	0xe9, 0x8f, 0x27, 0xb5, 0xd2, 0xd7, 0x97, 0x27, 0x5b, 0x5c, 0xf8, 0xed, 0xe5, 0xc9, 0xd6, 0x6d,
-	0x8e, 0x9c, 0x58, 0x57, 0x5d, 0x03, 0x39, 0x9d, 0x4d, 0x07, 0xb3, 0x1e, 0x25, 0x0c, 0xab, 0x3f,
-	0xf2, 0x64, 0x2d, 0xab, 0x65, 0xb9, 0x0e, 0x69, 0x99, 0x26, 0xed, 0x13, 0x7f, 0x5a, 0xc9, 0x4a,
-	0x0d, 0x58, 0x30, 0xa2, 0x90, 0xd5, 0x99, 0x02, 0x97, 0x91, 0x61, 0x31, 0x60, 0x3c, 0xd7, 0x11,
-	0x60, 0x5c, 0x2a, 0x00, 0x7f, 0x42, 0xb0, 0x1c, 0xa9, 0xf7, 0x1f, 0x31, 0x1f, 0xbb, 0x37, 0x81,
-	0x50, 0xcf, 0x21, 0x5c, 0xbd, 0x22, 0x8c, 0x25, 0xab, 0xae, 0xc3, 0x1b, 0x19, 0x0c, 0x82, 0xf1,
-	0x07, 0x04, 0xaf, 0x06, 0xfa, 0x6e, 0x97, 0x0e, 0x3f, 0x4a, 0x70, 0xa0, 0x6b, 0x72, 0x88, 0x7a,
-	0x94, 0xc7, 0xeb, 0xa1, 0xc1, 0x1c, 0x0d, 0xce, 0x4c, 0x21, 0x5b, 0x64, 0xd6, 0xbc, 0x9b, 0x43,
-	0xb6, 0x34, 0x22, 0x13, 0x29, 0xaa, 0xab, 0xb0, 0x12, 0xcb, 0x59, 0xd0, 0x3c, 0x2e, 0xc3, 0x42,
-	0x9b, 0xd9, 0x7b, 0x7d, 0x8f, 0x4c, 0x6d, 0x97, 0xde, 0x85, 0xd9, 0x43, 0x8f, 0xba, 0x85, 0x18,
-	0xa1, 0x95, 0x74, 0x0f, 0xe6, 0x0d, 0x37, 0xdc, 0xd2, 0xd9, 0xd0, 0x7e, 0xe7, 0xf4, 0xac, 0x56,
-	0xfa, 0xed, 0xac, 0xb6, 0x12, 0xf9, 0x30, 0xeb, 0x4b, 0xcd, 0xa1, 0xba, 0x6b, 0xf8, 0x47, 0xda,
-	0x7d, 0xe2, 0x3f, 0x7f, 0xba, 0x0d, 0x3c, 0xd8, 0x7d, 0xe2, 0x7f, 0x7f, 0x79, 0xb2, 0x85, 0x3a,
-	0xdc, 0x5f, 0x5a, 0x83, 0xc5, 0x20, 0x03, 0xc3, 0xef, 0x7b, 0xb8, 0x3a, 0x57, 0x47, 0x9b, 0xaf,
-	0x74, 0xae, 0x04, 0xcd, 0xb7, 0x72, 0xaa, 0xf5, 0x32, 0xaf, 0x56, 0x50, 0x02, 0x75, 0x09, 0x6e,
-	0xf1, 0x6a, 0x88, 0x0a, 0xfd, 0x89, 0xc2, 0x0a, 0xb5, 0x9d, 0x29, 0x9e, 0xe3, 0x4d, 0x28, 0xfb,
-	0xb4, 0xb0, 0x3e, 0x65, 0x9f, 0x4e, 0xaf, 0x3a, 0x85, 0xfc, 0x01, 0x20, 0xe7, 0x0f, 0x1e, 0x05,
-	0xff, 0x5f, 0x08, 0xa0, 0xcd, 0xec, 0x0e, 0x36, 0xe9, 0x60, 0xfc, 0xe8, 0xbe, 0xd0, 0x43, 0x12,
-	0x15, 0x6c, 0xf6, 0x1a, 0x05, 0x9b, 0x7c, 0x08, 0x36, 0x72, 0x8a, 0xf0, 0x1a, 0x2f, 0x02, 0xa7,
-	0x54, 0x2b, 0x61, 0xa3, 0xe6, 0x6f, 0xa2, 0x14, 0x3f, 0xa3, 0xf0, 0x33, 0xea, 0x60, 0x97, 0x0e,
-	0xf0, 0x8d, 0x69, 0xe1, 0xbb, 0x39, 0x4c, 0x77, 0x04, 0x53, 0x32, 0x5d, 0xb5, 0x06, 0xeb, 0x99,
-	0x1c, 0x82, 0xf4, 0x14, 0xc1, 0x6d, 0x61, 0x71, 0x73, 0x7a, 0x79, 0x23, 0x07, 0x55, 0x8e, 0xa1,
-	0xc6, 0xdb, 0x79, 0x1d, 0x94, 0x6c, 0x12, 0x01, 0x7b, 0x16, 0xc1, 0xee, 0x63, 0xbf, 0x6d, 0x1c,
-	0x07, 0x67, 0x3f, 0xec, 0x93, 0x06, 0x31, 0xf1, 0xd4, 0x60, 0xaf, 0x3e, 0xe3, 0x99, 0xff, 0xf8,
-	0x19, 0x17, 0x95, 0x20, 0x83, 0x82, 0x97, 0x20, 0x43, 0x33, 0x7e, 0x0d, 0x2c, 0x73, 0x93, 0xff,
-	0x85, 0xff, 0x5f, 0x6c, 0xf6, 0x14, 0x5b, 0x5f, 0xd1, 0x08, 0x90, 0xc4, 0xe6, 0x23, 0x40, 0x52,
-	0x2c, 0xaa, 0xf5, 0x0b, 0x82, 0x4a, 0x9b, 0xd9, 0x9f, 0x7a, 0x06, 0x61, 0x87, 0xd8, 0x9b, 0xfa,
-	0xd8, 0x29, 0xbd, 0x0f, 0x8b, 0x04, 0x0f, 0x1f, 0x5e, 0x6f, 0x1a, 0x78, 0x89, 0xe0, 0x61, 0x98,
-	0x42, 0x73, 0x27, 0x87, 0xb3, 0xca, 0x39, 0x53, 0x09, 0xab, 0x0a, 0xac, 0x65, 0x81, 0x8c, 0x48,
-	0x1b, 0x7f, 0x2f, 0xc0, 0x4c, 0x9b, 0xd9, 0xd2, 0x67, 0x70, 0x2b, 0x39, 0x62, 0xaf, 0x6b, 0x62,
-	0xc4, 0xd7, 0xd2, 0x33, 0xaf, 0xfc, 0xf6, 0x44, 0xf5, 0x68, 0x81, 0x30, 0x70, 0x62, 0x1c, 0x4e,
-	0x06, 0x8e, 0xab, 0x53, 0x81, 0xb3, 0x47, 0x51, 0xe9, 0x01, 0xbc, 0x9e, 0x1a, 0x43, 0x95, 0x94,
-	0x6b, 0x4c, 0x2f, 0x6f, 0x4c, 0xd6, 0x8b, 0xd8, 0xf7, 0x00, 0xc6, 0xc6, 0xbf, 0x6a, 0xc2, 0x4b,
-	0x68, 0xe4, 0x7a, 0x9e, 0x46, 0x44, 0xfa, 0x00, 0x66, 0xc3, 0xd1, 0x4b, 0x8a, 0x5b, 0x06, 0x32,
-	0x59, 0x4e, 0xcb, 0xc6, 0xfd, 0xc2, 0x81, 0x24, 0xe1, 0x17, 0xc8, 0x92, 0x7e, 0xe3, 0x97, 0xb9,
-	0xf4, 0x21, 0x2c, 0x8c, 0x2e, 0xf2, 0x95, 0xb8, 0x19, 0x17, 0xcb, 0xeb, 0x99, 0x62, 0x11, 0xe0,
-	0x0b, 0x90, 0x32, 0xae, 0xbf, 0x7a, 0xd2, 0x29, 0x69, 0x21, 0x6f, 0x16, 0x59, 0x88, 0x15, 0x4c,
-	0x58, 0xce, 0xba, 0x76, 0xde, 0xcc, 0x0a, 0x10, 0xdf, 0xbe, 0xbb, 0x85, 0x26, 0xe3, 0x8b, 0x64,
-	0xb5, 0xfb, 0xc4, 0x22, 0x19, 0x26, 0xc9, 0x45, 0x26, 0x34, 0xd5, 0xe0, 0x08, 0xa6, 0x1a, 0xaa,
-	0x92, 0x76, 0x8f, 0x85, 0xdf, 0x98, 0xac, 0x17, 0xb1, 0x3f, 0x87, 0xa5, 0x74, 0xfb, 0xa9, 0xc5,
-	0x9d, 0x53, 0x06, 0xf2, 0x3b, 0x05, 0x06, 0xa3, 0xf0, 0xf2, 0xdc, 0x57, 0x41, 0x03, 0xdd, 0xfb,
-	0xf8, 0xf4, 0x5c, 0x41, 0xcf, 0xce, 0x15, 0xf4, 0xfb, 0xb9, 0x82, 0xbe, 0xbb, 0x50, 0x4a, 0xcf,
-	0x2e, 0x94, 0xd2, 0xaf, 0x17, 0x4a, 0xe9, 0x41, 0xc3, 0x76, 0xfc, 0xa3, 0xfe, 0x81, 0x66, 0x52,
-	0x57, 0x77, 0x29, 0xc1, 0x9e, 0xd3, 0x0f, 0x1e, 0xac, 0x7e, 0x17, 0x6f, 0x13, 0x7a, 0xd0, 0xc5,
-	0xfa, 0xa0, 0xa1, 0x1f, 0xeb, 0xbc, 0xf1, 0xf8, 0x8f, 0x7a, 0x98, 0x1d, 0xcc, 0x87, 0x7f, 0xd9,
-	0xdf, 0xfb, 0x27, 0x00, 0x00, 0xff, 0xff, 0x30, 0x44, 0xa1, 0x90, 0x30, 0x10, 0x00, 0x00,
+	0xb4, 0x15, 0xb5, 0xdb, 0x20, 0x38, 0xe4, 0x82, 0x52, 0x38, 0xec, 0x1e, 0x22, 0xa4, 0x14, 0x09,
+	0x69, 0x25, 0xb4, 0xb8, 0xf6, 0xd4, 0xb5, 0x88, 0x67, 0x22, 0x8f, 0x93, 0xec, 0xde, 0x10, 0x27,
+	0x84, 0xf6, 0xc0, 0x9f, 0xb0, 0x47, 0x8e, 0x15, 0xda, 0x3f, 0x00, 0x71, 0x80, 0x1e, 0x57, 0x7b,
+	0x42, 0x1c, 0x2a, 0xd4, 0x1e, 0x8a, 0x38, 0x72, 0xe6, 0x80, 0x6c, 0x4f, 0xa6, 0xf1, 0x57, 0x5c,
+	0x41, 0x58, 0xf5, 0x12, 0xd9, 0xef, 0x6b, 0xde, 0xef, 0xcd, 0xf8, 0xcd, 0x0b, 0x48, 0x47, 0x5d,
+	0xea, 0x39, 0x44, 0x1f, 0xec, 0xe9, 0xfe, 0x43, 0xad, 0xe7, 0x51, 0x9f, 0x4a, 0x8b, 0x91, 0x4c,
+	0x1b, 0xec, 0xc9, 0x4b, 0x86, 0xeb, 0x10, 0xaa, 0x87, 0xbf, 0x91, 0x56, 0x5e, 0x35, 0x29, 0x73,
+	0x29, 0xd3, 0x5d, 0x66, 0x07, 0x5e, 0x2e, 0xb3, 0xb9, 0xe2, 0x4e, 0xa4, 0x78, 0x10, 0xbe, 0xe9,
+	0xd1, 0x0b, 0x57, 0x55, 0x6c, 0x6a, 0xd3, 0x48, 0x1e, 0x3c, 0x45, 0x52, 0xf5, 0x31, 0x02, 0xa9,
+	0xcd, 0xec, 0x96, 0x69, 0xe2, 0x9e, 0xff, 0xc9, 0x90, 0x60, 0x8f, 0x1d, 0x3b, 0x3d, 0xa9, 0x02,
+	0x73, 0x16, 0x26, 0xd4, 0xad, 0xa2, 0x3a, 0xda, 0x5c, 0xec, 0x44, 0x2f, 0xd2, 0x2e, 0xcc, 0x33,
+	0xc7, 0x26, 0xd8, 0xab, 0x96, 0x03, 0xf1, 0x7e, 0xf5, 0xf9, 0xd3, 0x9d, 0x0a, 0x5f, 0xa4, 0x65,
+	0x59, 0x1e, 0x66, 0xec, 0xc0, 0xf7, 0x1c, 0x62, 0x77, 0xb8, 0x5d, 0x53, 0xfb, 0xe6, 0x49, 0xad,
+	0xf4, 0xc7, 0x93, 0x5a, 0xe9, 0xeb, 0xcb, 0x93, 0x6d, 0x2e, 0xfc, 0xf6, 0xf2, 0x64, 0xfb, 0x36,
+	0x47, 0x4e, 0xac, 0xab, 0xae, 0x81, 0x9c, 0xce, 0xa6, 0x83, 0x59, 0x8f, 0x12, 0x86, 0xd5, 0x1f,
+	0x79, 0xb2, 0x96, 0xd5, 0xb2, 0x5c, 0x87, 0xb4, 0x4c, 0x93, 0xf6, 0x89, 0x3f, 0xad, 0x64, 0xa5,
+	0x06, 0x2c, 0x18, 0x51, 0xc8, 0xea, 0x4c, 0x81, 0xcb, 0xc8, 0xb0, 0x18, 0x30, 0x9e, 0xeb, 0x08,
+	0x30, 0x2e, 0x15, 0x80, 0x3f, 0x21, 0x58, 0x8e, 0xd4, 0x07, 0x8f, 0x98, 0x8f, 0xdd, 0x9b, 0x40,
+	0xa8, 0xe7, 0x10, 0xae, 0x5e, 0x11, 0xc6, 0x92, 0x55, 0xd7, 0xe1, 0x8d, 0x0c, 0x06, 0xc1, 0xf8,
+	0x03, 0x82, 0x57, 0x03, 0x7d, 0xb7, 0x4b, 0x87, 0x1f, 0x27, 0x38, 0xd0, 0x35, 0x39, 0x44, 0x3d,
+	0xca, 0xe3, 0xf5, 0xd0, 0x60, 0x8e, 0x06, 0x67, 0xa6, 0x90, 0x2d, 0x32, 0x6b, 0x6e, 0xe5, 0x90,
+	0x2d, 0x8d, 0xc8, 0x44, 0x8a, 0xea, 0x2a, 0xac, 0xc4, 0x72, 0x16, 0x34, 0x8f, 0xcb, 0xb0, 0xd0,
+	0x66, 0xf6, 0x7e, 0xdf, 0x23, 0x53, 0xdb, 0xa5, 0x77, 0x61, 0xf6, 0xc8, 0xa3, 0x6e, 0x21, 0x46,
+	0x68, 0x25, 0xdd, 0x85, 0x79, 0xc3, 0x0d, 0xb7, 0x74, 0x36, 0xb4, 0xdf, 0x3d, 0x3d, 0xab, 0x95,
+	0x7e, 0x3b, 0xab, 0xad, 0x44, 0x3e, 0xcc, 0xfa, 0x52, 0x73, 0xa8, 0xee, 0x1a, 0xfe, 0xb1, 0x76,
+	0x8f, 0xf8, 0xcf, 0x9f, 0xee, 0x00, 0x0f, 0x76, 0x8f, 0xf8, 0xdf, 0x5f, 0x9e, 0x6c, 0xa3, 0x0e,
+	0xf7, 0x97, 0xd6, 0x60, 0x31, 0xc8, 0xc0, 0xf0, 0xfb, 0x1e, 0xae, 0xce, 0xd5, 0xd1, 0xe6, 0x2b,
+	0x9d, 0x2b, 0x41, 0xf3, 0xad, 0x9c, 0x6a, 0xbd, 0xcc, 0xab, 0x15, 0x94, 0x40, 0x5d, 0x82, 0x5b,
+	0xbc, 0x1a, 0xa2, 0x42, 0x7f, 0xa2, 0xb0, 0x42, 0x6d, 0x67, 0x8a, 0xe7, 0x78, 0x13, 0xca, 0x3e,
+	0x2d, 0xac, 0x4f, 0xd9, 0xa7, 0xd3, 0xab, 0x4e, 0x21, 0x7f, 0x00, 0xc8, 0xf9, 0x83, 0x47, 0xc1,
+	0xff, 0x17, 0x02, 0x68, 0x33, 0xbb, 0x83, 0x4d, 0x3a, 0x18, 0x3f, 0xba, 0x2f, 0xf4, 0x90, 0x44,
+	0x05, 0x9b, 0xbd, 0x46, 0xc1, 0x26, 0x1f, 0x82, 0x8d, 0x9c, 0x22, 0xbc, 0xc6, 0x8b, 0xc0, 0x29,
+	0xd5, 0x4a, 0xd8, 0xa8, 0xf9, 0x9b, 0x28, 0xc5, 0xcf, 0x28, 0xfc, 0x8c, 0x3a, 0xd8, 0xa5, 0x03,
+	0x7c, 0x63, 0x5a, 0xf8, 0x5e, 0x0e, 0xd3, 0x1d, 0xc1, 0x94, 0x4c, 0x57, 0xad, 0xc1, 0x7a, 0x26,
+	0x87, 0x20, 0x3d, 0x45, 0x70, 0x5b, 0x58, 0xdc, 0x9c, 0x5e, 0xde, 0xc8, 0x41, 0x95, 0x63, 0xa8,
+	0xf1, 0x76, 0x5e, 0x07, 0x25, 0x9b, 0x44, 0xc0, 0x9e, 0x45, 0xb0, 0x07, 0xd8, 0x6f, 0x1b, 0x0f,
+	0x83, 0xb3, 0x1f, 0xf6, 0x49, 0x83, 0x98, 0x78, 0x6a, 0xb0, 0x57, 0x9f, 0xf1, 0xcc, 0x7f, 0xfc,
+	0x8c, 0x8b, 0x4a, 0x90, 0x41, 0xc1, 0x4b, 0x90, 0xa1, 0x19, 0xbf, 0x06, 0x96, 0xb9, 0xc9, 0xff,
+	0xc2, 0xff, 0x2f, 0x36, 0x7b, 0x8a, 0xad, 0xaf, 0x68, 0x04, 0x48, 0x62, 0xf3, 0x11, 0x20, 0x29,
+	0x16, 0xd5, 0xfa, 0x05, 0x41, 0xa5, 0xcd, 0xec, 0x4f, 0x3d, 0x83, 0xb0, 0x23, 0xec, 0x4d, 0x7d,
+	0xec, 0x94, 0xde, 0x87, 0x45, 0x82, 0x87, 0x0f, 0xae, 0x37, 0x0d, 0xbc, 0x44, 0xf0, 0x30, 0x4c,
+	0xa1, 0xb9, 0x9b, 0xc3, 0x59, 0xe5, 0x9c, 0xa9, 0x84, 0x55, 0x05, 0xd6, 0xb2, 0x40, 0x46, 0xa4,
+	0x8d, 0xbf, 0x17, 0x60, 0xa6, 0xcd, 0x6c, 0xe9, 0x33, 0xb8, 0x95, 0x1c, 0xb1, 0xd7, 0x35, 0x31,
+	0xe2, 0x6b, 0xe9, 0x99, 0x57, 0x7e, 0x7b, 0xa2, 0x7a, 0xb4, 0x40, 0x18, 0x38, 0x31, 0x0e, 0x27,
+	0x03, 0xc7, 0xd5, 0xa9, 0xc0, 0xd9, 0xa3, 0xa8, 0x74, 0x1f, 0x5e, 0x4f, 0x8d, 0xa1, 0x4a, 0xca,
+	0x35, 0xa6, 0x97, 0x37, 0x26, 0xeb, 0x45, 0xec, 0xbb, 0x00, 0x63, 0xe3, 0x5f, 0x35, 0xe1, 0x25,
+	0x34, 0x72, 0x3d, 0x4f, 0x23, 0x22, 0x7d, 0x00, 0xb3, 0xe1, 0xe8, 0x25, 0xc5, 0x2d, 0x03, 0x99,
+	0x2c, 0xa7, 0x65, 0xe3, 0x7e, 0xe1, 0x40, 0x92, 0xf0, 0x0b, 0x64, 0x49, 0xbf, 0xf1, 0xcb, 0x5c,
+	0xfa, 0x10, 0x16, 0x46, 0x17, 0xf9, 0x4a, 0xdc, 0x8c, 0x8b, 0xe5, 0xf5, 0x4c, 0xb1, 0x08, 0xf0,
+	0x05, 0x48, 0x19, 0xd7, 0x5f, 0x3d, 0xe9, 0x94, 0xb4, 0x90, 0x37, 0x8b, 0x2c, 0xc4, 0x0a, 0x26,
+	0x2c, 0x67, 0x5d, 0x3b, 0x6f, 0x66, 0x05, 0x88, 0x6f, 0xdf, 0x56, 0xa1, 0xc9, 0xf8, 0x22, 0x59,
+	0xed, 0x3e, 0xb1, 0x48, 0x86, 0x49, 0x72, 0x91, 0x09, 0x4d, 0x35, 0x38, 0x82, 0xa9, 0x86, 0xaa,
+	0xa4, 0xdd, 0x63, 0xe1, 0x37, 0x26, 0xeb, 0x45, 0xec, 0xcf, 0x61, 0x29, 0xdd, 0x7e, 0x6a, 0x71,
+	0xe7, 0x94, 0x81, 0xfc, 0x4e, 0x81, 0xc1, 0x28, 0xbc, 0x3c, 0xf7, 0x55, 0xd0, 0x40, 0xf7, 0x3f,
+	0x3a, 0x3d, 0x57, 0xd0, 0xb3, 0x73, 0x05, 0xfd, 0x7e, 0xae, 0xa0, 0xef, 0x2e, 0x94, 0xd2, 0xb3,
+	0x0b, 0xa5, 0xf4, 0xeb, 0x85, 0x52, 0xba, 0xbf, 0x65, 0x3b, 0xfe, 0x71, 0xff, 0x50, 0x33, 0xa9,
+	0xab, 0xbb, 0x94, 0x60, 0xcf, 0xe9, 0x07, 0x0f, 0x56, 0xbf, 0x8b, 0x77, 0x08, 0x3d, 0xec, 0x62,
+	0x7d, 0xd0, 0xd0, 0xfd, 0x47, 0x3d, 0xcc, 0x0e, 0xe7, 0xc3, 0x7f, 0xea, 0xef, 0xfd, 0x13, 0x00,
+	0x00, 0xff, 0xff, 0x34, 0x71, 0x5f, 0x34, 0x27, 0x10, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/utils/mocks/account.go b/utils/mocks/account.go
index 09485a25..151bc525 100644
--- a/utils/mocks/account.go
+++ b/utils/mocks/account.go
@@ -18,7 +18,7 @@ import (
 	"context"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/monerium/module-noble/v2/x/florin/types"
+	"github.com/monerium/module-noble/v2/types"
 )
 
 var _ types.AccountKeeper = AccountKeeper{}
diff --git a/utils/mocks/bank.go b/utils/mocks/bank.go
index ebd2bb15..64004f7a 100644
--- a/utils/mocks/bank.go
+++ b/utils/mocks/bank.go
@@ -22,7 +22,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/errors"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	"github.com/monerium/module-noble/v2/x/florin/types"
+	"github.com/monerium/module-noble/v2/types"
 )
 
 var _ types.BankKeeper = BankKeeper{}
diff --git a/utils/mocks/florin.go b/utils/mocks/florin.go
index 7ef911be..2f96aa5b 100644
--- a/utils/mocks/florin.go
+++ b/utils/mocks/florin.go
@@ -21,9 +21,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/runtime"
 	"github.com/cosmos/cosmos-sdk/testutil"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/monerium/module-noble/v2/x/florin"
-	"github.com/monerium/module-noble/v2/x/florin/keeper"
-	"github.com/monerium/module-noble/v2/x/florin/types"
+	"github.com/monerium/module-noble/v2"
+	"github.com/monerium/module-noble/v2/keeper"
+	"github.com/monerium/module-noble/v2/types"
 )
 
 func FlorinKeeper() (*keeper.Keeper, sdk.Context) {
diff --git a/x/florin/spec/.gitkeep b/x/florin/spec/.gitkeep
deleted file mode 100644
index e69de29b..00000000