diff --git a/.golangci.yml b/.golangci.yml
index c9567f4b3b..8fb8a0084a 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -44,7 +44,7 @@ linters-settings:
     sections:
       - standard
       - default
-      - prefix(github.com/zeta-chain/zetacore)
+      - prefix(github.com/zeta-chain/node)
     skip-generated: true
 
 issues:
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index de42cf8b62..37cdbcb8c2 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -54,10 +54,10 @@ builds:
       - -X github.com/cosmos/cosmos-sdk/version.ClientName=zetaclientd
       - -X github.com/cosmos/cosmos-sdk/version.Version={{ .Version }}
       - -X github.com/cosmos/cosmos-sdk/version.Commit={{ .FullCommit }}
-      - -X github.com/zeta-chain/zetacore/pkg/constant.Name=zetacored
-      - -X github.com/zeta-chain/zetacore/pkg/constant.Version={{ .Version }}
-      - -X github.com/zeta-chain/zetacore/pkg/constant.CommitHash={{ .FullCommit }}
-      - -X github.com/zeta-chain/zetacore/pkg/constant.BuildTime={{ .Env.BUILDTIME }}
+      - -X github.com/zeta-chain/node/pkg/constant.Name=zetacored
+      - -X github.com/zeta-chain/node/pkg/constant.Version={{ .Version }}
+      - -X github.com/zeta-chain/node/pkg/constant.CommitHash={{ .FullCommit }}
+      - -X github.com/zeta-chain/node/pkg/constant.BuildTime={{ .Env.BUILDTIME }}
       - -X github.com/cosmos/cosmos-sdk/types.DBBackend=pebbledb
 
   - id: "zetaclientd"
diff --git a/Makefile b/Makefile
index aa4fcff5d0..13f238baab 100644
--- a/Makefile
+++ b/Makefile
@@ -18,10 +18,10 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=zetacore \
 	-X github.com/cosmos/cosmos-sdk/version.ClientName=zetaclientd \
 	-X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
 	-X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
-	-X github.com/zeta-chain/zetacore/pkg/constant.Name=zetacored \
-	-X github.com/zeta-chain/zetacore/pkg/constant.Version=$(VERSION) \
-	-X github.com/zeta-chain/zetacore/pkg/constant.CommitHash=$(COMMIT) \
-	-X github.com/zeta-chain/zetacore/pkg/constant.BuildTime=$(BUILDTIME) \
+	-X github.com/zeta-chain/node/pkg/constant.Name=zetacored \
+	-X github.com/zeta-chain/node/pkg/constant.Version=$(VERSION) \
+	-X github.com/zeta-chain/node/pkg/constant.CommitHash=$(COMMIT) \
+	-X github.com/zeta-chain/node/pkg/constant.BuildTime=$(BUILDTIME) \
 	-X github.com/cosmos/cosmos-sdk/types.DBBackend=pebbledb
 
 BUILD_FLAGS := -ldflags '$(ldflags)' -tags pebbledb,ledger
