Runtime lib.rs and Cargo.toml modification

Cargo.toml

@@ -49,7 +49,15 @@ std = [
     'stake/std',
     'hiring/std',
     'versioned_store/std',
-    'versioned_store_permissions/std'
+    'versioned_store_permissions/std',
+    'common/std',
+    'content_working_group/std',
+    'governance/std',
+    'membership/std',
+    'memo/std',
+    'roles/std',
+    'service_discovery/std',
+    'storage/std',
 ]
 
 [dependencies.babe]
@@ -298,4 +306,44 @@ tag = 'v1.0.0'
 default_features = false
 package = 'substrate-versioned-store-permissions-module'
 git = 'https://github.com/joystream/substrate-versioned-store-permissions-module'
-tag = 'v1.0.0'
+tag = 'v1.0.0'
+
+[dependencies.common]
+default_features = false
+package = 'substrate-common-module'
+path = 'runtime-modules/common'
+
+[dependencies.content_working_group]
+default_features = false
+package = 'substrate-content-working-group-module'
+path = 'runtime-modules/content-working-group'
+
+[dependencies.governance]
+default_features = false
+package = 'substrate-governance-module'
+path = 'runtime-modules/governance'
+
+[dependencies.membership]
+default_features = false
+package = 'substrate-membership-module'
+path = 'runtime-modules/membership'
+
+[dependencies.memo]
+default_features = false
+package = 'substrate-memo-module'
+path = 'runtime-modules/memo'
+
+[dependencies.roles]
+default_features = false
+package = 'substrate-roles-module'
+path = 'runtime-modules/roles'
+
+[dependencies.service_discovery]
+default_features = false
+package = 'substrate-service-discovery-module'
+path = 'runtime-modules/service-discovery'
+
+[dependencies.storage]
+default_features = false
+package = 'substrate-storage-module'
+path = 'runtime-modules/storage'

src/lib.rs

@@ -395,24 +395,15 @@ impl finality_tracker::Trait for Runtime {
     type ReportLatency = ReportLatency;
 }
 
-pub mod currency;
-pub mod governance;
 use governance::{council, election, proposals};
-pub mod storage;
 use storage::{data_directory, data_object_storage_registry, data_object_type_registry};
-mod membership;
-mod memo;
 pub use versioned_store;
 use versioned_store_permissions;
-mod traits;
 pub use forum;
 use membership::members;
 
-mod content_working_group;
 pub use content_working_group::lib as content_wg;
 mod migration;
-mod roles;
-mod service_discovery;
 use hiring;
 use minting;
 use recurringrewards;