--- a/runtime/common/config/ethereum.rs
+++ b/runtime/common/config/ethereum.rs
@@ -9,7 +9,7 @@
     runtime_common::{
 		constants::*,
         dispatch::CollectionDispatchT,
-        ethereum::{EvmSponsorshipHandler},
+        ethereum::sponsoring::EvmSponsorshipHandler,
 		config::sponsoring::DefaultSponsoringRateLimit,
         DealWithFees,
     },
--- a/runtime/common/config/mod.rs
+++ b/runtime/common/config/mod.rs
@@ -21,13 +21,3 @@
 pub mod parachain;
 pub mod xcm;
 pub mod orml;
-
-pub use {
-    substrate::*,
-    ethereum::*,
-    sponsoring::*,
-    pallets::*,
-    parachain::*,
-    self::xcm::*,
-    orml::*,
-};
--- a/runtime/common/config/pallets/mod.rs
+++ b/runtime/common/config/pallets/mod.rs
@@ -14,10 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
-use frame_support::{
-    // weights::{Weight, constants::WEIGHT_PER_SECOND},
-    parameter_types,
-};
+use frame_support::parameter_types;
 use sp_runtime::traits::AccountIdConversion;
 use crate::{
     runtime_common::{
--- a/runtime/common/ethereum/mod.rs
+++ b/runtime/common/ethereum/mod.rs
@@ -17,9 +17,3 @@
 pub mod sponsoring;
 pub mod transaction_converter;
 pub mod self_contained_call;
-
-pub use {
-    sponsoring::*,
-    transaction_converter::*,
-    self_contained_call::*,
-};
--- a/runtime/common/instance.rs
+++ b/runtime/common/instance.rs
@@ -1,7 +1,7 @@
 use crate::{
     runtime_common::{
         config::ethereum::CrossAccountId,
-        ethereum::TransactionConverter
+        ethereum::transaction_converter::TransactionConverter
     },
     Runtime,
 };
--- a/runtime/common/mod.rs
+++ b/runtime/common/mod.rs
@@ -14,26 +14,16 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
-mod constants;
-mod construct_runtime;
-mod dispatch;
-mod runtime_apis;
-mod sponsoring;
-mod weights;
-mod config;
-mod instance;
-mod ethereum;
-mod scheduler;
-
-pub use {
-    constants::*,
-    dispatch::*,
-    sponsoring::*,
-    weights::*,
-    config::*,
-    instance::*,
-    ethereum::*,
-};
+pub mod constants;
+pub mod construct_runtime;
+pub mod dispatch;
+pub mod runtime_apis;
+pub mod sponsoring;
+pub mod weights;
+pub mod config;
+pub mod instance;
+pub mod ethereum;
+pub mod scheduler;
 
 use sp_core::H160;
 use frame_support::traits::{Currency, OnUnbalanced, Imbalance};
--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -50,6 +50,11 @@
             Runner, account::CrossAccountId as _,
             Account as EVMAccount, FeeCalculator,
         };
+        use runtime_common::{
+            sponsoring::{SponsorshipPredict, UniqueSponsorshipPredict},
+            dispatch::CollectionDispatch,
+            config::ethereum::CrossAccountId,
+        };
         use up_data_structs::*;