diff --git a/Cargo.toml b/Cargo.toml
index 489c1f27e..872e1e675 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ heapsize = "0.2.0"
 rust-crypto = "0.2.34"
 time = "0.1"
 #interpolate_idents = { git = "https://github.com/SkylerLipthay/interpolate_idents" }
-evmjit = { path = "rust-evmjit", optional = true }
+evmjit = { path = "evmjit", optional = true }
 ethash = { path = "ethash" }
 num_cpus = "0.2"
 clippy = "0.0.37"
diff --git a/bin/Cargo.toml b/bin/Cargo.toml
index ba258b586..7174ada14 100644
--- a/bin/Cargo.toml
+++ b/bin/Cargo.toml
@@ -15,6 +15,7 @@ ctrlc = "1.0"
 ethcore-util = { path = "../util" }
 ethcore-rpc = { path = "../rpc", optional = true }
 ethcore = { path = ".." }
+clippy = "0.0.37"
 
 [features]
 rpc = ["ethcore-rpc"]
diff --git a/bin/src/main.rs b/bin/src/main.rs
index 942a5cf24..190bab311 100644
--- a/bin/src/main.rs
+++ b/bin/src/main.rs
@@ -1,6 +1,9 @@
+//! Ethcore client application.
+
+#![warn(missing_docs)]
 #![feature(plugin)]
 #![plugin(docopt_macros)]
-// required for serde, move it to a separate library
+#![plugin(clippy)]
 extern crate docopt;
 extern crate rustc_serialize;
 extern crate ethcore_util as util;
@@ -35,7 +38,7 @@ Options:
   -h --help             Show this screen.
 ");
 
