Full native build with new structure.

No tests yet.
Wasm build still pulls in std.

substrate/client/src/backend.rs

@@ -18,7 +18,7 @@
 
 use state_machine;
 use error;
-use primitives::relay::block;
+use primitives::block;
 use blockchain::{self, BlockId};
 
 /// Block insertion transction. Keeps hold if the inseted block state and data.
@@ -50,4 +50,3 @@ pub trait Backend {
 	/// Returns state backend for specified block.
 	fn state_at(&self, block: BlockId) -> error::Result<Self::State>;
 }
-

substrate/client/src/blockchain.rs

@@ -17,7 +17,7 @@
 //! Polkadot blockchain trait
 
 use std::fmt::{Display, Formatter, Error as FmtError};
-use primitives::relay::block;
+use primitives::block;
 use error::Result;
 
 /// Block indentification.
@@ -83,4 +83,3 @@ pub enum BlockStatus {
 	/// Not in the queue or the blockchain.
 	Unknown,
 }
-

substrate/client/src/genesis.rs

@@ -17,7 +17,7 @@
 //! Tool for creating the genesis block.
 
 use std::collections::HashMap;
-use primitives::relay::{Block, Header};
+use primitives::{Block, Header};
 use triehash::trie_root;
 
 /// Create a genesis block, given the initial storage.
@@ -46,7 +46,7 @@ mod tests {
 	use state_machine::OverlayedChanges;
 	use state_machine::backend::InMemory;
 	use substrate_executor::executor;
-	use primitives::relay::{AccountId, Hash, BlockNumber, Header, Digest, UncheckedTransaction,
+	use polkadot_primitives::{AccountId, Hash, BlockNumber, Header, Digest, UncheckedTransaction,
 		Transaction, Function};
 	use ed25519::Pair;
 

substrate/client/src/in_mem.rs

@@ -23,7 +23,7 @@ use error;
 use backend;
 use primitives;
 use ser;
-use primitives::relay::block::{self, HeaderHash};
+use primitives::block::{self, HeaderHash};
 use blockchain::{self, BlockId, BlockStatus};
 
 fn header_hash(header: &block::Header) -> block::HeaderHash {
@@ -201,4 +201,3 @@ impl backend::Backend for Backend {
 		}
 	}
 }
-

substrate/client/src/lib.rs

@@ -18,6 +18,7 @@
 
 #![warn(missing_docs)]
 
+extern crate polkadot_primitives;
 extern crate substrate_primitives as primitives;
 extern crate substrate_state_machine as state_machine;
 extern crate substrate_serializer as ser;
@@ -47,8 +48,8 @@ pub use genesis::construct_genesis_block;
 pub use blockchain::Info as ChainInfo;
 pub use blockchain::BlockId;
 
-use primitives::relay::block;
-use primitives::contract::{StorageKey, StorageData};
+use primitives::block;
+use primitives::storage::{StorageKey, StorageData};
 
 use blockchain::Backend as BlockchainBackend;
 use backend::BlockImportOperation;