diff --git a/app/app.go b/app/app.go
index 9e9e5c3439..2fd39b020a 100644
--- a/app/app.go
+++ b/app/app.go
@@ -127,9 +127,9 @@ import (
 // ibctypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types"
 // ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 // ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
-// "github.com/zeta-chain/zetacore/x/ibccrosschain"
-// ibccrosschainkeeper "github.com/zeta-chain/zetacore/x/ibccrosschain/keeper"
-// ibccrosschaintypes "github.com/zeta-chain/zetacore/x/ibccrosschain/types"
+// "github.com/zeta-chain/node/x/ibccrosschain"
+// ibccrosschainkeeper "github.com/zeta-chain/node/x/ibccrosschain/keeper"
+// ibccrosschaintypes "github.com/zeta-chain/node/x/ibccrosschain/types"
 
 const Name = "zetacore"
 
diff --git a/proto/zetachain/zetacore/authority/authorization.proto b/proto/zetachain/zetacore/authority/authorization.proto
index 914b6b7528..33c2ccbdea 100644
--- a/proto/zetachain/zetacore/authority/authorization.proto
+++ b/proto/zetachain/zetacore/authority/authorization.proto
@@ -4,7 +4,7 @@ package zetachain.zetacore.authority;
 import "gogoproto/gogo.proto";
 import "zetachain/zetacore/authority/policies.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/authority/types";
+option go_package = "github.com/zeta-chain/node/x/authority/types";
 
 // Authorization defines the authorization required to access use a message
 // which needs special permissions
diff --git a/proto/zetachain/zetacore/authority/chain_info.proto b/proto/zetachain/zetacore/authority/chain_info.proto
index f417184b06..4a97fa737f 100644
--- a/proto/zetachain/zetacore/authority/chain_info.proto
+++ b/proto/zetachain/zetacore/authority/chain_info.proto
@@ -4,7 +4,7 @@ package zetachain.zetacore.authority;
 import "zetachain/zetacore/pkg/chains/chains.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/authority/types";
+option go_package = "github.com/zeta-chain/node/x/authority/types";
 
 // ChainInfo contains static information about the chains
 // This structure is used to dynamically update these info on a live network
diff --git a/proto/zetachain/zetacore/authority/genesis.proto b/proto/zetachain/zetacore/authority/genesis.proto
index 4f7b238aca..61842b27ed 100644
--- a/proto/zetachain/zetacore/authority/genesis.proto
+++ b/proto/zetachain/zetacore/authority/genesis.proto
@@ -6,7 +6,7 @@ import "zetachain/zetacore/authority/authorization.proto";
 import "zetachain/zetacore/authority/chain_info.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/authority/types";
+option go_package = "github.com/zeta-chain/node/x/authority/types";
 
 // GenesisState defines the authority module's genesis state.
 message GenesisState {
diff --git a/proto/zetachain/zetacore/authority/policies.proto b/proto/zetachain/zetacore/authority/policies.proto
index faefdbf2c7..d536d4065b 100644
--- a/proto/zetachain/zetacore/authority/policies.proto
+++ b/proto/zetachain/zetacore/authority/policies.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.authority;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/authority/types";
+option go_package = "github.com/zeta-chain/node/x/authority/types";
 
 // PolicyType defines the type of policy
 enum PolicyType {
diff --git a/proto/zetachain/zetacore/authority/query.proto b/proto/zetachain/zetacore/authority/query.proto
index 33431783a0..09da8079d6 100644
--- a/proto/zetachain/zetacore/authority/query.proto
+++ b/proto/zetachain/zetacore/authority/query.proto
@@ -8,7 +8,7 @@ import "cosmos/base/query/v1beta1/pagination.proto";
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/authority/types";
+option go_package = "github.com/zeta-chain/node/x/authority/types";
 
 // Query defines the gRPC querier service.
 service Query {
diff --git a/proto/zetachain/zetacore/authority/tx.proto b/proto/zetachain/zetacore/authority/tx.proto
index 29b1b44362..23d041198b 100644
--- a/proto/zetachain/zetacore/authority/tx.proto
+++ b/proto/zetachain/zetacore/authority/tx.proto
@@ -6,7 +6,7 @@ import "zetachain/zetacore/authority/chain_info.proto";
 import "zetachain/zetacore/authority/authorization.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/authority/types";
+option go_package = "github.com/zeta-chain/node/x/authority/types";
 
 // Msg defines the Msg service.
 service Msg {
diff --git a/proto/zetachain/zetacore/crosschain/cross_chain_tx.proto b/proto/zetachain/zetacore/crosschain/cross_chain_tx.proto
index 41028156c6..f8da0d0daa 100644
--- a/proto/zetachain/zetacore/crosschain/cross_chain_tx.proto
+++ b/proto/zetachain/zetacore/crosschain/cross_chain_tx.proto
@@ -6,7 +6,7 @@ import "zetachain/zetacore/pkg/coin/coin.proto";
 
 // TODO : fix the descriptor numbers for the fields
 //  https://github.com/zeta-chain/node/issues/1951
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 enum CctxStatus {
   option (gogoproto.goproto_enum_stringer) = true;
diff --git a/proto/zetachain/zetacore/crosschain/events.proto b/proto/zetachain/zetacore/crosschain/events.proto
index b39423fff4..311dbbfbca 100644
--- a/proto/zetachain/zetacore/crosschain/events.proto
+++ b/proto/zetachain/zetacore/crosschain/events.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.crosschain;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 message EventInboundFinalized {
   string msg_type_url = 1;
diff --git a/proto/zetachain/zetacore/crosschain/gas_price.proto b/proto/zetachain/zetacore/crosschain/gas_price.proto
index c6f0b7719d..dc5e83eae1 100644
--- a/proto/zetachain/zetacore/crosschain/gas_price.proto
+++ b/proto/zetachain/zetacore/crosschain/gas_price.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package zetachain.zetacore.crosschain;
 
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 message GasPrice {
   string creator = 1;
diff --git a/proto/zetachain/zetacore/crosschain/genesis.proto b/proto/zetachain/zetacore/crosschain/genesis.proto
index 7ffef701d5..97aa1d8dba 100644
--- a/proto/zetachain/zetacore/crosschain/genesis.proto
+++ b/proto/zetachain/zetacore/crosschain/genesis.proto
@@ -10,7 +10,7 @@ import "zetachain/zetacore/crosschain/outbound_tracker.proto";
 import "zetachain/zetacore/crosschain/rate_limiter_flags.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 // GenesisState defines the crosschain module's genesis state.
 message GenesisState {
diff --git a/proto/zetachain/zetacore/crosschain/inbound_hash_to_cctx.proto b/proto/zetachain/zetacore/crosschain/inbound_hash_to_cctx.proto
index 1a0d23089e..d793983d9d 100644
--- a/proto/zetachain/zetacore/crosschain/inbound_hash_to_cctx.proto
+++ b/proto/zetachain/zetacore/crosschain/inbound_hash_to_cctx.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package zetachain.zetacore.crosschain;
 
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 message InboundHashToCctx {
   string inbound_hash = 1;
diff --git a/proto/zetachain/zetacore/crosschain/inbound_tracker.proto b/proto/zetachain/zetacore/crosschain/inbound_tracker.proto
index b90bcb28ea..7376d18ef9 100644
--- a/proto/zetachain/zetacore/crosschain/inbound_tracker.proto
+++ b/proto/zetachain/zetacore/crosschain/inbound_tracker.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.crosschain;
 
 import "zetachain/zetacore/pkg/coin/coin.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 message InboundTracker {
   int64 chain_id = 1;
diff --git a/proto/zetachain/zetacore/crosschain/last_block_height.proto b/proto/zetachain/zetacore/crosschain/last_block_height.proto
index ed257c33ea..dcffab7f78 100644
--- a/proto/zetachain/zetacore/crosschain/last_block_height.proto
+++ b/proto/zetachain/zetacore/crosschain/last_block_height.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package zetachain.zetacore.crosschain;
 
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 message LastBlockHeight {
   string creator = 1;
diff --git a/proto/zetachain/zetacore/crosschain/outbound_tracker.proto b/proto/zetachain/zetacore/crosschain/outbound_tracker.proto
index 2599a0c7da..4f5b6108b8 100644
--- a/proto/zetachain/zetacore/crosschain/outbound_tracker.proto
+++ b/proto/zetachain/zetacore/crosschain/outbound_tracker.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package zetachain.zetacore.crosschain;
 
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 message TxHash {
   string tx_hash = 1;
diff --git a/proto/zetachain/zetacore/crosschain/query.proto b/proto/zetachain/zetacore/crosschain/query.proto
index da1786cc6e..9d2bc8c20b 100644
--- a/proto/zetachain/zetacore/crosschain/query.proto
+++ b/proto/zetachain/zetacore/crosschain/query.proto
@@ -12,7 +12,7 @@ import "zetachain/zetacore/crosschain/rate_limiter_flags.proto";
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 // Query defines the gRPC querier service.
 service Query {
diff --git a/proto/zetachain/zetacore/crosschain/rate_limiter_flags.proto b/proto/zetachain/zetacore/crosschain/rate_limiter_flags.proto
index b073aa46b4..3defcf621f 100644
--- a/proto/zetachain/zetacore/crosschain/rate_limiter_flags.proto
+++ b/proto/zetachain/zetacore/crosschain/rate_limiter_flags.proto
@@ -4,7 +4,7 @@ package zetachain.zetacore.crosschain;
 import "gogoproto/gogo.proto";
 import "zetachain/zetacore/pkg/coin/coin.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 message RateLimiterFlags {
   bool enabled = 1;
diff --git a/proto/zetachain/zetacore/crosschain/tx.proto b/proto/zetachain/zetacore/crosschain/tx.proto
index a34ff32fb9..e5d310976d 100644
--- a/proto/zetachain/zetacore/crosschain/tx.proto
+++ b/proto/zetachain/zetacore/crosschain/tx.proto
@@ -8,7 +8,7 @@ import "zetachain/zetacore/pkg/proofs/proofs.proto";
 import "zetachain/zetacore/crosschain/rate_limiter_flags.proto";
 import "zetachain/zetacore/crosschain/cross_chain_tx.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/crosschain/types";
+option go_package = "github.com/zeta-chain/node/x/crosschain/types";
 
 // Msg defines the Msg service.
 service Msg {
diff --git a/proto/zetachain/zetacore/emissions/events.proto b/proto/zetachain/zetacore/emissions/events.proto
index 899afadcc2..6b6d120808 100644
--- a/proto/zetachain/zetacore/emissions/events.proto
+++ b/proto/zetachain/zetacore/emissions/events.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.emissions;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/emissions/types";
+option go_package = "github.com/zeta-chain/node/x/emissions/types";
 
 enum EmissionType {
   option (gogoproto.goproto_enum_stringer) = true;
diff --git a/proto/zetachain/zetacore/emissions/genesis.proto b/proto/zetachain/zetacore/emissions/genesis.proto
index f9a7fa0ca4..d895064641 100644
--- a/proto/zetachain/zetacore/emissions/genesis.proto
+++ b/proto/zetachain/zetacore/emissions/genesis.proto
@@ -5,7 +5,7 @@ import "zetachain/zetacore/emissions/params.proto";
 import "zetachain/zetacore/emissions/withdrawable_emissions.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/emissions/types";
+option go_package = "github.com/zeta-chain/node/x/emissions/types";
 
 // GenesisState defines the emissions module's genesis state.
 message GenesisState {
diff --git a/proto/zetachain/zetacore/emissions/params.proto b/proto/zetachain/zetacore/emissions/params.proto
index 26f0fb5464..53aef8d9e0 100644
--- a/proto/zetachain/zetacore/emissions/params.proto
+++ b/proto/zetachain/zetacore/emissions/params.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.emissions;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/emissions/types";
+option go_package = "github.com/zeta-chain/node/x/emissions/types";
 
 // Params defines the parameters for the module.
 message Params {
diff --git a/proto/zetachain/zetacore/emissions/query.proto b/proto/zetachain/zetacore/emissions/query.proto
index 64d1a3ccca..4fc78af850 100644
--- a/proto/zetachain/zetacore/emissions/query.proto
+++ b/proto/zetachain/zetacore/emissions/query.proto
@@ -6,7 +6,7 @@ import "zetachain/zetacore/emissions/params.proto";
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/emissions/types";
+option go_package = "github.com/zeta-chain/node/x/emissions/types";
 
 // Query defines the gRPC querier service.
 service Query {
diff --git a/proto/zetachain/zetacore/emissions/tx.proto b/proto/zetachain/zetacore/emissions/tx.proto
index 347be273c1..76742c6127 100644
--- a/proto/zetachain/zetacore/emissions/tx.proto
+++ b/proto/zetachain/zetacore/emissions/tx.proto
@@ -4,7 +4,7 @@ package zetachain.zetacore.emissions;
 import "zetachain/zetacore/emissions/params.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/emissions/types";
+option go_package = "github.com/zeta-chain/node/x/emissions/types";
 
 // Msg defines the Msg service.
 service Msg {
diff --git a/proto/zetachain/zetacore/emissions/withdrawable_emissions.proto b/proto/zetachain/zetacore/emissions/withdrawable_emissions.proto
index 9af2d5569b..f552a20640 100644
--- a/proto/zetachain/zetacore/emissions/withdrawable_emissions.proto
+++ b/proto/zetachain/zetacore/emissions/withdrawable_emissions.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.emissions;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/emissions/types";
+option go_package = "github.com/zeta-chain/node/x/emissions/types";
 
 message WithdrawableEmissions {
   string address = 1;
diff --git a/proto/zetachain/zetacore/fungible/events.proto b/proto/zetachain/zetacore/fungible/events.proto
index 02a686aad8..f27c28b5c8 100644
--- a/proto/zetachain/zetacore/fungible/events.proto
+++ b/proto/zetachain/zetacore/fungible/events.proto
@@ -5,7 +5,7 @@ import "zetachain/zetacore/fungible/tx.proto";
 import "gogoproto/gogo.proto";
 import "zetachain/zetacore/pkg/coin/coin.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/fungible/types";
+option go_package = "github.com/zeta-chain/node/x/fungible/types";
 
 message EventSystemContractUpdated {
   string msg_type_url = 1;
diff --git a/proto/zetachain/zetacore/fungible/foreign_coins.proto b/proto/zetachain/zetacore/fungible/foreign_coins.proto
index d82bbabdb2..db996ef17a 100644
--- a/proto/zetachain/zetacore/fungible/foreign_coins.proto
+++ b/proto/zetachain/zetacore/fungible/foreign_coins.proto
@@ -4,7 +4,7 @@ package zetachain.zetacore.fungible;
 import "gogoproto/gogo.proto";
 import "zetachain/zetacore/pkg/coin/coin.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/fungible/types";
+option go_package = "github.com/zeta-chain/node/x/fungible/types";
 
 message ForeignCoins {
   //  string index = 1;
diff --git a/proto/zetachain/zetacore/fungible/genesis.proto b/proto/zetachain/zetacore/fungible/genesis.proto
index de4e87a336..1be1161326 100644
--- a/proto/zetachain/zetacore/fungible/genesis.proto
+++ b/proto/zetachain/zetacore/fungible/genesis.proto
@@ -5,7 +5,7 @@ import "zetachain/zetacore/fungible/foreign_coins.proto";
 import "zetachain/zetacore/fungible/system_contract.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/fungible/types";
+option go_package = "github.com/zeta-chain/node/x/fungible/types";
 
 // GenesisState defines the fungible module's genesis state.
 message GenesisState {
diff --git a/proto/zetachain/zetacore/fungible/query.proto b/proto/zetachain/zetacore/fungible/query.proto
index 150ef50b6b..49e6200307 100644
--- a/proto/zetachain/zetacore/fungible/query.proto
+++ b/proto/zetachain/zetacore/fungible/query.proto
@@ -7,7 +7,7 @@ import "zetachain/zetacore/fungible/system_contract.proto";
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/fungible/types";
+option go_package = "github.com/zeta-chain/node/x/fungible/types";
 
 // Query defines the gRPC querier service.
 service Query {
diff --git a/proto/zetachain/zetacore/fungible/system_contract.proto b/proto/zetachain/zetacore/fungible/system_contract.proto
index d9dca7f71a..c52b82b931 100644
--- a/proto/zetachain/zetacore/fungible/system_contract.proto
+++ b/proto/zetachain/zetacore/fungible/system_contract.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.fungible;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/fungible/types";
+option go_package = "github.com/zeta-chain/node/x/fungible/types";
 
 message SystemContract {
   string system_contract = 1;
diff --git a/proto/zetachain/zetacore/fungible/tx.proto b/proto/zetachain/zetacore/fungible/tx.proto
index 33ab8e7a7a..69be3bf7a4 100644
--- a/proto/zetachain/zetacore/fungible/tx.proto
+++ b/proto/zetachain/zetacore/fungible/tx.proto
@@ -4,7 +4,7 @@ package zetachain.zetacore.fungible;
 import "gogoproto/gogo.proto";
 import "zetachain/zetacore/pkg/coin/coin.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/fungible/types";
+option go_package = "github.com/zeta-chain/node/x/fungible/types";
 
 // Msg defines the Msg service.
 service Msg {
diff --git a/proto/zetachain/zetacore/ibccrosschain/genesis.proto b/proto/zetachain/zetacore/ibccrosschain/genesis.proto
index 7190e7bf54..0d18d13633 100644
--- a/proto/zetachain/zetacore/ibccrosschain/genesis.proto
+++ b/proto/zetachain/zetacore/ibccrosschain/genesis.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.ibccrosschain;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/ibccrosschain/types";
+option go_package = "github.com/zeta-chain/node/x/ibccrosschain/types";
 
 // GenesisState defines the ibccrosschain module's genesis state.
 message GenesisState {}
diff --git a/proto/zetachain/zetacore/ibccrosschain/query.proto b/proto/zetachain/zetacore/ibccrosschain/query.proto
index cc2cfc577d..340cbf4cb2 100644
--- a/proto/zetachain/zetacore/ibccrosschain/query.proto
+++ b/proto/zetachain/zetacore/ibccrosschain/query.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package zetachain.zetacore.ibccrosschain;
 
-option go_package = "github.com/zeta-chain/zetacore/x/ibccrosschain/types";
+option go_package = "github.com/zeta-chain/node/x/ibccrosschain/types";
 
 // Query defines the gRPC querier service.
 service Query {}
\ No newline at end of file
diff --git a/proto/zetachain/zetacore/ibccrosschain/tx.proto b/proto/zetachain/zetacore/ibccrosschain/tx.proto
index 54ea972a0c..a7e5174446 100644
--- a/proto/zetachain/zetacore/ibccrosschain/tx.proto
+++ b/proto/zetachain/zetacore/ibccrosschain/tx.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.ibccrosschain;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/ibccrosschain/types";
+option go_package = "github.com/zeta-chain/node/x/ibccrosschain/types";
 
 // Msg defines the Msg service.
 service Msg {}
diff --git a/proto/zetachain/zetacore/lightclient/block_header_verification.proto b/proto/zetachain/zetacore/lightclient/block_header_verification.proto
index 44613e550e..cb76d219f4 100644
--- a/proto/zetachain/zetacore/lightclient/block_header_verification.proto
+++ b/proto/zetachain/zetacore/lightclient/block_header_verification.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.lightclient;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/lightclient/types";
+option go_package = "github.com/zeta-chain/node/x/lightclient/types";
 
 // HeaderSupportedChain is a structure containing information of weather a chain
 // is enabled or not for block header verification
diff --git a/proto/zetachain/zetacore/lightclient/chain_state.proto b/proto/zetachain/zetacore/lightclient/chain_state.proto
index 9d27e399b7..25cb3a395a 100644
--- a/proto/zetachain/zetacore/lightclient/chain_state.proto
+++ b/proto/zetachain/zetacore/lightclient/chain_state.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.lightclient;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/lightclient/types";
+option go_package = "github.com/zeta-chain/node/x/lightclient/types";
 
 // ChainState defines the overall state of the block headers for a given chain
 message ChainState {
diff --git a/proto/zetachain/zetacore/lightclient/genesis.proto b/proto/zetachain/zetacore/lightclient/genesis.proto
index 67dc419e6b..8a1795971b 100644
--- a/proto/zetachain/zetacore/lightclient/genesis.proto
+++ b/proto/zetachain/zetacore/lightclient/genesis.proto
@@ -6,7 +6,7 @@ import "zetachain/zetacore/lightclient/block_header_verification.proto";
 import "zetachain/zetacore/lightclient/chain_state.proto";
 import "zetachain/zetacore/pkg/proofs/proofs.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/lightclient/types";
+option go_package = "github.com/zeta-chain/node/x/lightclient/types";
 
 // GenesisState defines the lightclient module's genesis state.
 message GenesisState {
diff --git a/proto/zetachain/zetacore/lightclient/query.proto b/proto/zetachain/zetacore/lightclient/query.proto
index 41c19823ee..d692d98eb3 100644
--- a/proto/zetachain/zetacore/lightclient/query.proto
+++ b/proto/zetachain/zetacore/lightclient/query.proto
@@ -8,7 +8,7 @@ import "zetachain/zetacore/lightclient/block_header_verification.proto";
 import "zetachain/zetacore/lightclient/chain_state.proto";
 import "zetachain/zetacore/pkg/proofs/proofs.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/lightclient/types";
+option go_package = "github.com/zeta-chain/node/x/lightclient/types";
 
 // Query defines the gRPC querier service.
 service Query {
diff --git a/proto/zetachain/zetacore/lightclient/tx.proto b/proto/zetachain/zetacore/lightclient/tx.proto
index 463055b533..02ee8c5c6b 100644
--- a/proto/zetachain/zetacore/lightclient/tx.proto
+++ b/proto/zetachain/zetacore/lightclient/tx.proto
@@ -4,7 +4,7 @@ package zetachain.zetacore.lightclient;
 import "gogoproto/gogo.proto";
 import "zetachain/zetacore/lightclient/block_header_verification.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/lightclient/types";
+option go_package = "github.com/zeta-chain/node/x/lightclient/types";
 
 // Msg defines the Msg service.
 service Msg {
diff --git a/proto/zetachain/zetacore/observer/ballot.proto b/proto/zetachain/zetacore/observer/ballot.proto
index 7b25e03910..8281572ad7 100644
--- a/proto/zetachain/zetacore/observer/ballot.proto
+++ b/proto/zetachain/zetacore/observer/ballot.proto
@@ -4,7 +4,7 @@ package zetachain.zetacore.observer;
 import "gogoproto/gogo.proto";
 import "zetachain/zetacore/observer/observer.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
+option go_package = "github.com/zeta-chain/node/x/observer/types";
 
 enum VoteType {
   option (gogoproto.goproto_enum_stringer) = true;
diff --git a/proto/zetachain/zetacore/observer/blame.proto b/proto/zetachain/zetacore/observer/blame.proto
index 8894b2ce0d..ac5cd7a8ee 100644
--- a/proto/zetachain/zetacore/observer/blame.proto
+++ b/proto/zetachain/zetacore/observer/blame.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.observer;
 
 import "zetachain/zetacore/observer/observer.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
+option go_package = "github.com/zeta-chain/node/x/observer/types";
 
 message Node {
   string pub_key = 1;
diff --git a/proto/zetachain/zetacore/observer/chain_nonces.proto b/proto/zetachain/zetacore/observer/chain_nonces.proto
index 86288508d3..f20a0e3067 100644
--- a/proto/zetachain/zetacore/observer/chain_nonces.proto
+++ b/proto/zetachain/zetacore/observer/chain_nonces.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.observer;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
+option go_package = "github.com/zeta-chain/node/x/observer/types";
 
 message ChainNonces {
   string creator = 1;
diff --git a/proto/zetachain/zetacore/observer/crosschain_flags.proto b/proto/zetachain/zetacore/observer/crosschain_flags.proto
index 32d1fbd318..3105c1ced1 100644
--- a/proto/zetachain/zetacore/observer/crosschain_flags.proto
+++ b/proto/zetachain/zetacore/observer/crosschain_flags.proto
@@ -4,7 +4,7 @@ package zetachain.zetacore.observer;
 import "gogoproto/gogo.proto";
 import "google/protobuf/duration.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
+option go_package = "github.com/zeta-chain/node/x/observer/types";
 
 message GasPriceIncreaseFlags {
   int64 epochLength = 1;
diff --git a/proto/zetachain/zetacore/observer/events.proto b/proto/zetachain/zetacore/observer/events.proto
index a939daafa1..ea2e0fc38a 100644
--- a/proto/zetachain/zetacore/observer/events.proto
+++ b/proto/zetachain/zetacore/observer/events.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "zetachain/zetacore/observer/crosschain_flags.proto";
 import "zetachain/zetacore/observer/observer.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
+option go_package = "github.com/zeta-chain/node/x/observer/types";
 
 message EventBallotCreated {
   string msg_type_url = 1;
diff --git a/proto/zetachain/zetacore/observer/genesis.proto b/proto/zetachain/zetacore/observer/genesis.proto
index 281c32f12a..e9af1fc51a 100644
--- a/proto/zetachain/zetacore/observer/genesis.proto
+++ b/proto/zetachain/zetacore/observer/genesis.proto
@@ -15,7 +15,7 @@ import "zetachain/zetacore/observer/pending_nonces.proto";
 import "zetachain/zetacore/observer/tss.proto";
 import "zetachain/zetacore/observer/tss_funds_migrator.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
+option go_package = "github.com/zeta-chain/node/x/observer/types";
 
 message GenesisState {
   repeated Ballot ballots = 1;
diff --git a/proto/zetachain/zetacore/observer/keygen.proto b/proto/zetachain/zetacore/observer/keygen.proto
index 9368f221fc..a0e5098db2 100644
--- a/proto/zetachain/zetacore/observer/keygen.proto
+++ b/proto/zetachain/zetacore/observer/keygen.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.observer;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
+option go_package = "github.com/zeta-chain/node/x/observer/types";
 
 enum KeygenStatus {
   option (gogoproto.goproto_enum_stringer) = true;
diff --git a/proto/zetachain/zetacore/observer/node_account.proto b/proto/zetachain/zetacore/observer/node_account.proto
index 3849983634..47a4eade4c 100644
--- a/proto/zetachain/zetacore/observer/node_account.proto
+++ b/proto/zetachain/zetacore/observer/node_account.proto
@@ -4,7 +4,7 @@ package zetachain.zetacore.observer;
 import "gogoproto/gogo.proto";
 import "zetachain/zetacore/pkg/crypto/crypto.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
+option go_package = "github.com/zeta-chain/node/x/observer/types";
 
 enum NodeStatus {
   option (gogoproto.goproto_enum_stringer) = true;
diff --git a/proto/zetachain/zetacore/observer/nonce_to_cctx.proto b/proto/zetachain/zetacore/observer/nonce_to_cctx.proto
index 947e9c6f35..8a3cd056ea 100644
--- a/proto/zetachain/zetacore/observer/nonce_to_cctx.proto
+++ b/proto/zetachain/zetacore/observer/nonce_to_cctx.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.observer;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
+option go_package = "github.com/zeta-chain/node/x/observer/types";
 
 // store key is tss+chainid+nonce
 message NonceToCctx {
diff --git a/proto/zetachain/zetacore/observer/observer.proto b/proto/zetachain/zetacore/observer/observer.proto
index 7fc6eb5b7b..cba94e8cec 100644
--- a/proto/zetachain/zetacore/observer/observer.proto
+++ b/proto/zetachain/zetacore/observer/observer.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.observer;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
+option go_package = "github.com/zeta-chain/node/x/observer/types";
 
 enum ObservationType {
   option (gogoproto.goproto_enum_stringer) = true;
diff --git a/proto/zetachain/zetacore/observer/params.proto b/proto/zetachain/zetacore/observer/params.proto
index c0c732b705..8b237b2c8e 100644
--- a/proto/zetachain/zetacore/observer/params.proto
+++ b/proto/zetachain/zetacore/observer/params.proto
@@ -4,7 +4,7 @@ package zetachain.zetacore.observer;
 import "gogoproto/gogo.proto";
 import "zetachain/zetacore/observer/observer.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
+option go_package = "github.com/zeta-chain/node/x/observer/types";
 
 message ChainParamsList { repeated ChainParams chain_params = 1; }
 
diff --git a/proto/zetachain/zetacore/observer/pending_nonces.proto b/proto/zetachain/zetacore/observer/pending_nonces.proto
index e733843d01..de6ce9fa82 100644
--- a/proto/zetachain/zetacore/observer/pending_nonces.proto
+++ b/proto/zetachain/zetacore/observer/pending_nonces.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.observer;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
+option go_package = "github.com/zeta-chain/node/x/observer/types";
 
 // store key is tss+chainid
 message PendingNonces {
diff --git a/proto/zetachain/zetacore/observer/query.proto b/proto/zetachain/zetacore/observer/query.proto
index 9283b742fa..65d5afb7b1 100644
--- a/proto/zetachain/zetacore/observer/query.proto
+++ b/proto/zetachain/zetacore/observer/query.proto
@@ -18,7 +18,7 @@ import "zetachain/zetacore/pkg/chains/chains.proto";
 import "zetachain/zetacore/pkg/proofs/proofs.proto";
 import "zetachain/zetacore/observer/tss_funds_migrator.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
+option go_package = "github.com/zeta-chain/node/x/observer/types";
 
 // Query defines the gRPC querier service.
 service Query {
diff --git a/proto/zetachain/zetacore/observer/tss.proto b/proto/zetachain/zetacore/observer/tss.proto
index 62d2cdcbad..e938e55614 100644
--- a/proto/zetachain/zetacore/observer/tss.proto
+++ b/proto/zetachain/zetacore/observer/tss.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.observer;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
+option go_package = "github.com/zeta-chain/node/x/observer/types";
 
 message TSS {
   string tss_pubkey = 3;
diff --git a/proto/zetachain/zetacore/observer/tss_funds_migrator.proto b/proto/zetachain/zetacore/observer/tss_funds_migrator.proto
index f757057eff..7e454cbb67 100644
--- a/proto/zetachain/zetacore/observer/tss_funds_migrator.proto
+++ b/proto/zetachain/zetacore/observer/tss_funds_migrator.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.observer;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
+option go_package = "github.com/zeta-chain/node/x/observer/types";
 
 message TssFundMigratorInfo {
   int64 chain_id = 1;
diff --git a/proto/zetachain/zetacore/observer/tx.proto b/proto/zetachain/zetacore/observer/tx.proto
index d5ad32e590..4086bb7e52 100644
--- a/proto/zetachain/zetacore/observer/tx.proto
+++ b/proto/zetachain/zetacore/observer/tx.proto
@@ -11,7 +11,7 @@ import "zetachain/zetacore/observer/tss.proto";
 import "zetachain/zetacore/pkg/chains/chains.proto";
 import "zetachain/zetacore/pkg/proofs/proofs.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
+option go_package = "github.com/zeta-chain/node/x/observer/types";
 
 // Msg defines the Msg service.
 service Msg {
diff --git a/proto/zetachain/zetacore/pkg/chains/chains.proto b/proto/zetachain/zetacore/pkg/chains/chains.proto
index be1ed79848..63b146cf42 100644
--- a/proto/zetachain/zetacore/pkg/chains/chains.proto
+++ b/proto/zetachain/zetacore/pkg/chains/chains.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.pkg.chains;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/pkg/chains";
+option go_package = "github.com/zeta-chain/node/pkg/chains";
 
 // ReceiveStatus represents the status of an outbound
 // TODO: Rename and move
diff --git a/proto/zetachain/zetacore/pkg/coin/coin.proto b/proto/zetachain/zetacore/pkg/coin/coin.proto
index e80fb4abb0..33d265d773 100644
--- a/proto/zetachain/zetacore/pkg/coin/coin.proto
+++ b/proto/zetachain/zetacore/pkg/coin/coin.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.pkg.coin;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/pkg/coin";
+option go_package = "github.com/zeta-chain/node/pkg/coin";
 
 enum CoinType {
   option (gogoproto.goproto_enum_stringer) = true;
diff --git a/proto/zetachain/zetacore/pkg/crypto/crypto.proto b/proto/zetachain/zetacore/pkg/crypto/crypto.proto
index 2c1154cc50..14ad382b37 100644
--- a/proto/zetachain/zetacore/pkg/crypto/crypto.proto
+++ b/proto/zetachain/zetacore/pkg/crypto/crypto.proto
@@ -3,7 +3,7 @@ package zetachain.zetacore.pkg.crypto;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/pkg/crypto";
+option go_package = "github.com/zeta-chain/node/pkg/crypto";
 
 // PubKeySet contains two pub keys , secp256k1 and ed25519
 message PubKeySet {
diff --git a/proto/zetachain/zetacore/pkg/proofs/bitcoin/bitcoin.proto b/proto/zetachain/zetacore/pkg/proofs/bitcoin/bitcoin.proto
index f1af119edd..24890adfbd 100644
--- a/proto/zetachain/zetacore/pkg/proofs/bitcoin/bitcoin.proto
+++ b/proto/zetachain/zetacore/pkg/proofs/bitcoin/bitcoin.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package zetachain.zetacore.pkg.proofs.bitcoin;
 
-option go_package = "github.com/zeta-chain/zetacore/pkg/proofs/bitcoin";
+option go_package = "github.com/zeta-chain/node/pkg/proofs/bitcoin";
 
 message Proof {
   bytes tx_bytes = 1;
diff --git a/proto/zetachain/zetacore/pkg/proofs/ethereum/ethereum.proto b/proto/zetachain/zetacore/pkg/proofs/ethereum/ethereum.proto
index dcece6b249..1d5063e716 100644
--- a/proto/zetachain/zetacore/pkg/proofs/ethereum/ethereum.proto
+++ b/proto/zetachain/zetacore/pkg/proofs/ethereum/ethereum.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package zetachain.zetacore.pkg.proofs.ethereum;
 
-option go_package = "github.com/zeta-chain/zetacore/pkg/proofs/ethereum";
+option go_package = "github.com/zeta-chain/node/pkg/proofs/ethereum";
 
 message Proof {
   repeated bytes keys = 1;
diff --git a/proto/zetachain/zetacore/pkg/proofs/proofs.proto b/proto/zetachain/zetacore/pkg/proofs/proofs.proto
index 8a269918b1..271eabd5b1 100644
--- a/proto/zetachain/zetacore/pkg/proofs/proofs.proto
+++ b/proto/zetachain/zetacore/pkg/proofs/proofs.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "zetachain/zetacore/pkg/proofs/bitcoin/bitcoin.proto";
 import "zetachain/zetacore/pkg/proofs/ethereum/ethereum.proto";
 
-option go_package = "github.com/zeta-chain/zetacore/pkg/proofs";
+option go_package = "github.com/zeta-chain/node/pkg/proofs";
 
 message BlockHeader {
   int64 height = 1;
diff --git a/rpc/apis.go b/rpc/apis.go
index 8a9ed53bf1..5beb4a1212 100644
--- a/rpc/apis.go
+++ b/rpc/apis.go
@@ -12,7 +12,7 @@
 // GNU Lesser General Public License for more details.
 //
 // You should have received a copy of the GNU Lesser General Public License
-// along with the Ethermint library. If not, see https://github.com/zeta-chain/zetacore/blob/main/LICENSE
+// along with the Ethermint library. If not, see https://github.com/zeta-chain/node/blob/main/LICENSE
 package rpc
 
 import (
diff --git a/scripts/protoc-gen-go.sh b/scripts/protoc-gen-go.sh
index 819f5769db..9893ca9d6d 100755
--- a/scripts/protoc-gen-go.sh
+++ b/scripts/protoc-gen-go.sh
@@ -18,5 +18,5 @@ done
 cd ..
 
 # Move proto files to the right places.
-cp -r github.com/zeta-chain/zetacore/* ./
+cp -r github.com/zeta-chain/node/* ./
 rm -rf github.com
\ No newline at end of file
diff --git a/x/fungible/client/cli/query_foreign_coins_test.go b/x/fungible/client/cli/query_foreign_coins_test.go
index b2e2602f7c..dac3181acf 100644
--- a/x/fungible/client/cli/query_foreign_coins_test.go
+++ b/x/fungible/client/cli/query_foreign_coins_test.go
@@ -13,10 +13,10 @@ package cli_test
 //	"google.golang.org/grpc/codes"
 //	"google.golang.org/grpc/status"
 //
-//	"github.com/zeta-chain/zetacore/testutil/network"
-//	"github.com/zeta-chain/zetacore/testutil/nullify"
-//	"github.com/zeta-chain/zetacore/x/fungible/client/cli"
-//	"github.com/zeta-chain/zetacore/x/fungible/types"
+//	"github.com/zeta-chain/node/testutil/network"
+//	"github.com/zeta-chain/node/testutil/nullify"
+//	"github.com/zeta-chain/node/x/fungible/client/cli"
+//	"github.com/zeta-chain/node/x/fungible/types"
 //)
 //
 //// Prevent strconv unused error