diff --git a/gravity-restaking/src/lib.rs b/gravity-restaking/src/lib.rs
index db660df..d984e64 100644
--- a/gravity-restaking/src/lib.rs
+++ b/gravity-restaking/src/lib.rs
@@ -2,22 +2,18 @@
 
 multiversx_sc::imports!();
 
-pub mod call_delegation;
-pub mod common_actions;
-pub mod sovereign;
 pub mod token_whitelist;
 pub mod unique_payments;
-pub mod user;
-pub mod validator;
+pub mod user_actions;
 
 #[multiversx_sc::contract]
 pub trait GravityRestaking:
-    call_delegation::CallDelegationModule
+    user_actions::call_delegation::CallDelegationModule
     + token_whitelist::TokenWhitelistModule
-    + user::UserModule
-    + validator::ValidatorModule
-    + sovereign::SovereignModule
-    + common_actions::CommonActionsModule
+    + user_actions::user::UserModule
+    + user_actions::validator::ValidatorModule
+    + user_actions::sovereign::SovereignModule
+    + user_actions::common_actions::CommonActionsModule
     + utils::UtilsModule
 {
     #[init]
diff --git a/gravity-restaking/src/token_whitelist.rs b/gravity-restaking/src/token_whitelist.rs
index ad75c22..750465a 100644
--- a/gravity-restaking/src/token_whitelist.rs
+++ b/gravity-restaking/src/token_whitelist.rs
@@ -1,4 +1,4 @@
-use crate::call_delegation::EGLD_TOKEN_ID;
+use crate::user_actions::call_delegation::EGLD_TOKEN_ID;
 
 multiversx_sc::imports!();
 
diff --git a/gravity-restaking/src/call_delegation.rs b/gravity-restaking/src/user_actions/call_delegation.rs
similarity index 94%
rename from gravity-restaking/src/call_delegation.rs
rename to gravity-restaking/src/user_actions/call_delegation.rs
index 62aac96..7292e62 100644
--- a/gravity-restaking/src/call_delegation.rs
+++ b/gravity-restaking/src/user_actions/call_delegation.rs
@@ -21,11 +21,11 @@ pub static EGLD_TOKEN_ID: &[u8] = b"EGLD";
 
 #[multiversx_sc::module]
 pub trait CallDelegationModule:
-    crate::user::UserModule
+    super::user::UserModule
     + crate::token_whitelist::TokenWhitelistModule
-    + crate::validator::ValidatorModule
-    + crate::sovereign::SovereignModule
-    + crate::common_actions::CommonActionsModule
+    + super::validator::ValidatorModule
+    + super::sovereign::SovereignModule
+    + super::common_actions::CommonActionsModule
     + utils::UtilsModule
 {
     #[endpoint(moveStakeToReStaking)]
diff --git a/gravity-restaking/src/common_actions.rs b/gravity-restaking/src/user_actions/common_actions.rs
similarity index 97%
rename from gravity-restaking/src/common_actions.rs
rename to gravity-restaking/src/user_actions/common_actions.rs
index 8c521fd..f440fa1 100644
--- a/gravity-restaking/src/common_actions.rs
+++ b/gravity-restaking/src/user_actions/common_actions.rs
@@ -1,10 +1,8 @@
 use multiversx_sc::api::StorageMapperApi;
 
-use crate::{
-    unique_payments::{PaymentsVec, UniquePayments},
-    user::PaymentsMultiValue,
-    validator::ValidatorConfig,
-};
+use crate::unique_payments::{PaymentsVec, UniquePayments};
+
+use super::{user::PaymentsMultiValue, validator::ValidatorConfig};
 
 multiversx_sc::imports!();
 
diff --git a/gravity-restaking/src/user_actions/mod.rs b/gravity-restaking/src/user_actions/mod.rs
new file mode 100644
index 0000000..fd5d6d9
--- /dev/null
+++ b/gravity-restaking/src/user_actions/mod.rs
@@ -0,0 +1,5 @@
+pub mod call_delegation;
+pub mod common_actions;
+pub mod sovereign;
+pub mod user;
+pub mod validator;
diff --git a/gravity-restaking/src/sovereign.rs b/gravity-restaking/src/user_actions/sovereign.rs
similarity index 100%
rename from gravity-restaking/src/sovereign.rs
rename to gravity-restaking/src/user_actions/sovereign.rs
diff --git a/gravity-restaking/src/user.rs b/gravity-restaking/src/user_actions/user.rs
similarity index 98%
rename from gravity-restaking/src/user.rs
rename to gravity-restaking/src/user_actions/user.rs
index a0bbc5e..3f28470 100644
--- a/gravity-restaking/src/user.rs
+++ b/gravity-restaking/src/user_actions/user.rs
@@ -1,7 +1,8 @@
-use crate::{
+use crate::unique_payments::{PaymentsVec, UniquePayments};
+
+use super::{
     call_delegation::EGLD_TOKEN_ID,
     common_actions::{AddDelegationArgs, RemoveDelegationArgs},
-    unique_payments::{PaymentsVec, UniquePayments},
 };
 
 multiversx_sc::imports!();
@@ -12,9 +13,9 @@ pub type PaymentsMultiValue<M> =
 #[multiversx_sc::module]
 pub trait UserModule:
     crate::token_whitelist::TokenWhitelistModule
-    + crate::validator::ValidatorModule
-    + crate::sovereign::SovereignModule
-    + crate::common_actions::CommonActionsModule
+    + super::validator::ValidatorModule
+    + super::sovereign::SovereignModule
+    + super::common_actions::CommonActionsModule
     + utils::UtilsModule
 {
     #[payable("*")]
diff --git a/gravity-restaking/src/validator.rs b/gravity-restaking/src/user_actions/validator.rs
similarity index 100%
rename from gravity-restaking/src/validator.rs
rename to gravity-restaking/src/user_actions/validator.rs