diff --git a/substrate/wasm-runtime/polkadot/src/lib.rs b/substrate/wasm-runtime/polkadot/src/lib.rs
index 5646c7c322..cc48d8caa6 100644
--- a/substrate/wasm-runtime/polkadot/src/lib.rs
+++ b/substrate/wasm-runtime/polkadot/src/lib.rs
@@ -4,16 +4,10 @@
 #[macro_use]
 extern crate runtime_support;
 
-mod endiansensitive;
-mod streamreader;
-mod joiner;
-mod slicable;
-mod primitives;
-mod keyedvec;
-mod function;
-mod environment;
-mod storage;
-mod testing;
+mod support;
+pub use support::{endiansensitive, streamreader, joiner, slicable, primitives, keyedvec, function,
+	environment, storage, testing};
+
 #[allow(unused)]
 mod system;
 #[allow(unused)]
diff --git a/substrate/wasm-runtime/polkadot/src/endiansensitive.rs b/substrate/wasm-runtime/polkadot/src/support/endiansensitive.rs
similarity index 100%
rename from substrate/wasm-runtime/polkadot/src/endiansensitive.rs
rename to substrate/wasm-runtime/polkadot/src/support/endiansensitive.rs
diff --git a/substrate/wasm-runtime/polkadot/src/environment.rs b/substrate/wasm-runtime/polkadot/src/support/environment.rs
similarity index 100%
rename from substrate/wasm-runtime/polkadot/src/environment.rs
rename to substrate/wasm-runtime/polkadot/src/support/environment.rs
diff --git a/substrate/wasm-runtime/polkadot/src/function.rs b/substrate/wasm-runtime/polkadot/src/support/function.rs
similarity index 100%
rename from substrate/wasm-runtime/polkadot/src/function.rs
rename to substrate/wasm-runtime/polkadot/src/support/function.rs
diff --git a/substrate/wasm-runtime/polkadot/src/joiner.rs b/substrate/wasm-runtime/polkadot/src/support/joiner.rs
similarity index 100%
rename from substrate/wasm-runtime/polkadot/src/joiner.rs
rename to substrate/wasm-runtime/polkadot/src/support/joiner.rs
diff --git a/substrate/wasm-runtime/polkadot/src/keyedvec.rs b/substrate/wasm-runtime/polkadot/src/support/keyedvec.rs
similarity index 100%
rename from substrate/wasm-runtime/polkadot/src/keyedvec.rs
rename to substrate/wasm-runtime/polkadot/src/support/keyedvec.rs
diff --git a/substrate/wasm-runtime/polkadot/src/support/mod.rs b/substrate/wasm-runtime/polkadot/src/support/mod.rs
new file mode 100644
index 0000000000..dd381b1ad2
--- /dev/null
+++ b/substrate/wasm-runtime/polkadot/src/support/mod.rs
@@ -0,0 +1,10 @@
+pub mod endiansensitive;
+pub mod streamreader;
+pub mod joiner;
+pub mod slicable;
+pub mod primitives;
+pub mod keyedvec;
+pub mod function;
+pub mod environment;
+pub mod storage;
+pub mod testing;
diff --git a/substrate/wasm-runtime/polkadot/src/primitives.rs b/substrate/wasm-runtime/polkadot/src/support/primitives.rs
similarity index 100%
rename from substrate/wasm-runtime/polkadot/src/primitives.rs
rename to substrate/wasm-runtime/polkadot/src/support/primitives.rs
diff --git a/substrate/wasm-runtime/polkadot/src/slicable.rs b/substrate/wasm-runtime/polkadot/src/support/slicable.rs
similarity index 100%
rename from substrate/wasm-runtime/polkadot/src/slicable.rs
rename to substrate/wasm-runtime/polkadot/src/support/slicable.rs
diff --git a/substrate/wasm-runtime/polkadot/src/storage.rs b/substrate/wasm-runtime/polkadot/src/support/storage.rs
similarity index 100%
rename from substrate/wasm-runtime/polkadot/src/storage.rs
rename to substrate/wasm-runtime/polkadot/src/support/storage.rs
diff --git a/substrate/wasm-runtime/polkadot/src/streamreader.rs b/substrate/wasm-runtime/polkadot/src/support/streamreader.rs
similarity index 100%
rename from substrate/wasm-runtime/polkadot/src/streamreader.rs
rename to substrate/wasm-runtime/polkadot/src/support/streamreader.rs
diff --git a/substrate/wasm-runtime/polkadot/src/testing.rs b/substrate/wasm-runtime/polkadot/src/support/testing.rs
similarity index 100%
rename from substrate/wasm-runtime/polkadot/src/testing.rs
rename to substrate/wasm-runtime/polkadot/src/support/testing.rs