-fn setup_log(init: &String) {
+fn setup_log(init: &str) {
 	let mut builder = LogBuilder::new();
 	builder.filter(None, LogLevelFilter::Info);
 
@@ -51,9 +54,9 @@ fn setup_log(init: &String) {
 
 #[cfg(feature = "rpc")]
 fn setup_rpc_server(client: Arc<Client>) {
-	use rpc::*;
+	use rpc::v1::*;
 	
-	let mut server = HttpServer::new(1);
+	let mut server = rpc::HttpServer::new(1);
 	server.add_delegate(Web3Client::new().to_delegate());
 	server.add_delegate(EthClient::new(client.clone()).to_delegate());
 	server.add_delegate(EthFilterClient::new(client).to_delegate());
diff --git a/rust-evmjit/.gitignore b/evmjit/.gitignore
similarity index 100%
rename from rust-evmjit/.gitignore
rename to evmjit/.gitignore
diff --git a/rust-evmjit/Cargo.toml b/evmjit/Cargo.toml
similarity index 100%
rename from rust-evmjit/Cargo.toml
rename to evmjit/Cargo.toml
diff --git a/rust-evmjit/src/lib.rs b/evmjit/src/lib.rs
similarity index 100%
rename from rust-evmjit/src/lib.rs
rename to evmjit/src/lib.rs
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 1f10180d6..ee1c97f5f 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore jsonrpc"
 name = "ethcore-rpc"
 version = "0.1.0"
 license = "GPL-3.0"
-authors = ["Marek Kotewicz <marek.kotewicz@gmail.com"]
+authors = ["Ethcore <admin@ethcore.io"]
 
 [lib]
 
@@ -15,4 +15,5 @@ jsonrpc-core = "1.1"
 jsonrpc-http-server = "1.1"
 ethcore-util = { path = "../util" }
 ethcore = { path = ".." }
+clippy = "0.0.37"
 
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
index 43a24a1fb..7bc1d6987 100644
--- a/rpc/src/lib.rs
+++ b/rpc/src/lib.rs
@@ -1,6 +1,8 @@
+//! Ethcore rpc.
+#![warn(missing_docs)]
 #![feature(custom_derive, custom_attribute, plugin)]
-#![feature(slice_patterns)]
 #![plugin(serde_macros)]
+#![plugin(clippy)]
 
 extern crate serde;
 extern crate serde_json;
@@ -15,19 +17,16 @@ macro_rules! rpcerr {
 	() => (Err(Error::internal_error()))
 }
 
-pub mod traits;
-mod impls;
-mod types;
-
-pub use self::traits::{Web3, Eth, EthFilter, Net};
-pub use self::impls::*;
+pub mod v1;
 
+/// Http server.
 pub struct HttpServer {
 	handler: IoHandler,
 	threads: usize
 }
 
 impl HttpServer {
+	/// Construct new http server object with given number of threads.
 	pub fn new(threads: usize) -> HttpServer {
 		HttpServer {
 			handler: IoHandler::new(),
@@ -35,10 +34,12 @@ impl HttpServer {
 		}
 	}
 
+	/// Add io delegate.
 	pub fn add_delegate<D>(&mut self, delegate: IoDelegate<D>) where D: Send + Sync + 'static {
 		self.handler.add_delegate(delegate);
 	}
 
+	/// Start server asynchronously in new thread
 	pub fn start_async(self, addr: &str) {
 		let server = jsonrpc_http_server::Server::new(self.handler, self.threads);
 		server.start_async(addr)
diff --git a/rpc/src/impls/eth.rs b/rpc/src/v1/impls/eth.rs
similarity index 93%
rename from rpc/src/impls/eth.rs
rename to rpc/src/v1/impls/eth.rs
index ac27111d6..46718601b 100644
--- a/rpc/src/impls/eth.rs
+++ b/rpc/src/v1/impls/eth.rs
@@ -1,3 +1,4 @@
+//! Eth rpc implementation.
 use std::sync::Arc;
 use jsonrpc_core::*;
 use util::hash::*;
@@ -5,14 +6,16 @@ use util::uint::*;
 use util::sha3::*;
 use ethcore::client::*;
 use ethcore::views::*;
-use traits::{Eth, EthFilter};
-use types::Block;
+use v1::traits::{Eth, EthFilter};
+use v1::types::Block;
 
+/// Eth rpc implementation.
 pub struct EthClient {
 	client: Arc<Client>,
 }
 
 impl EthClient {
+	/// Creates new EthClient.
 	pub fn new(client: Arc<Client>) -> Self {
 		EthClient {
 			client: client
@@ -100,11 +103,13 @@ impl Eth for EthClient {
 	}
 }
 
+/// Eth filter rpc implementation.
 pub struct EthFilterClient {
 	client: Arc<Client>
 }
 
 impl EthFilterClient {
+	/// Creates new Eth filter client.
 	pub fn new(client: Arc<Client>) -> Self {
 		EthFilterClient {
 			client: client
diff --git a/rpc/src/impls/mod.rs b/rpc/src/v1/impls/mod.rs
similarity index 100%
rename from rpc/src/impls/mod.rs
rename to rpc/src/v1/impls/mod.rs
diff --git a/rpc/src/impls/net.rs b/rpc/src/v1/impls/net.rs
similarity index 80%
rename from rpc/src/impls/net.rs
rename to rpc/src/v1/impls/net.rs
index a1d36de54..7bf9cb248 100644
--- a/rpc/src/impls/net.rs
+++ b/rpc/src/v1/impls/net.rs
@@ -1,10 +1,12 @@
 //! Net rpc implementation.
 use jsonrpc_core::*;
-use traits::Net;
+use v1::traits::Net;
 
+/// Net rpc implementation.
 pub struct NetClient;
 
 impl NetClient {
+	/// Creates new NetClient.
 	pub fn new() -> Self { NetClient }
 }
 
diff --git a/rpc/src/impls/web3.rs b/rpc/src/v1/impls/web3.rs
similarity index 79%
rename from rpc/src/impls/web3.rs
rename to rpc/src/v1/impls/web3.rs
index 50eb9c6f5..5117ebf16 100644
--- a/rpc/src/impls/web3.rs
+++ b/rpc/src/v1/impls/web3.rs
@@ -1,9 +1,12 @@
+//! Web3 rpc implementation.
 use jsonrpc_core::*;
-use traits::Web3;
+use v1::traits::Web3;
 
+/// Web3 rpc implementation.
 pub struct Web3Client;
 
 impl Web3Client {
+	/// Creates new Web3Client.
 	pub fn new() -> Self { Web3Client }
 }
 
diff --git a/rpc/src/v1/mod.rs b/rpc/src/v1/mod.rs
new file mode 100644
index 000000000..a7da1a441
--- /dev/null
+++ b/rpc/src/v1/mod.rs
@@ -0,0 +1,10 @@
+//! Ethcore rpc v1.
+//! 
+//! Compliant with ethereum rpc.
+
+pub mod traits;
+mod impls;
+mod types;
+
+pub use self::traits::{Web3, Eth, EthFilter, Net};
+pub use self::impls::*;
diff --git a/rpc/src/traits/eth.rs b/rpc/src/v1/traits/eth.rs
similarity index 98%
rename from rpc/src/traits/eth.rs
rename to rpc/src/v1/traits/eth.rs
index 63aadbc74..25756a713 100644
--- a/rpc/src/traits/eth.rs
+++ b/rpc/src/v1/traits/eth.rs
@@ -44,6 +44,7 @@ pub trait Eth: Sized + Send + Sync + 'static {
 	}
 }
 
+/// Eth filters rpc api (polling).
 // TODO: do filters api properly
 pub trait EthFilter: Sized + Send + Sync + 'static {
 	/// Returns id of new block filter
diff --git a/rpc/src/traits/mod.rs b/rpc/src/v1/traits/mod.rs
similarity index 100%
rename from rpc/src/traits/mod.rs
rename to rpc/src/v1/traits/mod.rs
diff --git a/rpc/src/traits/net.rs b/rpc/src/v1/traits/net.rs
similarity index 100%
rename from rpc/src/traits/net.rs
rename to rpc/src/v1/traits/net.rs
diff --git a/rpc/src/traits/web3.rs b/rpc/src/v1/traits/web3.rs
similarity index 100%
rename from rpc/src/traits/web3.rs
rename to rpc/src/v1/traits/web3.rs
diff --git a/rpc/src/types/block.rs b/rpc/src/v1/types/block.rs
similarity index 100%
rename from rpc/src/types/block.rs
rename to rpc/src/v1/types/block.rs
diff --git a/rpc/src/types/mod.rs b/rpc/src/v1/types/mod.rs
similarity index 100%
rename from rpc/src/types/mod.rs
rename to rpc/src/v1/types/mod.rs
diff --git a/util/Cargo.toml b/util/Cargo.toml
index 362db33b2..d0e2e0ab7 100644
--- a/util/Cargo.toml
+++ b/util/Cargo.toml
@@ -26,7 +26,7 @@ crossbeam = "0.2"
 slab = { git = "https://github.com/arkpar/slab.git" }
 sha3 = { path = "sha3" }
 serde = "0.6.7"
-clippy = "*" # Always newest, since we use nightly
+clippy = "0.0.37"
 
 [dev-dependencies]
 json-tests = { path = "json-tests" }