diff --git a/x/macaroon/keeper/genesis.go b/x/macaroon/keeper/genesis.go
new file mode 100644
index 000000000..5247553be
--- /dev/null
+++ b/x/macaroon/keeper/genesis.go
@@ -0,0 +1,37 @@
+package keeper
+
+import (
+	"context"
+
+	"cosmossdk.io/log"
+
+	"github.com/onsonr/sonr/x/macaroon/types"
+)
+
+func (k Keeper) Logger() log.Logger {
+	return k.logger
+}
+
+// InitGenesis initializes the module's state from a genesis state.
+func (k *Keeper) InitGenesis(ctx context.Context, data *types.GenesisState) error {
+	// this line is used by starport scaffolding # genesis/module/init
+	if err := data.Params.Validate(); err != nil {
+		return err
+	}
+
+	return k.Params.Set(ctx, data.Params)
+}
+
+// ExportGenesis exports the module's state to a genesis state.
+func (k *Keeper) ExportGenesis(ctx context.Context) *types.GenesisState {
+	params, err := k.Params.Get(ctx)
+	if err != nil {
+		panic(err)
+	}
+
+	// this line is used by starport scaffolding # genesis/module/export
+
+	return &types.GenesisState{
+		Params: params,
+	}
+}
diff --git a/x/macaroon/keeper/keeper.go b/x/macaroon/keeper/keeper.go
index bd4ca63fe..44a19dcc5 100644
--- a/x/macaroon/keeper/keeper.go
+++ b/x/macaroon/keeper/keeper.go
@@ -1,17 +1,13 @@
 package keeper
 
 import (
-	"context"
-
-	"github.com/cosmos/cosmos-sdk/codec"
-
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
-
 	"cosmossdk.io/collections"
 	storetypes "cosmossdk.io/core/store"
 	"cosmossdk.io/log"
 	"cosmossdk.io/orm/model/ormdb"
+	"github.com/cosmos/cosmos-sdk/codec"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
 	apiv1 "github.com/onsonr/sonr/api/macaroon/v1"
 	"github.com/onsonr/sonr/x/macaroon/types"
@@ -74,31 +70,3 @@ func NewKeeper(
 
 	return k
 }
-
-func (k Keeper) Logger() log.Logger {
-	return k.logger
-}
-
-// InitGenesis initializes the module's state from a genesis state.
-func (k *Keeper) InitGenesis(ctx context.Context, data *types.GenesisState) error {
-	// this line is used by starport scaffolding # genesis/module/init
-	if err := data.Params.Validate(); err != nil {
-		return err
-	}
-
-	return k.Params.Set(ctx, data.Params)
-}
-
-// ExportGenesis exports the module's state to a genesis state.
-func (k *Keeper) ExportGenesis(ctx context.Context) *types.GenesisState {
-	params, err := k.Params.Get(ctx)
-	if err != nil {
-		panic(err)
-	}
-
-	// this line is used by starport scaffolding # genesis/module/export
-
-	return &types.GenesisState{
-		Params: params,
-	}
-}
diff --git a/x/oracle/keeper/genesis.go b/x/oracle/keeper/genesis.go
new file mode 100644
index 000000000..0269571cd
--- /dev/null
+++ b/x/oracle/keeper/genesis.go
@@ -0,0 +1,37 @@
+package keeper
+
+import (
+	"context"
+
+	"cosmossdk.io/log"
+
+	"github.com/onsonr/sonr/x/oracle/types"
+)
+
+func (k Keeper) Logger() log.Logger {
+	return k.logger
+}
+
+// InitGenesis initializes the module's state from a genesis state.
+func (k *Keeper) InitGenesis(ctx context.Context, data *types.GenesisState) error {
+	// this line is used by starport scaffolding # genesis/module/init
+	if err := data.Params.Validate(); err != nil {
+		return err
+	}
+
+	return k.Params.Set(ctx, data.Params)
+}
+
+// ExportGenesis exports the module's state to a genesis state.
+func (k *Keeper) ExportGenesis(ctx context.Context) *types.GenesisState {
+	params, err := k.Params.Get(ctx)
+	if err != nil {
+		panic(err)
+	}
+
+	// this line is used by starport scaffolding # genesis/module/export
+
+	return &types.GenesisState{
+		Params: params,
+	}
+}
diff --git a/x/oracle/keeper/keeper.go b/x/oracle/keeper/keeper.go
index 8c6cfa692..b763a988c 100644
--- a/x/oracle/keeper/keeper.go
+++ b/x/oracle/keeper/keeper.go
@@ -1,17 +1,13 @@
 package keeper
 
 import (
-	"context"
-
-	"github.com/cosmos/cosmos-sdk/codec"
-
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
-
 	"cosmossdk.io/collections"
 	storetypes "cosmossdk.io/core/store"
 	"cosmossdk.io/log"
 	"cosmossdk.io/orm/model/ormdb"
+	"github.com/cosmos/cosmos-sdk/codec"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
 	apiv1 "github.com/onsonr/sonr/api/oracle/v1"
 	"github.com/onsonr/sonr/x/oracle/types"
@@ -74,31 +70,3 @@ func NewKeeper(
 
 	return k
 }
-
-func (k Keeper) Logger() log.Logger {
-	return k.logger
-}
-
-// InitGenesis initializes the module's state from a genesis state.
-func (k *Keeper) InitGenesis(ctx context.Context, data *types.GenesisState) error {
-	// this line is used by starport scaffolding # genesis/module/init
-	if err := data.Params.Validate(); err != nil {
-		return err
-	}
-
-	return k.Params.Set(ctx, data.Params)
-}
-
-// ExportGenesis exports the module's state to a genesis state.
-func (k *Keeper) ExportGenesis(ctx context.Context) *types.GenesisState {
-	params, err := k.Params.Get(ctx)
-	if err != nil {
-		panic(err)
-	}
-
-	// this line is used by starport scaffolding # genesis/module/export
-
-	return &types.GenesisState{
-		Params: params,
-	}
-}
diff --git a/x/service/keeper/genesis.go b/x/service/keeper/genesis.go
new file mode 100644
index 000000000..9004983fd
--- /dev/null
+++ b/x/service/keeper/genesis.go
@@ -0,0 +1,37 @@
+package keeper
+
+import (
+	"context"
+
+	"cosmossdk.io/log"
+
+	"github.com/onsonr/sonr/x/service/types"
+)
+
+func (k Keeper) Logger() log.Logger {
+	return k.logger
+}
+
+// InitGenesis initializes the module's state from a genesis state.
+func (k *Keeper) InitGenesis(ctx context.Context, data *types.GenesisState) error {
+	// this line is used by starport scaffolding # genesis/module/init
+	if err := data.Params.Validate(); err != nil {
+		return err
+	}
+
+	return k.Params.Set(ctx, data.Params)
+}
+
+// ExportGenesis exports the module's state to a genesis state.
+func (k *Keeper) ExportGenesis(ctx context.Context) *types.GenesisState {
+	params, err := k.Params.Get(ctx)
+	if err != nil {
+		panic(err)
+	}
+
+	// this line is used by starport scaffolding # genesis/module/export
+
+	return &types.GenesisState{
+		Params: params,
+	}
+}
diff --git a/x/service/keeper/keeper.go b/x/service/keeper/keeper.go
index 7a9c8a145..75a598572 100644
--- a/x/service/keeper/keeper.go
+++ b/x/service/keeper/keeper.go
@@ -1,17 +1,13 @@
 package keeper
 
 import (
-	"context"
-
-	"github.com/cosmos/cosmos-sdk/codec"
-
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
-
 	"cosmossdk.io/collections"
 	storetypes "cosmossdk.io/core/store"
 	"cosmossdk.io/log"
 	"cosmossdk.io/orm/model/ormdb"
+	"github.com/cosmos/cosmos-sdk/codec"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
 	apiv1 "github.com/onsonr/sonr/api/service/v1"
 	"github.com/onsonr/sonr/x/service/types"
@@ -74,31 +70,3 @@ func NewKeeper(
 
 	return k
 }
-
-func (k Keeper) Logger() log.Logger {
-	return k.logger
-}
-
-// InitGenesis initializes the module's state from a genesis state.
-func (k *Keeper) InitGenesis(ctx context.Context, data *types.GenesisState) error {
-	// this line is used by starport scaffolding # genesis/module/init
-	if err := data.Params.Validate(); err != nil {
-		return err
-	}
-
-	return k.Params.Set(ctx, data.Params)
-}
-
-// ExportGenesis exports the module's state to a genesis state.
-func (k *Keeper) ExportGenesis(ctx context.Context) *types.GenesisState {
-	params, err := k.Params.Get(ctx)
-	if err != nil {
-		panic(err)
-	}
-
-	// this line is used by starport scaffolding # genesis/module/export
-
-	return &types.GenesisState{
-		Params: params,
-	}
-}