diff --git a/.gitmodules b/.gitmodules
index 4174eb2e1..d134318b4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
-[submodule "res/ethereum/tests"]
-	path = res/ethereum/tests
+[submodule "ethcore/res/ethereum/tests"]
+	path = ethcore/res/ethereum/tests
 	url = git@github.com:ethereum/tests
 	branch = develop
diff --git a/bin/Cargo.toml b/Cargo.toml
similarity index 55%
rename from bin/Cargo.toml
rename to Cargo.toml
index 8fc233796..3b45bd162 100644
--- a/bin/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Ethcore client."
-name = "ethcore-client"
-version = "0.1.0"
+name = "parity"
+version = "0.9.0"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 
@@ -12,11 +12,15 @@ rustc-serialize = "0.3"
 docopt = "0.6"
 docopt_macros = "0.6"
 ctrlc = "1.0"
-ethcore-util = { path = "../util" }
-ethcore-rpc = { path = "../rpc", optional = true }
-ethcore = { path = ".." }
-ethsync = { path = "../sync" }
 clippy = "0.0.37"
+ethcore-util = { path = "util" }
+ethcore = { path = "ethcore" }
+ethsync = { path = "sync" }
+ethcore-rpc = { path = "rpc", optional = true }
 
 [features]
 rpc = ["ethcore-rpc"]
+
+[[bin]]
+path = "parity/main.rs"
+name = "parity"
diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
index eef261317..ef8111272 100644
--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@@ -9,7 +9,6 @@ authors = ["Ethcore <admin@ethcore.io>"]
 [dependencies]
 log = "0.3"
 env_logger = "0.3"
-ethcore-util = { path = "util" }
 rustc-serialize = "0.3"
 flate2 = "0.2"
 rocksdb = "0.3"
@@ -17,8 +16,9 @@ heapsize = "0.2.0"
 rust-crypto = "0.2.34"
 time = "0.1"
 #interpolate_idents = { git = "https://github.com/SkylerLipthay/interpolate_idents" }
-evmjit = { path = "evmjit", optional = true }
-ethash = { path = "ethash" }
+ethcore-util = { path = "../util" }
+evmjit = { path = "../evmjit", optional = true }
+ethash = { path = "../ethash" }
 num_cpus = "0.2"
 clippy = "0.0.37"
 crossbeam = "0.1.5"
diff --git a/res/ethereum/frontier.json b/ethcore/res/ethereum/frontier.json
similarity index 100%
rename from res/ethereum/frontier.json
rename to ethcore/res/ethereum/frontier.json
diff --git a/res/ethereum/frontier_like_test.json b/ethcore/res/ethereum/frontier_like_test.json
similarity index 100%
rename from res/ethereum/frontier_like_test.json
rename to ethcore/res/ethereum/frontier_like_test.json
diff --git a/res/ethereum/frontier_test.json b/ethcore/res/ethereum/frontier_test.json
similarity index 100%
rename from res/ethereum/frontier_test.json
rename to ethcore/res/ethereum/frontier_test.json
diff --git a/res/ethereum/homestead_test.json b/ethcore/res/ethereum/homestead_test.json
similarity index 100%
rename from res/ethereum/homestead_test.json
rename to ethcore/res/ethereum/homestead_test.json
diff --git a/res/ethereum/morden.json b/ethcore/res/ethereum/morden.json
similarity index 100%
rename from res/ethereum/morden.json
rename to ethcore/res/ethereum/morden.json
diff --git a/res/ethereum/olympic.json b/ethcore/res/ethereum/olympic.json
similarity index 100%
rename from res/ethereum/olympic.json
rename to ethcore/res/ethereum/olympic.json
diff --git a/res/ethereum/tests b/ethcore/res/ethereum/tests
similarity index 100%
rename from res/ethereum/tests
rename to ethcore/res/ethereum/tests
diff --git a/res/null_morden.json b/ethcore/res/null_morden.json
similarity index 100%
rename from res/null_morden.json
rename to ethcore/res/null_morden.json
diff --git a/bin/src/main.rs b/parity/main.rs
similarity index 98%
rename from bin/src/main.rs
rename to parity/main.rs
index 92f0cbf20..a9dfe004e 100644
--- a/bin/src/main.rs
+++ b/parity/main.rs
@@ -9,7 +9,7 @@ extern crate rustc_serialize;
 extern crate ethcore_util as util;
 extern crate ethcore;
 extern crate ethsync;
-extern crate log;
+extern crate log as rlog;
 extern crate env_logger;
 extern crate ctrlc;
 
@@ -17,7 +17,7 @@ extern crate ctrlc;
 extern crate ethcore_rpc as rpc;
 
 use std::env;
-use log::{LogLevelFilter};
+use rlog::{LogLevelFilter};
 use env_logger::LogBuilder;
 use ctrlc::CtrlC;
 use util::*;
diff --git a/util/Cargo.toml b/util/Cargo.toml
index d0e2e0ab7..5f57deca3 100644
--- a/util/Cargo.toml
+++ b/util/Cargo.toml
@@ -27,6 +27,4 @@ slab = { git = "https://github.com/arkpar/slab.git" }
 sha3 = { path = "sha3" }
 serde = "0.6.7"
 clippy = "0.0.37"
-
-[dev-dependencies]
 json-tests = { path = "json-tests" }